Start of merge from trunk - some manual restructuring

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/new_persistence@478829 13f79535-47bb-0310-9956-ffa450edef68

159 files changed, 126 insertions, 0 deletions

diff --git a/java/client/pom.xml b/java/client/pom.xml
new file mode 100644
index 0000000000..915f51245c
--- /dev/null
+++ b/java/client/pom.xml
@@ -0,0 +1,126 @@
+<!--
+    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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.qpid</groupId>
+    <artifactId>qpid-client</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-incubating-M2-SNAPSHOT</version>
+    <name>Qpid Client</name>
+    <url>http://cwiki.apache.org/confluence/display/qpid</url>
+
+    <parent>
+        <groupId>org.apache.qpid</groupId>
+        <artifactId>qpid</artifactId>
+        <version>1.0-incubating-M2-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <topDirectoryLocation>..</topDirectoryLocation>
+        <amqj.logging.level>warn</amqj.logging.level>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-broker</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-filter-ssl</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>jmscts</groupId>
+            <artifactId>jmscts</artifactId>
+            <version>0.5-b2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>amqj.noAutoCreateVMBroker</name>
+                            <value>true</value>
+                        </property>
+                        <property>
+                            <name>amqj.logging.level</name>
+                            <value>WARN</value>
+                        </property>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:///${basedir}/src/main/java/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <includes>
+                        <include>**/test/unit/**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/JNDIReferenceableTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/java/client/test/bin/IBM-JNDI-Setup.bat b/java/client/src/test/bin/IBM-JNDI-Setup.bat
index 25f5b90d35..25f5b90d35 100644
--- a/java/client/test/bin/IBM-JNDI-Setup.bat
+++ b/java/client/src/test/bin/IBM-JNDI-Setup.bat
diff --git a/java/client/test/bin/IBM-JNDI-Setup.sh b/java/client/src/test/bin/IBM-JNDI-Setup.sh
index 8ce4bf7e56..8ce4bf7e56 100755
--- a/java/client/test/bin/IBM-JNDI-Setup.sh
+++ b/java/client/src/test/bin/IBM-JNDI-Setup.sh
diff --git a/java/client/test/bin/IBM-Publisher.bat b/java/client/src/test/bin/IBM-Publisher.bat
index 878ebd638a..878ebd638a 100644
--- a/java/client/test/bin/IBM-Publisher.bat
+++ b/java/client/src/test/bin/IBM-Publisher.bat
diff --git a/java/client/test/bin/IBM-Publisher.sh b/java/client/src/test/bin/IBM-Publisher.sh
index 21b7cd1206..21b7cd1206 100755
--- a/java/client/test/bin/IBM-Publisher.sh
+++ b/java/client/src/test/bin/IBM-Publisher.sh
diff --git a/java/client/test/bin/IBM-PutGet.bat b/java/client/src/test/bin/IBM-PutGet.bat
index 8ae7376013..8ae7376013 100644
--- a/java/client/test/bin/IBM-PutGet.bat
+++ b/java/client/src/test/bin/IBM-PutGet.bat
diff --git a/java/client/test/bin/IBM-PutGet.sh b/java/client/src/test/bin/IBM-PutGet.sh
index a120a17b4c..a120a17b4c 100755
--- a/java/client/test/bin/IBM-PutGet.sh
+++ b/java/client/src/test/bin/IBM-PutGet.sh
diff --git a/java/client/test/bin/IBM-README.txt b/java/client/src/test/bin/IBM-README.txt
index b076f3b3ca..b076f3b3ca 100644
--- a/java/client/test/bin/IBM-README.txt
+++ b/java/client/src/test/bin/IBM-README.txt
diff --git a/java/client/test/bin/IBM-Receiver.bat b/java/client/src/test/bin/IBM-Receiver.bat
index 4c0adc2dc7..4c0adc2dc7 100644
--- a/java/client/test/bin/IBM-Receiver.bat
+++ b/java/client/src/test/bin/IBM-Receiver.bat
diff --git a/java/client/test/bin/IBM-Receiver.sh b/java/client/src/test/bin/IBM-Receiver.sh
index 9b248e1680..9b248e1680 100755
--- a/java/client/test/bin/IBM-Receiver.sh
+++ b/java/client/src/test/bin/IBM-Receiver.sh
diff --git a/java/client/test/bin/IBM-Sender.bat b/java/client/src/test/bin/IBM-Sender.bat
index 9887d34511..9887d34511 100644
--- a/java/client/test/bin/IBM-Sender.bat
+++ b/java/client/src/test/bin/IBM-Sender.bat
diff --git a/java/client/test/bin/IBM-Sender.sh b/java/client/src/test/bin/IBM-Sender.sh
index 672cab9437..672cab9437 100755
--- a/java/client/test/bin/IBM-Sender.sh
+++ b/java/client/src/test/bin/IBM-Sender.sh
diff --git a/java/client/test/bin/IBM-Subscriber.bat b/java/client/src/test/bin/IBM-Subscriber.bat
index 87cde15727..87cde15727 100644
--- a/java/client/test/bin/IBM-Subscriber.bat
+++ b/java/client/src/test/bin/IBM-Subscriber.bat
diff --git a/java/client/test/bin/IBM-Subscriber.sh b/java/client/src/test/bin/IBM-Subscriber.sh
index a3eac816d5..a3eac816d5 100755
--- a/java/client/test/bin/IBM-Subscriber.sh
+++ b/java/client/src/test/bin/IBM-Subscriber.sh
diff --git a/java/client/test/bin/headersListener.sh b/java/client/src/test/bin/headersListener.sh
index 7206012755..7206012755 100755
--- a/java/client/test/bin/headersListener.sh
+++ b/java/client/src/test/bin/headersListener.sh
diff --git a/java/client/test/bin/headersListenerGroup.sh b/java/client/src/test/bin/headersListenerGroup.sh
index 0757551a1e..0757551a1e 100755
--- a/java/client/test/bin/headersListenerGroup.sh
+++ b/java/client/src/test/bin/headersListenerGroup.sh
diff --git a/java/client/test/bin/headersPublisher.sh b/java/client/src/test/bin/headersPublisher.sh
index 8ff03d9715..8ff03d9715 100755
--- a/java/client/test/bin/headersPublisher.sh
+++ b/java/client/src/test/bin/headersPublisher.sh
diff --git a/java/client/test/bin/run_many.sh b/java/client/src/test/bin/run_many.sh
index 7ad5085020..7ad5085020 100755
--- a/java/client/test/bin/run_many.sh
+++ b/java/client/src/test/bin/run_many.sh
diff --git a/java/client/test/bin/serviceProvidingClient.sh b/java/client/src/test/bin/serviceProvidingClient.sh
index 911a4e9850..911a4e9850 100755
--- a/java/client/test/bin/serviceProvidingClient.sh
+++ b/java/client/src/test/bin/serviceProvidingClient.sh
diff --git a/java/client/test/bin/serviceRequestingClient.sh b/java/client/src/test/bin/serviceRequestingClient.sh
index 7b42b46e6f..7b42b46e6f 100755
--- a/java/client/test/bin/serviceRequestingClient.sh
+++ b/java/client/src/test/bin/serviceRequestingClient.sh
diff --git a/java/client/test/bin/testService.sh b/java/client/src/test/bin/testService.sh
index c9a1427b63..c9a1427b63 100755
--- a/java/client/test/bin/testService.sh
+++ b/java/client/src/test/bin/testService.sh
diff --git a/java/client/test/bin/topicListener.sh b/java/client/src/test/bin/topicListener.sh
index 54b7a1e3f3..54b7a1e3f3 100755
--- a/java/client/test/bin/topicListener.sh
+++ b/java/client/src/test/bin/topicListener.sh
diff --git a/java/client/test/bin/topicPublisher.sh b/java/client/src/test/bin/topicPublisher.sh
index 4a73d6d491..4a73d6d491 100755
--- a/java/client/test/bin/topicPublisher.sh
+++ b/java/client/src/test/bin/topicPublisher.sh
diff --git a/java/client/test/build-module.xml b/java/client/src/test/build-module.xml
index b177c8441a..b177c8441a 100644
--- a/java/client/test/build-module.xml
+++ b/java/client/src/test/build-module.xml
diff --git a/java/client/test/etc/ApacheDS.properties b/java/client/src/test/etc/ApacheDS.properties
index 46cb4a810b..46cb4a810b 100644
--- a/java/client/test/etc/ApacheDS.properties
+++ b/java/client/src/test/etc/ApacheDS.properties
diff --git a/java/client/test/example_ build.xml b/java/client/src/test/example_ build.xml
index 25ddfd71ec..25ddfd71ec 100644
--- a/java/client/test/example_ build.xml
+++ b/java/client/src/test/example_ build.xml
diff --git a/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
index 038be976ad..038be976ad 100644
--- a/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
+++ b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
diff --git a/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
index b90fc8b3cd..b90fc8b3cd 100644
--- a/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
+++ b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
diff --git a/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
index 2de58a2b17..2de58a2b17 100644
--- a/java/client/test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
+++ b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
diff --git a/java/client/test/java/org/apache/qpid/IBMPerfTest/README.txt b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/README.txt
index 95ee9f9c77..95ee9f9c77 100644
--- a/java/client/test/java/org/apache/qpid/IBMPerfTest/README.txt
+++ b/java/client/src/test/java/org/apache/qpid/IBMPerfTest/README.txt
diff --git a/java/client/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java b/java/client/src/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
index 9e248cdfb8..9e248cdfb8 100644
--- a/java/client/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
+++ b/java/client/src/test/java/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
diff --git a/java/client/test/java/org/apache/qpid/ack/RecoverTest.java b/java/client/src/test/java/org/apache/qpid/ack/RecoverTest.java
index 0feecb5a79..0feecb5a79 100644
--- a/java/client/test/java/org/apache/qpid/ack/RecoverTest.java
+++ b/java/client/src/test/java/org/apache/qpid/ack/RecoverTest.java
diff --git a/java/client/test/java/org/apache/qpid/ack/UnitTests.java b/java/client/src/test/java/org/apache/qpid/ack/UnitTests.java
index 5caaff69cf..5caaff69cf 100644
--- a/java/client/test/java/org/apache/qpid/ack/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/ack/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/basic/BytesMessageTest.java b/java/client/src/test/java/org/apache/qpid/basic/BytesMessageTest.java
index e8a9debe1d..e8a9debe1d 100644
--- a/java/client/test/java/org/apache/qpid/basic/BytesMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/BytesMessageTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java b/java/client/src/test/java/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java
index 08ff65ea29..08ff65ea29 100644
--- a/java/client/test/java/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/FieldTableKeyEnumeratorTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/FieldTableMessageTest.java b/java/client/src/test/java/org/apache/qpid/basic/FieldTableMessageTest.java
index 82e43773a4..82e43773a4 100644
--- a/java/client/test/java/org/apache/qpid/basic/FieldTableMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/FieldTableMessageTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/basic/MultipleConnectionTest.java
index 8bf6fc1991..8bf6fc1991 100644
--- a/java/client/test/java/org/apache/qpid/basic/MultipleConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/MultipleConnectionTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/basic/ObjectMessageTest.java
index a78cd6f72b..a78cd6f72b 100644
--- a/java/client/test/java/org/apache/qpid/basic/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/ObjectMessageTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/ReceiveTest.java b/java/client/src/test/java/org/apache/qpid/basic/ReceiveTest.java
index d72d748935..d72d748935 100644
--- a/java/client/test/java/org/apache/qpid/basic/ReceiveTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/ReceiveTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/SessionStartTest.java b/java/client/src/test/java/org/apache/qpid/basic/SessionStartTest.java
index f201f23681..f201f23681 100644
--- a/java/client/test/java/org/apache/qpid/basic/SessionStartTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/SessionStartTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/basic/TextMessageTest.java
index 2b76f64659..2b76f64659 100644
--- a/java/client/test/java/org/apache/qpid/basic/TextMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/TextMessageTest.java
diff --git a/java/client/test/java/org/apache/qpid/basic/UnitTests.java b/java/client/src/test/java/org/apache/qpid/basic/UnitTests.java
index b87254f73a..b87254f73a 100644
--- a/java/client/test/java/org/apache/qpid/basic/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/basic/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/client/AllClientUnitTests.java b/java/client/src/test/java/org/apache/qpid/client/AllClientUnitTests.java
index 0ecd715284..0ecd715284 100644
--- a/java/client/test/java/org/apache/qpid/client/AllClientUnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/client/AllClientUnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java b/java/client/src/test/java/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
index e12d6c0fc5..e12d6c0fc5 100644
--- a/java/client/test/java/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
diff --git a/java/client/test/java/org/apache/qpid/client/channelclose/UnitTests.java b/java/client/src/test/java/org/apache/qpid/client/channelclose/UnitTests.java
index ed98bc0c30..ed98bc0c30 100644
--- a/java/client/test/java/org/apache/qpid/client/channelclose/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/client/channelclose/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/client/message/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/client/message/ObjectMessageTest.java
index a5e1a0d558..a5e1a0d558 100644
--- a/java/client/test/java/org/apache/qpid/client/message/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/message/ObjectMessageTest.java
diff --git a/java/client/test/java/org/apache/qpid/client/message/TestBytesMessage.java b/java/client/src/test/java/org/apache/qpid/client/message/TestBytesMessage.java
index 03bb65081f..03bb65081f 100644
--- a/java/client/test/java/org/apache/qpid/client/message/TestBytesMessage.java
+++ b/java/client/src/test/java/org/apache/qpid/client/message/TestBytesMessage.java
diff --git a/java/client/test/java/org/apache/qpid/client/message/TestTextMessage.java b/java/client/src/test/java/org/apache/qpid/client/message/TestTextMessage.java
index 766f47d841..766f47d841 100644
--- a/java/client/test/java/org/apache/qpid/client/message/TestTextMessage.java
+++ b/java/client/src/test/java/org/apache/qpid/client/message/TestTextMessage.java
diff --git a/java/client/test/java/org/apache/qpid/client/message/UnitTests.java b/java/client/src/test/java/org/apache/qpid/client/message/UnitTests.java
index 889c437df3..889c437df3 100644
--- a/java/client/test/java/org/apache/qpid/client/message/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/client/message/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/cluster/Client.java b/java/client/src/test/java/org/apache/qpid/cluster/Client.java
index 1d12f157b9..1d12f157b9 100644
--- a/java/client/test/java/org/apache/qpid/cluster/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/cluster/Client.java
diff --git a/java/client/test/java/org/apache/qpid/codec/BasicDeliverTest.java b/java/client/src/test/java/org/apache/qpid/codec/BasicDeliverTest.java
index 4dd67c48d9..4dd67c48d9 100644
--- a/java/client/test/java/org/apache/qpid/codec/BasicDeliverTest.java
+++ b/java/client/src/test/java/org/apache/qpid/codec/BasicDeliverTest.java
diff --git a/java/client/test/java/org/apache/qpid/codec/Client.java b/java/client/src/test/java/org/apache/qpid/codec/Client.java
index 3118aa8539..3118aa8539 100644
--- a/java/client/test/java/org/apache/qpid/codec/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/codec/Client.java
diff --git a/java/client/test/java/org/apache/qpid/codec/Server.java b/java/client/src/test/java/org/apache/qpid/codec/Server.java
index 772424e002..772424e002 100644
--- a/java/client/test/java/org/apache/qpid/codec/Server.java
+++ b/java/client/src/test/java/org/apache/qpid/codec/Server.java
diff --git a/java/client/test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/java/client/src/test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
index 7c208e4cc4..7c208e4cc4 100644
--- a/java/client/test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
+++ b/java/client/src/test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/java/client/test/java/org/apache/qpid/config/AbstractConfig.java b/java/client/src/test/java/org/apache/qpid/config/AbstractConfig.java
index 9b1bf88497..9b1bf88497 100644
--- a/java/client/test/java/org/apache/qpid/config/AbstractConfig.java
+++ b/java/client/src/test/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/java/client/test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/java/client/src/test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
index a5599c8e58..a5599c8e58 100644
--- a/java/client/test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
+++ b/java/client/src/test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/java/client/test/java/org/apache/qpid/config/Connector.java b/java/client/src/test/java/org/apache/qpid/config/Connector.java
index a3b93aad22..a3b93aad22 100644
--- a/java/client/test/java/org/apache/qpid/config/Connector.java
+++ b/java/client/src/test/java/org/apache/qpid/config/Connector.java
diff --git a/java/client/test/java/org/apache/qpid/config/ConnectorConfig.java b/java/client/src/test/java/org/apache/qpid/config/ConnectorConfig.java
index 8921d579a6..8921d579a6 100644
--- a/java/client/test/java/org/apache/qpid/config/ConnectorConfig.java
+++ b/java/client/src/test/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/java/client/test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/java/client/src/test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index 60e358056f..60e358056f 100644
--- a/java/client/test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/java/client/src/test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/java/client/test/java/org/apache/qpid/connection/ConnectionTest.java b/java/client/src/test/java/org/apache/qpid/connection/ConnectionTest.java
index e86d238dc4..e86d238dc4 100644
--- a/java/client/test/java/org/apache/qpid/connection/ConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/connection/ConnectionTest.java
diff --git a/java/client/test/java/org/apache/qpid/connection/TestManyConnections.java b/java/client/src/test/java/org/apache/qpid/connection/TestManyConnections.java
index 4456037c2e..4456037c2e 100644
--- a/java/client/test/java/org/apache/qpid/connection/TestManyConnections.java
+++ b/java/client/src/test/java/org/apache/qpid/connection/TestManyConnections.java
diff --git a/java/client/test/java/org/apache/qpid/connectionurl/ConnectionURLTest.java b/java/client/src/test/java/org/apache/qpid/connectionurl/ConnectionURLTest.java
index cc8442af90..cc8442af90 100644
--- a/java/client/test/java/org/apache/qpid/connectionurl/ConnectionURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/connectionurl/ConnectionURLTest.java
diff --git a/java/client/test/java/org/apache/qpid/connectionurl/UnitTests.java b/java/client/src/test/java/org/apache/qpid/connectionurl/UnitTests.java
index f4f269330e..f4f269330e 100644
--- a/java/client/test/java/org/apache/qpid/connectionurl/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/connectionurl/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/cts/bin/jmscts.sh b/java/client/src/test/java/org/apache/qpid/cts/bin/jmscts.sh
index 5786e0d689..5786e0d689 100755
--- a/java/client/test/java/org/apache/qpid/cts/bin/jmscts.sh
+++ b/java/client/src/test/java/org/apache/qpid/cts/bin/jmscts.sh
diff --git a/java/client/test/java/org/apache/qpid/cts/bin/setenv.sh b/java/client/src/test/java/org/apache/qpid/cts/bin/setenv.sh
index 17cbfb8d11..17cbfb8d11 100755
--- a/java/client/test/java/org/apache/qpid/cts/bin/setenv.sh
+++ b/java/client/src/test/java/org/apache/qpid/cts/bin/setenv.sh
diff --git a/java/client/test/java/org/apache/qpid/cts/config/jmscts.policy b/java/client/src/test/java/org/apache/qpid/cts/config/jmscts.policy
index 6acd889dc4..6acd889dc4 100644
--- a/java/client/test/java/org/apache/qpid/cts/config/jmscts.policy
+++ b/java/client/src/test/java/org/apache/qpid/cts/config/jmscts.policy
diff --git a/java/client/test/java/org/apache/qpid/cts/config/jmscts.properties b/java/client/src/test/java/org/apache/qpid/cts/config/jmscts.properties
index eccb1fd411..eccb1fd411 100644
--- a/java/client/test/java/org/apache/qpid/cts/config/jmscts.properties
+++ b/java/client/src/test/java/org/apache/qpid/cts/config/jmscts.properties
diff --git a/java/client/test/java/org/apache/qpid/cts/config/providers.xml b/java/client/src/test/java/org/apache/qpid/cts/config/providers.xml
index eea1f334cc..eea1f334cc 100644
--- a/java/client/test/java/org/apache/qpid/cts/config/providers.xml
+++ b/java/client/src/test/java/org/apache/qpid/cts/config/providers.xml
diff --git a/java/client/test/java/org/apache/qpid/cts/readme.txt b/java/client/src/test/java/org/apache/qpid/cts/readme.txt
index 117e7d4954..117e7d4954 100644
--- a/java/client/test/java/org/apache/qpid/cts/readme.txt
+++ b/java/client/src/test/java/org/apache/qpid/cts/readme.txt
diff --git a/java/client/test/java/org/apache/qpid/cts/src/compile.sh b/java/client/src/test/java/org/apache/qpid/cts/src/compile.sh
index c5877e7927..c5877e7927 100755
--- a/java/client/test/java/org/apache/qpid/cts/src/compile.sh
+++ b/java/client/src/test/java/org/apache/qpid/cts/src/compile.sh
diff --git a/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java b/java/client/src/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
index 21a6816af7..21a6816af7 100644
--- a/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
+++ b/java/client/src/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPAdministrator.java
diff --git a/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java b/java/client/src/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
index 21610d39b2..21610d39b2 100644
--- a/java/client/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
+++ b/java/client/src/test/java/org/apache/qpid/cts/src/providers/amqp/org/exolab/jmscts/amqp/AMQPProvider.java
diff --git a/java/client/test/java/org/apache/qpid/destinationurl/DestinationURLTest.java b/java/client/src/test/java/org/apache/qpid/destinationurl/DestinationURLTest.java
index 8369fa9e75..8369fa9e75 100644
--- a/java/client/test/java/org/apache/qpid/destinationurl/DestinationURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/destinationurl/DestinationURLTest.java
diff --git a/java/client/test/java/org/apache/qpid/destinationurl/UnitTests.java b/java/client/src/test/java/org/apache/qpid/destinationurl/UnitTests.java
index 12760aef94..12760aef94 100644
--- a/java/client/test/java/org/apache/qpid/destinationurl/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/destinationurl/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/example/log4j.xml b/java/client/src/test/java/org/apache/qpid/example/log4j.xml
index e537b1796d..e537b1796d 100644
--- a/java/client/test/java/org/apache/qpid/example/log4j.xml
+++ b/java/client/src/test/java/org/apache/qpid/example/log4j.xml
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java b/java/client/src/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
index 4dd58cf4a1..4dd58cf4a1 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/MessageFactory.java b/java/client/src/test/java/org/apache/qpid/example/publisher/MessageFactory.java
index ff40eddb03..ff40eddb03 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/MessageFactory.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/MessageFactory.java
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/MessageFactoryException.java b/java/client/src/test/java/org/apache/qpid/example/publisher/MessageFactoryException.java
index d0fb821700..d0fb821700 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/MessageFactoryException.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/MessageFactoryException.java
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/java/client/src/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
index 9d56403cda..9d56403cda 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/MonitorPublisher.java b/java/client/src/test/java/org/apache/qpid/example/publisher/MonitorPublisher.java
index 4c1d884f5d..4c1d884f5d 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/MonitorPublisher.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/MonitorPublisher.java
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/Publisher.java b/java/client/src/test/java/org/apache/qpid/example/publisher/Publisher.java
index a2d9e5bdf6..a2d9e5bdf6 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/Publisher.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/Publisher.java
diff --git a/java/client/test/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java b/java/client/src/test/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
index 921e5f4855..921e5f4855 100644
--- a/java/client/test/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
+++ b/java/client/src/test/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
diff --git a/java/client/test/java/org/apache/qpid/example/shared/ConnectionException.java b/java/client/src/test/java/org/apache/qpid/example/shared/ConnectionException.java
index 0ce08fd59d..0ce08fd59d 100644
--- a/java/client/test/java/org/apache/qpid/example/shared/ConnectionException.java
+++ b/java/client/src/test/java/org/apache/qpid/example/shared/ConnectionException.java
diff --git a/java/client/test/java/org/apache/qpid/example/shared/FileUtils.java b/java/client/src/test/java/org/apache/qpid/example/shared/FileUtils.java
index 6f33727194..6f33727194 100644
--- a/java/client/test/java/org/apache/qpid/example/shared/FileUtils.java
+++ b/java/client/src/test/java/org/apache/qpid/example/shared/FileUtils.java
diff --git a/java/client/test/java/org/apache/qpid/example/shared/Statics.java b/java/client/src/test/java/org/apache/qpid/example/shared/Statics.java
index e945c743be..e945c743be 100644
--- a/java/client/test/java/org/apache/qpid/example/shared/Statics.java
+++ b/java/client/src/test/java/org/apache/qpid/example/shared/Statics.java
diff --git a/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/java/client/src/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
index 37a8dbeca8..37a8dbeca8 100644
--- a/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
+++ b/java/client/src/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
diff --git a/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java b/java/client/src/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
index 719e7441cc..719e7441cc 100644
--- a/java/client/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
+++ b/java/client/src/test/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
diff --git a/java/client/test/java/org/apache/qpid/example/subscriber/Subscriber.java b/java/client/src/test/java/org/apache/qpid/example/subscriber/Subscriber.java
index 710192f291..710192f291 100644
--- a/java/client/test/java/org/apache/qpid/example/subscriber/Subscriber.java
+++ b/java/client/src/test/java/org/apache/qpid/example/subscriber/Subscriber.java
diff --git a/java/client/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java b/java/client/src/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
index bc0363be2a..bc0363be2a 100644
--- a/java/client/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
+++ b/java/client/src/test/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
diff --git a/java/client/test/java/org/apache/qpid/example/test/TestAMSPubSub.java b/java/client/src/test/java/org/apache/qpid/example/test/TestAMSPubSub.java
index 1364c7b849..1364c7b849 100644
--- a/java/client/test/java/org/apache/qpid/example/test/TestAMSPubSub.java
+++ b/java/client/src/test/java/org/apache/qpid/example/test/TestAMSPubSub.java
diff --git a/java/client/test/java/org/apache/qpid/example/test/TestMultSubscribers.java b/java/client/src/test/java/org/apache/qpid/example/test/TestMultSubscribers.java
index a1af923e12..a1af923e12 100644
--- a/java/client/test/java/org/apache/qpid/example/test/TestMultSubscribers.java
+++ b/java/client/src/test/java/org/apache/qpid/example/test/TestMultSubscribers.java
diff --git a/java/client/test/java/org/apache/qpid/example/test/TestPublisher.java b/java/client/src/test/java/org/apache/qpid/example/test/TestPublisher.java
index aa6a54cb0e..aa6a54cb0e 100644
--- a/java/client/test/java/org/apache/qpid/example/test/TestPublisher.java
+++ b/java/client/src/test/java/org/apache/qpid/example/test/TestPublisher.java
diff --git a/java/client/test/java/org/apache/qpid/example/test/TestSubscriber.java b/java/client/src/test/java/org/apache/qpid/example/test/TestSubscriber.java
index 01c02fe5e4..01c02fe5e4 100644
--- a/java/client/test/java/org/apache/qpid/example/test/TestSubscriber.java
+++ b/java/client/src/test/java/org/apache/qpid/example/test/TestSubscriber.java
diff --git a/java/client/test/java/org/apache/qpid/failover/FailoverBrokerTester.java b/java/client/src/test/java/org/apache/qpid/failover/FailoverBrokerTester.java
index f20b0e1409..f20b0e1409 100644
--- a/java/client/test/java/org/apache/qpid/failover/FailoverBrokerTester.java
+++ b/java/client/src/test/java/org/apache/qpid/failover/FailoverBrokerTester.java
diff --git a/java/client/test/java/org/apache/qpid/failover/FailoverMultiMethodTest.java b/java/client/src/test/java/org/apache/qpid/failover/FailoverMultiMethodTest.java
index b9f4c1c0dc..b9f4c1c0dc 100644
--- a/java/client/test/java/org/apache/qpid/failover/FailoverMultiMethodTest.java
+++ b/java/client/src/test/java/org/apache/qpid/failover/FailoverMultiMethodTest.java
diff --git a/java/client/test/java/org/apache/qpid/failover/FailoverRoundRobinTest.java b/java/client/src/test/java/org/apache/qpid/failover/FailoverRoundRobinTest.java
index 23119f2394..23119f2394 100644
--- a/java/client/test/java/org/apache/qpid/failover/FailoverRoundRobinTest.java
+++ b/java/client/src/test/java/org/apache/qpid/failover/FailoverRoundRobinTest.java
diff --git a/java/client/test/java/org/apache/qpid/failover/FailoverSingleServerTest.java b/java/client/src/test/java/org/apache/qpid/failover/FailoverSingleServerTest.java
index 7f3b058438..7f3b058438 100644
--- a/java/client/test/java/org/apache/qpid/failover/FailoverSingleServerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/failover/FailoverSingleServerTest.java
diff --git a/java/client/test/java/org/apache/qpid/failover/FailoverTest.java b/java/client/src/test/java/org/apache/qpid/failover/FailoverTest.java
index 4905bf5614..4905bf5614 100644
--- a/java/client/test/java/org/apache/qpid/failover/FailoverTest.java
+++ b/java/client/src/test/java/org/apache/qpid/failover/FailoverTest.java
diff --git a/java/client/test/java/org/apache/qpid/failover/FailoverTxTest.java b/java/client/src/test/java/org/apache/qpid/failover/FailoverTxTest.java
index 10ec682bf5..10ec682bf5 100644
--- a/java/client/test/java/org/apache/qpid/failover/FailoverTxTest.java
+++ b/java/client/src/test/java/org/apache/qpid/failover/FailoverTxTest.java
diff --git a/java/client/test/java/org/apache/qpid/flow/ChannelFlowTest.java b/java/client/src/test/java/org/apache/qpid/flow/ChannelFlowTest.java
index fad1849fed..fad1849fed 100644
--- a/java/client/test/java/org/apache/qpid/flow/ChannelFlowTest.java
+++ b/java/client/src/test/java/org/apache/qpid/flow/ChannelFlowTest.java
diff --git a/java/client/test/java/org/apache/qpid/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/forwardall/Client.java
index 4ad8587ae0..4ad8587ae0 100644
--- a/java/client/test/java/org/apache/qpid/forwardall/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/forwardall/Client.java
diff --git a/java/client/test/java/org/apache/qpid/forwardall/Combined.java b/java/client/src/test/java/org/apache/qpid/forwardall/Combined.java
index ea5216dd2d..ea5216dd2d 100644
--- a/java/client/test/java/org/apache/qpid/forwardall/Combined.java
+++ b/java/client/src/test/java/org/apache/qpid/forwardall/Combined.java
diff --git a/java/client/test/java/org/apache/qpid/forwardall/Service.java b/java/client/src/test/java/org/apache/qpid/forwardall/Service.java
index bc3cc4c1f4..bc3cc4c1f4 100644
--- a/java/client/test/java/org/apache/qpid/forwardall/Service.java
+++ b/java/client/src/test/java/org/apache/qpid/forwardall/Service.java
diff --git a/java/client/test/java/org/apache/qpid/forwardall/ServiceCreator.java b/java/client/src/test/java/org/apache/qpid/forwardall/ServiceCreator.java
index 6d43f85cf2..6d43f85cf2 100644
--- a/java/client/test/java/org/apache/qpid/forwardall/ServiceCreator.java
+++ b/java/client/src/test/java/org/apache/qpid/forwardall/ServiceCreator.java
diff --git a/java/client/test/java/org/apache/qpid/forwardall/SpecialQueue.java b/java/client/src/test/java/org/apache/qpid/forwardall/SpecialQueue.java
index efa633033f..efa633033f 100644
--- a/java/client/test/java/org/apache/qpid/forwardall/SpecialQueue.java
+++ b/java/client/src/test/java/org/apache/qpid/forwardall/SpecialQueue.java
diff --git a/java/client/test/java/org/apache/qpid/forwardall/UnitTests.java b/java/client/src/test/java/org/apache/qpid/forwardall/UnitTests.java
index c62acce11d..c62acce11d 100644
--- a/java/client/test/java/org/apache/qpid/forwardall/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/forwardall/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/fragmentation/TestLargePublisher.java b/java/client/src/test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
index 161f225d08..161f225d08 100644
--- a/java/client/test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
+++ b/java/client/src/test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
diff --git a/java/client/test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java b/java/client/src/test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
index 5268884b93..5268884b93 100644
--- a/java/client/test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
+++ b/java/client/src/test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
diff --git a/java/client/test/java/org/apache/qpid/framing/FieldTableTest.java b/java/client/src/test/java/org/apache/qpid/framing/FieldTableTest.java
index c76596ac5c..c76596ac5c 100644
--- a/java/client/test/java/org/apache/qpid/framing/FieldTableTest.java
+++ b/java/client/src/test/java/org/apache/qpid/framing/FieldTableTest.java
diff --git a/java/client/test/java/org/apache/qpid/framing/content.txt b/java/client/src/test/java/org/apache/qpid/framing/content.txt
index fd3fb28590..fd3fb28590 100644
--- a/java/client/test/java/org/apache/qpid/framing/content.txt
+++ b/java/client/src/test/java/org/apache/qpid/framing/content.txt
diff --git a/java/client/test/java/org/apache/qpid/headers/Listener.java b/java/client/src/test/java/org/apache/qpid/headers/Listener.java
index 480596b022..480596b022 100644
--- a/java/client/test/java/org/apache/qpid/headers/Listener.java
+++ b/java/client/src/test/java/org/apache/qpid/headers/Listener.java
diff --git a/java/client/test/java/org/apache/qpid/headers/MessageFactory.java b/java/client/src/test/java/org/apache/qpid/headers/MessageFactory.java
index fc976766e4..fc976766e4 100644
--- a/java/client/test/java/org/apache/qpid/headers/MessageFactory.java
+++ b/java/client/src/test/java/org/apache/qpid/headers/MessageFactory.java
diff --git a/java/client/test/java/org/apache/qpid/headers/Publisher.java b/java/client/src/test/java/org/apache/qpid/headers/Publisher.java
index 16113037d1..16113037d1 100644
--- a/java/client/test/java/org/apache/qpid/headers/Publisher.java
+++ b/java/client/src/test/java/org/apache/qpid/headers/Publisher.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceable/Bind.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceable/Bind.java
index 3715ef7cc4..3715ef7cc4 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceable/Bind.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceable/Bind.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceable/Lookup.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceable/Lookup.java
index 05098269c1..05098269c1 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceable/Lookup.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceable/Lookup.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceable/Unbind.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceable/Unbind.java
index 1e9f57c07f..1e9f57c07f 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceable/Unbind.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceable/Unbind.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Bind.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/Bind.java
index 221237a37c..221237a37c 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Bind.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/Bind.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java
index 7c7d32991f..7c7d32991f 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/JNDIReferenceableTest.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Lookup.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/Lookup.java
index 481500b8f0..481500b8f0 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Lookup.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/Lookup.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Unbind.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/Unbind.java
index 767f7c5737..767f7c5737 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/Unbind.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/Unbind.java
diff --git a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/UnitTests.java b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/UnitTests.java
index f7b3889d22..f7b3889d22 100644
--- a/java/client/test/java/org/apache/qpid/jndi/referenceabletest/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/jndi/referenceabletest/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/latency/LatencyTest.java b/java/client/src/test/java/org/apache/qpid/latency/LatencyTest.java
index 981bfdc3a6..981bfdc3a6 100644
--- a/java/client/test/java/org/apache/qpid/latency/LatencyTest.java
+++ b/java/client/src/test/java/org/apache/qpid/latency/LatencyTest.java
diff --git a/java/client/test/java/org/apache/qpid/mina/AcceptorTest.java b/java/client/src/test/java/org/apache/qpid/mina/AcceptorTest.java
index f0a80f2ead..f0a80f2ead 100644
--- a/java/client/test/java/org/apache/qpid/mina/AcceptorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/mina/AcceptorTest.java
diff --git a/java/client/test/java/org/apache/qpid/mina/BlockingAcceptorTest.java b/java/client/src/test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
index 547ffc9dcb..547ffc9dcb 100644
--- a/java/client/test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
diff --git a/java/client/test/java/org/apache/qpid/mina/WriterTest.java b/java/client/src/test/java/org/apache/qpid/mina/WriterTest.java
index ae0b7ea522..ae0b7ea522 100644
--- a/java/client/test/java/org/apache/qpid/mina/WriterTest.java
+++ b/java/client/src/test/java/org/apache/qpid/mina/WriterTest.java
diff --git a/java/client/test/java/org/apache/qpid/multiconsumer/AMQTest.java b/java/client/src/test/java/org/apache/qpid/multiconsumer/AMQTest.java
index 66bb2e5e01..66bb2e5e01 100644
--- a/java/client/test/java/org/apache/qpid/multiconsumer/AMQTest.java
+++ b/java/client/src/test/java/org/apache/qpid/multiconsumer/AMQTest.java
diff --git a/java/client/test/java/org/apache/qpid/ping/TestPingClient.java b/java/client/src/test/java/org/apache/qpid/ping/TestPingClient.java
index 77c5bb648c..77c5bb648c 100644
--- a/java/client/test/java/org/apache/qpid/ping/TestPingClient.java
+++ b/java/client/src/test/java/org/apache/qpid/ping/TestPingClient.java
diff --git a/java/client/test/java/org/apache/qpid/ping/TestPingProducer.java b/java/client/src/test/java/org/apache/qpid/ping/TestPingProducer.java
index 999f593131..999f593131 100644
--- a/java/client/test/java/org/apache/qpid/ping/TestPingProducer.java
+++ b/java/client/src/test/java/org/apache/qpid/ping/TestPingProducer.java
diff --git a/java/client/test/java/org/apache/qpid/ping/TestPingPublisher.java b/java/client/src/test/java/org/apache/qpid/ping/TestPingPublisher.java
index b297cf8610..b297cf8610 100644
--- a/java/client/test/java/org/apache/qpid/ping/TestPingPublisher.java
+++ b/java/client/src/test/java/org/apache/qpid/ping/TestPingPublisher.java
diff --git a/java/client/test/java/org/apache/qpid/ping/TestPingSubscriber.java b/java/client/src/test/java/org/apache/qpid/ping/TestPingSubscriber.java
index 8e6a4a125e..8e6a4a125e 100644
--- a/java/client/test/java/org/apache/qpid/ping/TestPingSubscriber.java
+++ b/java/client/src/test/java/org/apache/qpid/ping/TestPingSubscriber.java
diff --git a/java/client/test/java/org/apache/qpid/pubsub1/TestPublisher.java b/java/client/src/test/java/org/apache/qpid/pubsub1/TestPublisher.java
index c3e4fb9e0d..c3e4fb9e0d 100644
--- a/java/client/test/java/org/apache/qpid/pubsub1/TestPublisher.java
+++ b/java/client/src/test/java/org/apache/qpid/pubsub1/TestPublisher.java
diff --git a/java/client/test/java/org/apache/qpid/pubsub1/TestSubscriber.java b/java/client/src/test/java/org/apache/qpid/pubsub1/TestSubscriber.java
index 968cd23880..968cd23880 100644
--- a/java/client/test/java/org/apache/qpid/pubsub1/TestSubscriber.java
+++ b/java/client/src/test/java/org/apache/qpid/pubsub1/TestSubscriber.java
diff --git a/java/client/test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java b/java/client/src/test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
index 276eec3e11..276eec3e11 100644
--- a/java/client/test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
+++ b/java/client/src/test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
diff --git a/java/client/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java b/java/client/src/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
index 29eaf02701..29eaf02701 100644
--- a/java/client/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
+++ b/java/client/src/test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
diff --git a/java/client/test/java/org/apache/qpid/requestreply1/VmRequestReply.java b/java/client/src/test/java/org/apache/qpid/requestreply1/VmRequestReply.java
index a9357ae2ae..a9357ae2ae 100644
--- a/java/client/test/java/org/apache/qpid/requestreply1/VmRequestReply.java
+++ b/java/client/src/test/java/org/apache/qpid/requestreply1/VmRequestReply.java
diff --git a/java/client/test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
index 27a92d334a..27a92d334a 100644
--- a/java/client/test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
diff --git a/java/client/test/java/org/apache/qpid/testutil/Config.java b/java/client/src/test/java/org/apache/qpid/testutil/Config.java
index b5ec9c8c0c..b5ec9c8c0c 100644
--- a/java/client/test/java/org/apache/qpid/testutil/Config.java
+++ b/java/client/src/test/java/org/apache/qpid/testutil/Config.java
diff --git a/java/client/test/java/org/apache/qpid/topic/Config.java b/java/client/src/test/java/org/apache/qpid/topic/Config.java
index e77b1098c2..e77b1098c2 100644
--- a/java/client/test/java/org/apache/qpid/topic/Config.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/Config.java
diff --git a/java/client/test/java/org/apache/qpid/topic/DurableSubscriptionTest.java b/java/client/src/test/java/org/apache/qpid/topic/DurableSubscriptionTest.java
index 7acf2a262f..7acf2a262f 100644
--- a/java/client/test/java/org/apache/qpid/topic/DurableSubscriptionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/DurableSubscriptionTest.java
diff --git a/java/client/test/java/org/apache/qpid/topic/Listener.java b/java/client/src/test/java/org/apache/qpid/topic/Listener.java
index cb4ef6c0d2..cb4ef6c0d2 100644
--- a/java/client/test/java/org/apache/qpid/topic/Listener.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/Listener.java
diff --git a/java/client/test/java/org/apache/qpid/topic/MessageFactory.java b/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
index fff85d1290..fff85d1290 100644
--- a/java/client/test/java/org/apache/qpid/topic/MessageFactory.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/java/client/test/java/org/apache/qpid/topic/Publisher.java b/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
index 3b8c7ce810..3b8c7ce810 100644
--- a/java/client/test/java/org/apache/qpid/topic/Publisher.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/Config.java b/java/client/src/test/java/org/apache/qpid/transacted/Config.java
index 3312d20b0a..3312d20b0a 100644
--- a/java/client/test/java/org/apache/qpid/transacted/Config.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/Config.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/Ping.java b/java/client/src/test/java/org/apache/qpid/transacted/Ping.java
index 9d6287549c..9d6287549c 100644
--- a/java/client/test/java/org/apache/qpid/transacted/Ping.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/Ping.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/Pong.java b/java/client/src/test/java/org/apache/qpid/transacted/Pong.java
index d9e5618a3b..d9e5618a3b 100644
--- a/java/client/test/java/org/apache/qpid/transacted/Pong.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/Pong.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/Relay.java b/java/client/src/test/java/org/apache/qpid/transacted/Relay.java
index 96a7a71ac0..96a7a71ac0 100644
--- a/java/client/test/java/org/apache/qpid/transacted/Relay.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/Relay.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/Start.java b/java/client/src/test/java/org/apache/qpid/transacted/Start.java
index 85a633fc4f..85a633fc4f 100644
--- a/java/client/test/java/org/apache/qpid/transacted/Start.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/Start.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/TransactedTest.java b/java/client/src/test/java/org/apache/qpid/transacted/TransactedTest.java
index 200c89bebe..200c89bebe 100644
--- a/java/client/test/java/org/apache/qpid/transacted/TransactedTest.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/TransactedTest.java
diff --git a/java/client/test/java/org/apache/qpid/transacted/UnitTests.java b/java/client/src/test/java/org/apache/qpid/transacted/UnitTests.java
index 8d43287d6f..8d43287d6f 100644
--- a/java/client/test/java/org/apache/qpid/transacted/UnitTests.java
+++ b/java/client/src/test/java/org/apache/qpid/transacted/UnitTests.java
diff --git a/java/client/test/java/org/apache/qpid/weblogic/ServiceProvider.java b/java/client/src/test/java/org/apache/qpid/weblogic/ServiceProvider.java
index 8c6f6ab62e..8c6f6ab62e 100644
--- a/java/client/test/java/org/apache/qpid/weblogic/ServiceProvider.java
+++ b/java/client/src/test/java/org/apache/qpid/weblogic/ServiceProvider.java
diff --git a/java/client/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java b/java/client/src/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
index b2d24cd1c1..b2d24cd1c1 100644
--- a/java/client/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
+++ b/java/client/src/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
diff --git a/java/client/test/lib/activemq/geronimo-j2ee-management_1.0_spec-1.0.jar b/java/client/src/test/lib/activemq/geronimo-j2ee-management_1.0_spec-1.0.jar
index 155e8f6d5f..155e8f6d5f 100644
--- a/java/client/test/lib/activemq/geronimo-j2ee-management_1.0_spec-1.0.jar
+++ b/java/client/src/test/lib/activemq/geronimo-j2ee-management_1.0_spec-1.0.jar
diff --git a/java/client/test/lib/fscontext-1_2-beta3/fscontext.jar b/java/client/src/test/lib/fscontext-1_2-beta3/fscontext.jar
index 0efc25071a..0efc25071a 100644
--- a/java/client/test/lib/fscontext-1_2-beta3/fscontext.jar
+++ b/java/client/src/test/lib/fscontext-1_2-beta3/fscontext.jar
diff --git a/java/client/test/lib/fscontext-1_2-beta3/providerutil.jar b/java/client/src/test/lib/fscontext-1_2-beta3/providerutil.jar
index 0d6e48f388..0d6e48f388 100644
--- a/java/client/test/lib/fscontext-1_2-beta3/providerutil.jar
+++ b/java/client/src/test/lib/fscontext-1_2-beta3/providerutil.jar
diff --git a/java/client/test/lib/jakarta-commons/commons-codec-1.3.jar b/java/client/src/test/lib/jakarta-commons/commons-codec-1.3.jar
index 957b6752af..957b6752af 100644
--- a/java/client/test/lib/jakarta-commons/commons-codec-1.3.jar
+++ b/java/client/src/test/lib/jakarta-commons/commons-codec-1.3.jar
diff --git a/java/client/test/lib/jboss/jboss-messaging-client.jar b/java/client/src/test/lib/jboss/jboss-messaging-client.jar
index e35843f683..e35843f683 100644
--- a/java/client/test/lib/jboss/jboss-messaging-client.jar
+++ b/java/client/src/test/lib/jboss/jboss-messaging-client.jar
diff --git a/java/client/test/lib/jboss/jbossall-client.jar b/java/client/src/test/lib/jboss/jbossall-client.jar
index 35ebde1602..35ebde1602 100644
--- a/java/client/test/lib/jboss/jbossall-client.jar
+++ b/java/client/src/test/lib/jboss/jbossall-client.jar
diff --git a/java/client/test/lib/jmscts/jmscts-0.5-b2.jar b/java/client/src/test/lib/jmscts/jmscts-0.5-b2.jar
index de18dfb678..de18dfb678 100644
--- a/java/client/test/lib/jmscts/jmscts-0.5-b2.jar
+++ b/java/client/src/test/lib/jmscts/jmscts-0.5-b2.jar
diff --git a/java/client/test/lib/spring-1.2.8/spring.jar b/java/client/src/test/lib/spring-1.2.8/spring.jar
index e6b517dd02..e6b517dd02 100644
--- a/java/client/test/lib/spring-1.2.8/spring.jar
+++ b/java/client/src/test/lib/spring-1.2.8/spring.jar