QPID-146 QPID-112 QPID-278

Summary
Reworked a lot of the distribution work done by the build system.
This ended up with me creating a reduced client distribution (hope that is ok Steve)
Each module now has has a distribution directory (except common it may need a tests build later) This will build the individual components in to a distribution binary only, binary with tests and source.

To build the binary with tests in the distribution directory use profile tests so $mvn -Ptests

In all cases the dependencies have been reduced and correctly assigned to the correct scope.
There were a couple of cases where a runtime dependency of one of our dependencies didn't make it in to the distributions so they were added explicitly. This should be looked at again.

Specifics
Broker:
Three new assembly files are located in the distribution/src directory (broker-bin taking heavily from distribution - bin) these generate the three distributions.

SimpleFilterManager.java removed slf4j reference

broker/test directory removed as it was left over from the ant system

Client:
Added intelij files to ignore list.

client/dist deleted as it was left over from the ant system

client/distribution as for the broker three assemblies matching the three distributions

Renamed log4j.properties to client.log4j to prevent issues when it is packaged into the jar.

Removed old_test ping and requestreply1 as they have been moved to perftests

Moved broker back to a test dependency. This required modifying AMQSession.java to remove reference to ExchangeBoundHandler.java

Common:

Added more common dependencies from broker and client here.

Distribution:

Reduced the assemblies to only build the full project binary, binary with tests and source.

Perftests:
Added building of perftests distribution so this can be bundled separately.

Resources:
Moved Resources from distribution project to root level this allows them to be easily incorporated in all projects.

Systests:
as with perftests now builds a separate distribution that can be used on an existing installation.
renamed log4j.properties to systests.log4j to prevent logging problems.

As systests is a module having the code under the test folder isn't accurate as it is the main code. Test code here should be testing the tests :D !! 




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

16 files changed, 498 insertions, 1305 deletions

diff --git a/java/client/dist/readme.txt b/java/client/dist/readme.txt
deleted file mode 100644
index b5f7b107b6..0000000000
--- a/java/client/dist/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory is deliberately empty.
-AMQP JAR files will be built here during the build process.
diff --git a/java/client/distribution/pom.xml b/java/client/distribution/pom.xml
new file mode 100644
index 0000000000..dfbe8b83c2
--- /dev/null
+++ b/java/client/distribution/pom.xml
@@ -0,0 +1,155 @@
+<!--
+    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-distribution</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-incubating-M2-SNAPSHOT</version>
+    <name>Qpid Client Distributions</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>
+        <java.source.version>1.5</java.source.version>
+        <qpid.version>${pom.version}</qpid.version>
+        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
+        <qpid.root>${basedir}/..</qpid.root>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-client</artifactId>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>${java.source.version}</source>
+                        <target>${java.source.version}</target>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${assembly.version}</version>
+                    <configuration>
+                        <descriptors>
+                            <descriptor>src/main/assembly/client-bin.xml</descriptor>
+                        </descriptors>
+                        <finalName>qpid-${pom.version}</finalName>
+                        <outputDirectory>${qpid.targetDir}</outputDirectory>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                 <configuration>
+                        <finalName>qpid-incubating</finalName>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/client-bin.xml</descriptor>
+                                <descriptor>src/main/assembly/client-src.xml</descriptor>
+                            </descriptors>
+                            <finalName>qpid-${pom.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+<profiles>
+    <profile>
+        <id>tests</id>
+
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.qpid</groupId>
+                <artifactId>qpid-client</artifactId>
+                <type>test-jar</type>
+                 <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+
+        <build>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>distribution-package</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/client-bin-tests.xml</descriptor>
+                                </descriptors>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+</profiles>
+
+</project>
diff --git a/java/client/distribution/src/main/assembly/client-bin-tests.xml b/java/client/distribution/src/main/assembly/client-bin-tests.xml
new file mode 100644
index 0000000000..ec4df1c9a7
--- /dev/null
+++ b/java/client/distribution/src/main/assembly/client-bin-tests.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<assembly>
+  <id>java-client-bin-with-tests</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+      <fileSet>
+          <!-- Apache license files -->
+          <directory>../../resources</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>DISCLAIMER</include>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+              <include>README.txt</include>
+          </includes>
+      </fileSet>
+
+      <fileSet>
+          <directory>../../release-docs</directory>
+          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+          <includes>
+              <include>RELEASE_NOTES.txt</include>
+          </includes>
+      </fileSet>
+
+    <!-- Include easy access to test source-->
+      <fileSet>
+          <directory>../src/test</directory>
+          <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
+          <includes>
+              <include>**/*.java</include>
+          </includes>
+      </fileSet>
+
+      <!-- fileSet>  Client contains a readme.txt as does qpid root.
+                    Which will cause problems on windows as the zip will
+                    contain: readme.txt and README.txt
+          < Client local documentation>
+          <directory>..</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>*.txt</include>
+          </includes>
+      </fileSet-->
+
+    <!-- Configuration -->
+     <fileSet>
+          <directory>../test/etc</directory>
+          <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+          <includes>
+              <include>**/*</include>
+          </includes>
+    </fileSet>
+
+    <!-- Execution Scripts -->
+     <fileSet>
+          <directory>../test/bin</directory>
+          <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+          <includes>
+              <include>**/*</include>
+          </includes>
+          <fileMode>777</fileMode> <!-- RWX -->
+    </fileSet>
+
+    <!-- Metadata Jar -->
+      <fileSet>
+          <directory>target</directory>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <includes>
+              <include>qpid-incubating.jar</include>
+          </includes>
+      </fileSet>
+  </fileSets>
+
+  <dependencySets>
+      <dependencySet>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <unpack>false</unpack>
+           <excludes>
+               <exclude>org.apache.qpid:qpid-client-distribution</exclude>
+          </excludes>
+      </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/java/client/distribution/src/main/assembly/client-bin.xml b/java/client/distribution/src/main/assembly/client-bin.xml
new file mode 100644
index 0000000000..962f084995
--- /dev/null
+++ b/java/client/distribution/src/main/assembly/client-bin.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<assembly>
+  <id>java-client-bin</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+      <fileSet>
+          <!-- Apache license files -->
+          <directory>../../resources</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>DISCLAIMER</include>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+              <include>README.txt</include>
+          </includes>
+      </fileSet>
+
+      <!--fileSet>
+          < Client local documentation>
+          <directory>..</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>*.txt</include>
+          </includes>
+      </fileSet-->
+
+      <fileSet>
+          <directory>../../release-docs</directory>
+          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+          <includes>
+              <include>RELEASE_NOTES.txt</include>
+          </includes>
+      </fileSet>
+
+      <fileSet>
+          <directory>target</directory>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <includes>
+              <include>qpid-incubating.jar</include>
+          </includes>
+      </fileSet>
+  </fileSets>
+
+  <dependencySets>
+      <dependencySet>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <unpack>false</unpack>
+          <excludes>
+             <exclude>org.apache.qpid:qpid-client-distribution</exclude>
+          </excludes>
+      </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/java/client/distribution/src/main/assembly/client-src.xml b/java/client/distribution/src/main/assembly/client-src.xml
new file mode 100644
index 0000000000..b5055f05d7
--- /dev/null
+++ b/java/client/distribution/src/main/assembly/client-src.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<assembly>
+  <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+  <id>java-client-src</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+   
+      <fileSet>
+          <!-- Apache license files -->
+          <directory>../../resources</directory>
+          <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+          <includes>
+              <include>DISCLAIMER</include>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+              <include>README.txt</include>
+          </includes>
+      </fileSet>
+
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+      <includes>
+        <include>src/main/**</include>
+        <include>src/test/**</include>
+        <include>test/main/**</include>
+        <include>test/test/**</include>
+        <include>pom.xml</include>
+        <include>distribution/**</include>
+      </includes>
+      <excludes>
+        <exclude>**/target</exclude>
+        <exclude>**/target/**/*</exclude>
+        <exclude>**/build</exclude>
+        <exclude>**/build/**/*</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 47ac2cb583..35f5224a67 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -35,40 +35,51 @@
 
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
+        <java.source.version>1.5</java.source.version>
+        <qpid.version>${pom.version}</qpid.version>
+        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
     </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>
+            <exclusions> <!-- Tries to download 1.2.7-->
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-filter-ssl</artifactId>
         </dependency>
 
+<!-- Test Dependencies -->
+        <dependency> <!-- for inVm Broker -->
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-broker</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>jmscts</groupId>
             <artifactId>jmscts</artifactId>
@@ -85,12 +96,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
+            <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -115,24 +128,67 @@
                         </property>
                         <property>
                             <name>log4j.configuration</name>
-                            <value>file:///${basedir}/src/main/java/log4j.properties</value>
+                            <value>file:///${basedir}/src/main/java/client.log4j</value>
                         </property>
                     </systemProperties>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>bundle-test-jar</id>
                         <phase>package</phase>
                         <goals>
                             <goal>test-jar</goal>
                         </goals>
                     </execution>
-                </executions>                
+                </executions>
             </plugin>
+
         </plugins>
+
+<!-- The inclusion of this resource causes the build to hang. -->
+    <!--resources>
+        <resource>
+            <targetPath>META-INF/</targetPath>
+            <filtering>false</filtering>
+            <directory>../resources/META-INF</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </resource>
+    </resources-->
+
+    <testResources>
+        <testResource>
+            <targetPath>META-INF/</targetPath>
+            <filtering>false</filtering>
+            <directory>../resources/META-INF</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </testResource>
+        <testResource>
+            <targetPath>src/</targetPath>
+            <filtering>false</filtering>
+            <directory>src/test/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </testResource>
+
+        <testResource>
+            <targetPath></targetPath>
+            <filtering>false</filtering>
+            <directory>src/main/java</directory>
+            <includes>
+                <include>client.log4j</include>
+            </includes>
+        </testResource>
+    </testResources>
+
     </build>
+
 </project>
diff --git a/java/client/readme.txt b/java/client/readme.txt
deleted file mode 100644
index ef8fa01717..0000000000
--- a/java/client/readme.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-AMQP JMS API
-
-To build this you will need ant. The build.xml file requires that the amq.home
-property be set to point to the location of the root directory under which the
-base2 and amqp moduels reside (these contain protocol definitions used in 
-the code generation).
-
-You can avoid setting it if you have the following structure:
-
-    root/ 
-        base/
-        base2/
-        foreign/
-        gsl/
-        amqp/
-        blaze/
-                java/
-                    client
-                       build.xml
-                       Readme.txt [this file]
-                    common   
-
-
-Otherwise you can either pass it in on the command line or add it to a file 
-named build.properties in the same directory as this Readme.txt file. 
-
-E.g.:
-
-ant -Damq.home=c:\AMQP\
-
- 
diff --git a/java/client/src/main/java/log4j.properties b/java/client/src/main/java/client.log4j
index 6d596d1d19..525433e9a9 100644
--- a/java/client/src/main/java/log4j.properties
+++ b/java/client/src/main/java/client.log4j
@@ -1,28 +1,28 @@
-#
-# 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=${amqj.logging.level}, 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
+#

+# 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=${amqj.logging.level}, 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

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index ca8ba5e619..7f17dad8e6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -34,7 +34,6 @@ import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.jms.Session;
 import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.handler.ExchangeBoundHandler;
 import org.apache.qpid.url.AMQBindingURL;
 import org.apache.qpid.url.URLSyntaxException;
 
@@ -1425,7 +1424,7 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
             throw new JMSAMQException(e);
         }
         ExchangeBoundOkBody responseBody = (ExchangeBoundOkBody) response.getMethod();
-        return (responseBody.replyCode == ExchangeBoundHandler.OK);
+        return (responseBody.replyCode == 0); //ExchangeBoundHandler.OK); Remove Broker compile dependency
     }
 
     private void checkTransacted() throws JMSException
diff --git a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingClient.java b/java/client/src/old_test/java/org/apache/qpid/ping/TestPingClient.java
deleted file mode 100644
index b060498d9b..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingClient.java
+++ /dev/null
@@ -1,131 +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.
- *
- */
-package org.apache.qpid.ping;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.jms.Session;
-
-import javax.jms.*;
-import java.net.InetAddress;
-
-public class TestPingClient
-{
-    private static final Logger _logger = Logger.getLogger(TestPingClient.class);
-
-    private static class TestPingMessageListener implements MessageListener
-    {
-        public TestPingMessageListener()
-        {
-        }
-
-        long _lastTimestamp = 0L;
-        long _lastTimestampString = 0L;
-
-        public void onMessage(javax.jms.Message message)
-        {
-            if (_logger.isInfoEnabled())
-            {
-                long timestamp = 0L;
-                long timestampString = 0L;
-
-                try
-                {
-                    timestamp = message.getLongProperty("timestamp");
-                    timestampString = Long.parseLong(message.getStringProperty("timestampString"));
-
-                    if (timestampString != timestamp)
-                    {
-                        _logger.info("Timetamps differ!:\n" +
-                                "timestamp:" + timestamp + "\n" +
-                                "timestampString:" + timestampString);
-                    }
-
-                }
-                catch (JMSException jmse)
-                {
-                }
-
-                long diff = timestamp - _lastTimestamp;
-                _lastTimestamp = timestamp;
-
-                long stringDiff = timestampString - _lastTimestampString;
-
-                _lastTimestampString = timestampString;
-
-                _logger.info("Ping: T:" + diff + "ms, TS:" + stringDiff);
-
-                // _logger.info(_name + " got message '" + message + "\n");
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        _logger.setLevel(Level.INFO);
-
-        _logger.info("Starting...");
-
-        if (args.length < 4)
-        {
-            System.out.println("Usage: brokerdetails username password virtual-path [selector] ");
-            System.exit(1);
-        }
-        try
-        {
-            InetAddress address = InetAddress.getLocalHost();
-            AMQConnection con1 = new AMQConnection(args[0], args[1], args[2],
-                    address.getHostName(), args[3]);
-
-            final org.apache.qpid.jms.Session session1 = (org.apache.qpid.jms.Session)
-                    con1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-
-            String selector = null;
-
-            if (args.length == 5)
-            {
-                selector = args[4];
-            }
-
-            _logger.info("Message selector is <" + selector + ">...");
-
-            Queue q = new AMQQueue("ping");
-
-            MessageConsumer consumer1 = session1.createConsumer(q,
-                    1, false, false, selector);
-
-            consumer1.setMessageListener(new TestPingMessageListener());
-            con1.start();
-        }
-        catch (Throwable t)
-        {
-            System.err.println("Fatal error: " + t);
-            t.printStackTrace();
-        }
-
-        System.out.println("Waiting...");
-    }
-}
-
diff --git a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingProducer.java b/java/client/src/old_test/java/org/apache/qpid/ping/TestPingProducer.java
deleted file mode 100644
index 458dca0d56..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingProducer.java
+++ /dev/null
@@ -1,213 +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.
- *
- */
-package org.apache.qpid.ping;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.url.URLSyntaxException;
-import org.apache.qpid.client.AMQNoConsumersException;
-import org.apache.qpid.client.BasicMessageProducer;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.jms.MessageProducer;
-import org.apache.qpid.jms.Session;
-
-import javax.jms.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * A client that behaves as follows:
- * <ul><li>Connects to a queue, whose name is specified as a cmd-line argument</li>
- * <li>Creates a temporary queue</li>
- * <li>Creates messages containing a property that is the name of the temporary queue</li>
- * <li>Fires off a message on the original queue and waits for a response on the temporary queue</li>
- * </ul>
- */
-public class TestPingProducer implements ExceptionListener
-{
-    private static final Logger _log = Logger.getLogger(TestPingProducer.class);
-
-    private AMQConnection _connection;
-
-    private Session _session;
-
-    private boolean _publish;
-
-    private long SLEEP_TIME = 250L;
-
-    private class CallbackHandler implements MessageListener
-    {
-
-        private int _actualMessageCount;
-
-
-        public void onMessage(Message m)
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Message received: " + m);
-            }
-            _actualMessageCount++;
-            if (_actualMessageCount % 1000 == 0)
-            {
-                _log.info("Received message count: " + _actualMessageCount);
-            }
-        }
-    }
-
-    public TestPingProducer(boolean TRANSACTED, String brokerDetails, String clientID,
-                            String virtualpath) throws AMQException, URLSyntaxException
-    {
-        try
-        {
-            createConnection(brokerDetails, clientID, virtualpath);
-
-            if (TRANSACTED)
-            {
-                _session = (Session) _connection.createSession(true, Session.SESSION_TRANSACTED);
-            }
-            else
-            {
-                _session = (Session) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            }
-
-            AMQQueue destination = new AMQQueue("ping");
-            MessageProducer producer = (MessageProducer) _session.createProducer(destination);
-
-            _connection.setExceptionListener(this);
-
-            _connection.start();
-
-            int messageNumber = 0;
-
-            while (_publish)
-            {
-/*
-                TextMessage msg = _session.createTextMessage(
-                        "Presented to in conjunction with Mahnah Mahnah and the Snowths: " + ++messageNumber);
-*/
-                ObjectMessage msg = _session.createObjectMessage();
-
-                msg.setStringProperty("timestampString", Long.toString(System.currentTimeMillis()));
-                msg.setLongProperty("timestamp", System.currentTimeMillis());
-
-                ((BasicMessageProducer) producer).send(msg, DeliveryMode.NON_PERSISTENT, true);
-
-
-                if (TRANSACTED)
-                {
-                    try{
-                        _session.commit();
-                          _log.info("Message Sent.");// +"\n"+ msg);
-                    }catch (JMSException e)
-                    {
-                        try
-                        {
-                            _session.rollback();
-                        }
-                        catch (JMSException jsme)
-                        {
-                            _log.info(jsme);
-                        }
-
-
-                        if (e.getLinkedException() instanceof AMQNoConsumersException)
-                        {
-                            _log.info("No Consumers never mind.");
-
-                            continue;
-                        }
-                    }
-                }
-
-
-                if (SLEEP_TIME > 0)
-                {
-                    try
-                    {
-                        Thread.sleep(SLEEP_TIME);
-                    }
-                    catch (InterruptedException ie)
-                    {
-                        //do nothing
-                    }
-                }
-
-
-            }
-
-        }
-        catch (JMSException e)
-        {
-            _publish = false;
-            e.printStackTrace();
-        }
-    }
-
-    private void createConnection(String brokerDetails, String clientID, String virtualpath) throws AMQException, URLSyntaxException
-    {
-        _publish = true;
-        _connection = new AMQConnection(brokerDetails, "guest", "guest",
-                clientID, virtualpath);
-    }
-
-    /**
-     * @param args argument 1 if present specifies the name of the temporary queue to create. Leaving it blank
-     *             means the server will allocate a name.
-     */
-    public static void main(String[] args) throws URLSyntaxException
-    {
-        if (args.length == 0)
-        {
-            System.err.println("Usage: TestPingPublisher <brokerDetails> <virtual path> [transacted]");
-            System.exit(0);
-        }
-        try
-        {
-            InetAddress address = InetAddress.getLocalHost();
-            String clientID = address.getHostName() + System.currentTimeMillis();
-            new TestPingProducer(args.length == 3, args[0], clientID, args[1]);
-        }
-        catch (UnknownHostException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        catch (AMQException e)
-        {
-            System.err.println("Error in client: " + e);
-            e.printStackTrace();
-        }
-
-        //System.exit(0);
-    }
-
-    /**
-     * @see javax.jms.ExceptionListener#onException(javax.jms.JMSException)
-     */
-    public void onException(JMSException e)
-    {
-        System.err.println(e.getMessage());
-
-        _publish = false;
-        e.printStackTrace(System.err);
-    }
-}
diff --git a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingPublisher.java b/java/client/src/old_test/java/org/apache/qpid/ping/TestPingPublisher.java
deleted file mode 100644
index c7742be042..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingPublisher.java
+++ /dev/null
@@ -1,180 +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.
- *
- */
-package org.apache.qpid.ping;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.url.URLSyntaxException;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.BasicMessageProducer;
-import org.apache.qpid.jms.MessageProducer;
-import org.apache.qpid.jms.Session;
-
-import javax.jms.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * A client that behaves as follows:
- * <ul><li>Connects to a queue, whose name is specified as a cmd-line argument</li>
- * <li>Creates a temporary queue</li>
- * <li>Creates messages containing a property that is the name of the temporary queue</li>
- * <li>Fires off a message on the original queue and waits for a response on the temporary queue</li>
- * </ul>
- */
-public class TestPingPublisher implements ExceptionListener
-{
-    private static final Logger _log = Logger.getLogger(TestPingPublisher.class);
-
-    private AMQConnection _connection;
-
-    private Session _session;
-
-    private boolean _publish;
-
-    private long SLEEP_TIME = 0L;
-
-    private class CallbackHandler implements MessageListener
-    {
-
-        private int _actualMessageCount;
-
-
-        public void onMessage(Message m)
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Message received: " + m);
-            }
-            _actualMessageCount++;
-            if (_actualMessageCount % 1000 == 0)
-            {
-                _log.info("Received message count: " + _actualMessageCount);
-            }
-        }
-    }
-
-    public TestPingPublisher(String brokerDetails, String clientID, String virtualpath) throws AMQException, URLSyntaxException
-    {
-        try
-        {
-            createConnection(brokerDetails, clientID, virtualpath);
-
-            _session = (Session) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            //AMQQueue destination = new AMQQueue("ping");
-            AMQTopic destination = new AMQTopic("ping");
-            MessageProducer producer = (MessageProducer) _session.createProducer(destination);
-
-            _connection.setExceptionListener(this);
-
-            _connection.start();
-
-            int messageNumber = 0;
-
-            while (_publish)
-            {
-/*
-                TextMessage msg = _session.createTextMessage(
-                        "Presented to in conjunction with Mahnah Mahnah and the Snowths: " + ++messageNumber);
-*/
-                ObjectMessage msg = _session.createObjectMessage();
-
-                Long time = System.nanoTime();
-                msg.setStringProperty("timestampString", Long.toString(time));
-                msg.setLongProperty("timestamp", time);
-
-                ((BasicMessageProducer) producer).send(msg, DeliveryMode.PERSISTENT, true);
-
-                _log.info("Message Sent:\n" + msg);
-
-                if (SLEEP_TIME > 0)
-                {
-                    try
-                    {
-                        Thread.sleep(SLEEP_TIME);
-                    }
-                    catch (InterruptedException ie)
-                    {
-                        //do nothing
-                    }
-                }
-
-
-            }
-
-        }
-        catch (JMSException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void createConnection(String brokerDetails, String clientID, String virtualpath) throws AMQException, URLSyntaxException
-    {
-        _publish = true;
-        _connection = new AMQConnection(brokerDetails, "guest", "guest",
-                clientID, virtualpath);
-
-    }
-
-    /**
-     * @param args argument 1 if present specifies the name of the temporary queue to create. Leaving it blank
-     *             means the server will allocate a name.
-     */
-    public static void main(String[] args) throws URLSyntaxException
-    {
-        if (args.length == 0)
-        {
-            System.err.println("Usage: TestPingPublisher <brokerDetails> <virtual path>");
-            System.exit(0);
-        }
-        try
-        {
-            InetAddress address = InetAddress.getLocalHost();
-            String clientID = address.getHostName() + System.currentTimeMillis();
-            new TestPingPublisher(args[0], clientID, args[1]);
-        }
-        catch (UnknownHostException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        catch (AMQException e)
-        {
-            System.err.println("Error in client: " + e);
-            e.printStackTrace();
-        }
-
-        //System.exit(0);
-    }
-
-    /**
-     * @see javax.jms.ExceptionListener#onException(javax.jms.JMSException)
-     */
-    public void onException(JMSException e)
-    {
-        System.err.println(e.getMessage());
-
-        _publish = false;
-        e.printStackTrace(System.err);
-    }
-}
diff --git a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingSubscriber.java b/java/client/src/old_test/java/org/apache/qpid/ping/TestPingSubscriber.java
deleted file mode 100644
index 8e8c3f2e6e..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/ping/TestPingSubscriber.java
+++ /dev/null
@@ -1,132 +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.
- *
- */
-package org.apache.qpid.ping;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.jms.Session;
-
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Topic;
-import javax.jms.JMSException;
-import java.net.InetAddress;
-
-public class TestPingSubscriber
-{
-    private static final Logger _logger = Logger.getLogger(TestPingClient.class);
-
-    private static class TestPingMessageListener implements MessageListener
-    {
-        public TestPingMessageListener()
-        {
-        }
-
-        long _lastTimestamp = 0L;
-        long _lastTimestampString = 0L;
-
-        public void onMessage(javax.jms.Message message)
-        {
-            Long time = System.nanoTime();
-
-            if (_logger.isInfoEnabled())
-            {
-                long timestamp = 0L;
-                long timestampString = 0L;
-
-                try
-                {
-                    timestamp = message.getLongProperty("timestamp");
-                    timestampString = Long.parseLong(message.getStringProperty("timestampString"));
-
-                    if (timestampString != timestamp)
-                    {
-                        _logger.info("Timetamps differ!:\n" +
-                                "timestamp:" + timestamp + "\n" +
-                                "timestampString:" + timestampString);
-                    }
-
-                }
-                catch (JMSException jmse)
-                {
-                }
-
-                long diff = time - timestamp;
-
-                long stringDiff = time - timestampString;
-
-                _logger.info("Ping: TS:" + stringDiff/1000+"us");
-
-                // _logger.info(_name + " got message '" + message + "\n");
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        _logger.setLevel(Level.INFO);
-
-        _logger.info("Starting...");
-
-        if (args.length < 4)
-        {
-            System.out.println("Usage: brokerdetails username password virtual-path [selector] ");
-            System.exit(1);
-        }
-        try
-        {
-            InetAddress address = InetAddress.getLocalHost();
-            AMQConnection con1 = new AMQConnection(args[0], args[1], args[2],
-                    address.getHostName(), args[3]);
-
-            final org.apache.qpid.jms.Session session1 = (org.apache.qpid.jms.Session)
-                    con1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-
-            String selector = null;
-
-            if (args.length == 5)
-            {
-                selector = args[4];
-            }
-
-            _logger.info("Message selector is <" + selector + ">...");
-
-            Topic t = new AMQTopic("ping");
-
-            MessageConsumer consumer1 = session1.createConsumer(t,
-                    1, false, false, selector);
-
-            consumer1.setMessageListener(new TestPingMessageListener());
-            con1.start();
-        }
-        catch (Throwable t)
-        {
-            System.err.println("Fatal error: " + t);
-            t.printStackTrace();
-        }
-
-        System.out.println("Waiting...");
-    }
-}
-
diff --git a/java/client/src/old_test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java b/java/client/src/old_test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
deleted file mode 100644
index 7cbec7c85c..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/requestreply1/ServiceProvidingClient.java
+++ /dev/null
@@ -1,201 +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.
- *
- */
-package org.apache.qpid.requestreply1;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.jms.Session;
-import org.apache.qpid.jms.ConnectionListener;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.url.URLSyntaxException;
-
-import javax.jms.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public class ServiceProvidingClient
-{
-    private static final Logger _logger = Logger.getLogger(ServiceProvidingClient.class);
-
-    private MessageProducer _destinationProducer;
-
-    private Destination _responseDest;
-
-    private AMQConnection _connection;
-
-    public ServiceProvidingClient(String brokerDetails, String username, String password,
-                                  String clientName, String virtualPath, String serviceName)
-            throws AMQException, JMSException, URLSyntaxException
-    {
-        _connection = new AMQConnection(brokerDetails, username, password,
-                                        clientName, virtualPath);
-        _connection.setConnectionListener(new ConnectionListener()
-        {
-
-            public void bytesSent(long count)
-            {
-            }
-
-            public void bytesReceived(long count)
-            {
-            }
-
-            public boolean preFailover(boolean redirect)
-            {
-                return true;
-            }
-
-            public boolean preResubscribe()
-            {
-                return true;
-            }
-
-            public void failoverComplete()
-            {
-                _logger.info("App got failover complete callback");
-            }
-        });
-        final Session session = (Session) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        _logger.info("Service (queue) name is '" + serviceName + "'...");
-
-        AMQQueue destination = new AMQQueue(serviceName);
-
-        MessageConsumer consumer = session.createConsumer(destination,
-                                                          100, true, false, null);
-
-        consumer.setMessageListener(new MessageListener()
-        {
-            private int _messageCount;
-
-            public void onMessage(Message message)
-            {
-                //_logger.info("Got message '" + message + "'");
-
-                TextMessage tm = (TextMessage) message;
-
-                try
-                {
-                    Destination responseDest = tm.getJMSReplyTo();
-                    if (responseDest == null)
-                    {
-                        _logger.info("Producer not created because the response destination is null.");
-                        return;
-                    }
-
-                    if (!responseDest.equals(_responseDest))
-                    {
-                        _responseDest = responseDest;
-
-                        _logger.info("About to create a producer");
-                        _destinationProducer = session.createProducer(responseDest);
-                        _destinationProducer.setDisableMessageTimestamp(true);
-                        _destinationProducer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-                        _logger.info("After create a producer");
-                    }
-                }
-                catch (JMSException e)
-                {
-                    _logger.error("Error creating destination");
-                }
-                _messageCount++;
-                if (_messageCount % 1000 == 0)
-                {
-                    _logger.info("Received message total: " + _messageCount);
-                    _logger.info("Sending response to '" + _responseDest + "'");
-                }
-
-                try
-                {
-                    String payload = "This is a response: sing together: 'Mahnah mahnah...'" + tm.getText();
-                    TextMessage msg = session.createTextMessage(payload);
-                    if (tm.propertyExists("timeSent"))
-                    {
-                        _logger.info("timeSent property set on message");
-                        _logger.info("timeSent value is: " + tm.getLongProperty("timeSent"));
-                        msg.setStringProperty("timeSent", tm.getStringProperty("timeSent"));
-                    }
-                    _destinationProducer.send(msg);
-                    if (_messageCount % 1000 == 0)
-                    {
-                        _logger.info("Sent response to '" + _responseDest + "'");
-                    }
-                }
-                catch (JMSException e)
-                {
-                    _logger.error("Error sending message: " + e, e);
-                }
-            }
-        });
-    }
-
-    public void run() throws JMSException
-    {
-        _connection.start();
-        _logger.info("Waiting...");
-    }
-
-    public static void main(String[] args)
-    {
-        _logger.info("Starting...");
-
-        if (args.length < 5)
-        {
-            System.out.println("Usage: brokerDetails username password virtual-path serviceQueue [selector]");
-            System.exit(1);
-        }
-        String clientId = null;
-        try
-        {
-            InetAddress address = InetAddress.getLocalHost();
-            clientId = address.getHostName() + System.currentTimeMillis();
-        }
-        catch (UnknownHostException e)
-        {
-            _logger.error("Error: " + e, e);
-        }
-
-        try
-        {
-            ServiceProvidingClient client = new ServiceProvidingClient(args[0], args[1], args[2],
-                                                                       clientId, args[3], args[4]);
-            client.run();
-        }
-        catch (JMSException e)
-        {
-            _logger.error("Error: " + e, e);
-        }
-        catch (AMQException e)
-        {
-            _logger.error("Error: " + e, e);
-        }
-        catch (URLSyntaxException e)
-        {
-            _logger.error("Error: " + e, e);
-        }
-
-
-
-    }
-
-}
-
diff --git a/java/client/src/old_test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java b/java/client/src/old_test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
deleted file mode 100644
index 74becfd9bb..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/requestreply1/ServiceRequestingClient.java
+++ /dev/null
@@ -1,303 +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.
- *
- */
-package org.apache.qpid.requestreply1;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.url.URLSyntaxException;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.jms.MessageConsumer;
-import org.apache.qpid.jms.MessageProducer;
-import org.apache.qpid.jms.Session;
-
-import javax.jms.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * A client that behaves as follows:
- * <ul><li>Connects to a queue, whose name is specified as a cmd-line argument</li>
- * <li>Creates a temporary queue</li>
- * <li>Creates messages containing a property that is the name of the temporary queue</li>
- * <li>Fires off a message on the original queue and waits for a response on the temporary queue</li>
- * </ul>
- *
- */
-public class ServiceRequestingClient implements ExceptionListener
-{
-    private static final Logger _log = Logger.getLogger(ServiceRequestingClient.class);
-
-    private static final String MESSAGE_DATA_BYTES = "jfd ghljgl hjvhlj cvhvjf ldhfsj lhfdsjf hldsjfk hdslkfj hsdflk  ";
-
-    private String MESSAGE_DATA;
-
-    private AMQConnection _connection;
-
-    private Session _session;
-
-    private long _averageLatency;
-
-    private int _messageCount;
-
-    private volatile boolean _completed;
-
-    private AMQDestination _tempDestination;
-
-    private MessageProducer _producer;
-
-    private Object _waiter;
-
-    private static String createMessagePayload(int size)
-    {
-        _log.info("Message size set to " + size + " bytes");
-        StringBuffer buf = new StringBuffer(size);
-        int count = 0;
-        while (count < size + MESSAGE_DATA_BYTES.length())
-        {
-            buf.append(MESSAGE_DATA_BYTES);
-            count += MESSAGE_DATA_BYTES.length();
-        }
-        if (count < size)
-        {
-            buf.append(MESSAGE_DATA_BYTES, 0, size - count);
-        }
-
-        return buf.toString();
-    }
-
-    private class CallbackHandler implements MessageListener
-    {
-        private int _expectedMessageCount;
-
-        private int _actualMessageCount;
-
-        private long _startTime;
-
-        public CallbackHandler(int expectedMessageCount, long startTime)
-        {
-            _expectedMessageCount = expectedMessageCount;
-            _startTime = startTime;
-        }
-
-        public void onMessage(Message m)
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Message received: " + m);
-            }
-            try
-            {
-                m.getPropertyNames();
-                if (m.propertyExists("timeSent"))
-                {
-                    long timeSent = Long.parseLong(m.getStringProperty("timeSent"));
-                    long now = System.currentTimeMillis();
-                    if (_averageLatency == 0)
-                    {
-                        _averageLatency = now - timeSent;
-                        _log.info("Latency " + _averageLatency);
-                    }
-                    else
-                    {
-                        _log.info("Individual latency: " + (now - timeSent));
-                        _averageLatency = (_averageLatency + (now - timeSent)) / 2;
-                        _log.info("Average latency now: " + _averageLatency);
-                    }
-                }
-            }
-            catch (JMSException e)
-            {
-                _log.error("Error getting latency data: " + e, e);
-            }
-            _actualMessageCount++;
-            if (_actualMessageCount % 1000 == 0)
-            {
-                _log.info("Received message count: " + _actualMessageCount);
-            }
-
-            if (_actualMessageCount == _expectedMessageCount)
-            {
-                _completed = true;
-                notifyWaiter();
-                long timeTaken = System.currentTimeMillis() - _startTime;
-                _log.info("Total time taken to receive " + _expectedMessageCount + " messages was " +
-                          timeTaken + "ms, equivalent to " +
-                          (_expectedMessageCount / (timeTaken / 1000.0)) + " messages per second");
-
-                try
-                {
-                    _connection.close();
-                    _log.info("Connection closed");
-                }
-                catch (JMSException e)
-                {
-                    _log.error("Error closing connection");
-                }
-            }
-        }
-    }
-
-    private void notifyWaiter()
-    {
-        if (_waiter != null)
-        {
-            synchronized (_waiter)
-            {
-                _waiter.notify();
-            }
-        }
-    }
-    public ServiceRequestingClient(String brokerHosts, String clientID, String username, String password,
-                                   String vpath, String commandQueueName,
-                                   final int messageCount, final int messageDataLength) throws AMQException, URLSyntaxException
-    {
-        _messageCount = messageCount;
-        MESSAGE_DATA = createMessagePayload(messageDataLength);
-        try
-        {
-            createConnection(brokerHosts, clientID, username, password, vpath);
-            _session = (Session) _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-
-            _connection.setExceptionListener(this);
-
-
-            AMQQueue destination = new AMQQueue(commandQueueName);
-            _producer = (MessageProducer) _session.createProducer(destination);
-            _producer.setDisableMessageTimestamp(true);
-            _producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
-            _tempDestination = new AMQQueue("TempResponse" +
-                                            Long.toString(System.currentTimeMillis()), true);
-            MessageConsumer messageConsumer = (MessageConsumer) _session.createConsumer(_tempDestination, 100, true,
-                                                                                        true, null);
-
-            //Send first message, then wait a bit to allow the provider to get initialised
-            TextMessage first = _session.createTextMessage(MESSAGE_DATA);
-            first.setJMSReplyTo(_tempDestination);
-            _producer.send(first);
-            try
-            {
-                Thread.sleep(1000);
-            }
-            catch (InterruptedException ignore)
-            {
-            }
-
-            //now start the clock and the test...
-            final long startTime = System.currentTimeMillis();
-
-            messageConsumer.setMessageListener(new CallbackHandler(messageCount, startTime));
-        }
-        catch (JMSException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-
-    /**
-     * Run the test and notify an object upon receipt of all responses.
-     * @param waiter the object that will be notified
-     * @throws JMSException
-     */
-    public void run(Object waiter) throws JMSException
-    {
-        _waiter = waiter;
-        _connection.start();
-        for (int i = 1; i < _messageCount; i++)
-        {
-            TextMessage msg = _session.createTextMessage(MESSAGE_DATA + i);
-            msg.setJMSReplyTo(_tempDestination);
-            if (i % 1000 == 0)
-            {
-                long timeNow = System.currentTimeMillis();
-                msg.setStringProperty("timeSent", String.valueOf(timeNow));
-            }
-            _producer.send(msg);
-        }
-        _log.info("Finished sending " + _messageCount + " messages");
-    }
-
-    public boolean isCompleted()
-    {
-        return _completed;
-    }
-
-    private void createConnection(String brokerHosts, String clientID, String username, String password,
-                                  String vpath) throws AMQException, URLSyntaxException
-    {
-        _connection = new AMQConnection(brokerHosts, username, password,
-                                        clientID, vpath);
-    }
-
-    /**
-     * @param args argument 1 if present specifies the name of the temporary queue to create. Leaving it blank
-     *             means the server will allocate a name.
-     */
-    public static void main(String[] args)
-    {
-        if (args.length < 6)
-        {
-            System.err.println(
-                    "Usage: ServiceRequestingClient <brokerDetails - semicolon separated host:port list> <username> <password> <vpath> <command queue name> <number of messages> <message size>");
-        }
-        try
-        {
-            int messageDataLength = args.length > 6 ? Integer.parseInt(args[6]) : 4096;
-
-            InetAddress address = InetAddress.getLocalHost();
-            String clientID = address.getHostName() + System.currentTimeMillis();
-            ServiceRequestingClient client = new ServiceRequestingClient(args[0], clientID, args[1], args[2], args[3],
-                                                                         args[4], Integer.parseInt(args[5]),
-                                                                         messageDataLength);
-            Object waiter = new Object();
-            client.run(waiter);
-            synchronized (waiter)
-            {
-                while (!client.isCompleted())
-                {
-                    waiter.wait();
-                }
-            }
-
-        }
-        catch (UnknownHostException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        catch (Exception e)
-        {
-            System.err.println("Error in client: " + e);
-            e.printStackTrace();
-        }
-    }
-
-     /**
-     * @see javax.jms.ExceptionListener#onException(javax.jms.JMSException)
-     */
-    public void onException(JMSException e)
-    {
-        System.err.println(e.getMessage());
-        e.printStackTrace(System.err);
-    }
-}
diff --git a/java/client/src/old_test/java/org/apache/qpid/requestreply1/VmRequestReply.java b/java/client/src/old_test/java/org/apache/qpid/requestreply1/VmRequestReply.java
deleted file mode 100644
index a1577cffa5..0000000000
--- a/java/client/src/old_test/java/org/apache/qpid/requestreply1/VmRequestReply.java
+++ /dev/null
@@ -1,69 +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.
- *
- */
-package org.apache.qpid.requestreply1;
-
-import junit.framework.TestCase;
-import org.apache.log4j.Logger;
-import org.apache.qpid.testutil.VMBrokerSetup;
-
-public class VmRequestReply extends TestCase
-{
-    private static final Logger _logger = Logger.getLogger(VmRequestReply.class);
-
-    public void testSimpleClient() throws Exception
-    {
-        ServiceProvidingClient serviceProvider = new ServiceProvidingClient("vm://:1", "guest", "guest",
-                                                                            "serviceProvidingClient", "/test",
-                                                                            "serviceQ");
-
-        ServiceRequestingClient serviceRequester = new ServiceRequestingClient("vm://:1", "myClient", "guest", "guest",
-                                                                               "/test", "serviceQ", 5000, 512);
-
-        serviceProvider.run();
-        Object waiter = new Object();
-        serviceRequester.run(waiter);
-        synchronized (waiter)
-        {
-            while (!serviceRequester.isCompleted())
-            {
-                waiter.wait();
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        VmRequestReply rr = new VmRequestReply();
-        try
-        {
-            rr.testSimpleClient();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error: " + e, e);
-        }
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new VMBrokerSetup(new junit.framework.TestSuite(VmRequestReply.class));
-    }
-}