From b3197f88032c1fe9dc92db4bcb97b9d014f02cbc Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Thu, 4 Mar 2010 00:22:39 +0000
Subject: Moved the scripts and config files to the tools module as the Perf
 Producer and Consumer are now housed under the tools module.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@918790 13f79535-47bb-0310-9956-ffa450edef68
---
 java/testkit/etc/jndi.properties | 35 -----------------------------------
 java/testkit/etc/test.log4j      | 28 ----------------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 java/testkit/etc/jndi.properties
 delete mode 100644 java/testkit/etc/test.log4j

(limited to 'java/testkit/etc')

diff --git a/java/testkit/etc/jndi.properties b/java/testkit/etc/jndi.properties
deleted file mode 100644
index 7a8180477b..0000000000
--- a/java/testkit/etc/jndi.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
-
-# use the following property to configure the default connector
-#java.naming.provider.url - ignored.
-
-# register some connection factories
-# connectionfactory.[jndiname] = [ConnectionURL]
-connectionfactory.connectionFactory = amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'
-
-# Register an AMQP destination in JNDI
-destination.transientQueue = direct://amq.direct//testQueueT?autodelete='true'
-destination.durableQueue = direct://amq.direct//testQueueD?durable='true'&autodelete='true'
-
-destination.transientTopic = topic://amq.topic//testTopicT?autodelete='true'
-destination.durableTopic = topic://amq.topic//testTopicD?durable='true'&autodelete='true'&clientid='test'&subscription='testQueueD'
-
-destination.fanoutQueue = fanout://amq.fanout//fanoutQueue?autodelete='true'
diff --git a/java/testkit/etc/test.log4j b/java/testkit/etc/test.log4j
deleted file mode 100644
index b574a7b5b7..0000000000
--- a/java/testkit/etc/test.log4j
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-log4j.rootLogger=${root.logging.level}
-
-log4j.logger.org.apache.qpid=ERROR, console
-log4j.additivity.org.apache.qpid=false
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Threshold=all
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n
-
-- 
cgit v1.2.1