QPID-108: remove obsolete ant build files

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

16 files changed, 0 insertions, 1978 deletions

diff --git a/java/broker/build-module.xml b/java/broker/build-module.xml
deleted file mode 100644
index bfc7ccc13a..0000000000
--- a/java/broker/build-module.xml
+++ /dev/null
@@ -1,26 +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.
- -
- -->
-<project name="AMQ Broker" default="build">
-  <property name="module.depends" value="common"/>
-  <property name="module.main" value="org.apache.qpid.server.Main"/>
-  <property name="module.vm.version" value="1.5"/>
-  <import file="../module.xml"/>
-</project>
diff --git a/java/broker/build-old.xml b/java/broker/build-old.xml
deleted file mode 100644
index 52a30f53ae..0000000000
--- a/java/broker/build-old.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.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.
- -
- -->
-
-<!-- AMQPd build file -->
-
-<project name="qpid-broker" default="jar" basedir=".">
-
-    <!-- Global task properties -->
-    <property name="common.root" value="${basedir}/../common"/>
-    <property name="common.lib" value="${common.root}/lib"/>
-    <property name="common.src" value="${common.root}/src"/>
-    <property name="common.resources" value="${common.root}/resources"/>
-
-    <property name="common.generated.java.src" value="${common.root}/generated/java"/>
-
-    <property name="client.classes" value="${basedir}/../client/classes"/>
-    <property name="client.testclasses" value="${basedir}/../client/testclasses"/>
-
-    <property name="broker.root" value="${basedir}"/>
-    <property name="broker.lib" value="${basedir}/lib"/>
-    <property name="broker.src" value="${broker.root}/src"/>
-    <property name="broker.tests" value="${broker.root}/test"/>
-    <property name="broker.classes" value="${broker.root}/classes"/>
-    <property name="broker.testclasses" value="${broker.root}/testclasses"/>
-
-    <property name="broker.dist" value="${basedir}/dist"/>
-    <property name="dam.dist" value="${basedir}/damPackage"/>
-
-    <!-- Path structures used by several tasks -->
-    <path id="amqp.classpath">
-        <fileset dir="${broker.lib}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${common.lib}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement path="${client.classes}"/>
-        <pathelement path="${client.testclasses}"/>
-        <pathelement path="${broker.classes}"/>
-        <pathelement path="${broker.testclasses}"/>
-    </path>
-
-    <!-- Task definitions -->
-
-    <target name="init" description="Initialise the build process">
-        <tstamp>
-            <format property="release" pattern="-dMMMyy" locale="en" timezone="GMT"/>
-        </tstamp>
-
-        <mkdir dir="${broker.classes}"/>
-        <mkdir dir="${broker.testclasses}"/>
-        <mkdir dir="${broker.dist}"/>
-    </target>
-
-    <!-- Remove all built files -->
-    <target name="clean" depends="init" description="Remove all built and generated files">
-        <delete dir="${broker.dist}"/>
-        <!--<delete dir="${generated.java.src}"/>-->
-        <delete dir="${broker.classes}"/>
-        <delete dir="${broker.testclasses}"/>
-    </target>
-
-    <!-- Generate framing source code from protocol specification -->
-    <target name="generate" description="Generates framing source code from protocol specification">
-         <ant dir="../common" target="generate"/>
-    </target>
-
-    <!-- Compile Java -->
-    <target name="compile" depends="init, generate" description="Compile all source files excluding tests">
-        <javac destdir="${broker.classes}" target="1.5" source="1.5" classpathref="amqp.classpath" debug="on">
-            <compilerarg value="-Xlint:unchecked" />
-            <compilerarg value="-Xlint:deprecation" />
-            <src path="${common.src}"/>
-            <src path="${broker.src}"/>
-            <src path="${common.generated.java.src}"/>
-        </javac>
-
-        <copy todir="${broker.classes}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${broker.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-            <fileset dir="${common.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-            <fileset dir="${common.resources}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="compiletests" depends="compile" description="Compile all tests">
-        <javac destdir="${broker.testclasses}" target="1.5" source="1.5" classpathref="amqp.classpath" debug="on">
-            <compilerarg value="-Xlint:unchecked"/>
-            <compilerarg value="-Xlint:deprecation"/>
-            <src path="${broker.tests}"/>
-        </javac>
-
-        <copy todir="${broker.testclasses}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${broker.tests}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="test" depends="compiletests">
-        <junit fork="yes" showoutput="true" haltonfailure="yes">
-            <test name="org.apache.qpid.server.UnitTests"/>
-            <formatter type="plain"/>
-            <classpath refid="amqp.classpath"/>
-        </junit>
-    </target>
-
-    <!-- Build jar archive -->
-    <target name="jar" depends="compile, compiletests" description="Create Jar files as the distribution">
-        <mkdir dir="${broker.dist}"/>
-        <jar basedir="${broker.classes}" jarfile="${broker.dist}/amqpd.jar"/>
-        <jar basedir="${broker.testclasses}" jarfile="${broker.dist}/amqpd-tests.jar"/>
-    </target>
-
-    <target name="release" depends="jar" description="Create a release package">
-        <!-- create a jar file that will contain classpath entries for all required jars -->
-        <jar jarfile="${broker.dist}/broker-launch.jar">
-            <manifest>
-                <attribute name="Main-Class" value="org.apache.qpid.server.Main"/>
-                <attribute name="Class-Path" value="lib/je-3.0.35.jar lib/slf4j-simple.jar lib/log4j-1.2.13.jar lib/mina-core-0.9.5-SNAPSHOT.jar lib/mina-filter-ssl-0.9.5-SNAPSHOT.jar lib/commons-cli-1.0.jar lib/commons-configuration-1.2.jar lib/commons-collections-3.1.jar lib/commons-logging-api.jar lib/commons-logging.jar lib/commons-lang-2.1.jar lib/amqpd.jar lib/amqp-common.jar"/>
-            </manifest>
-        </jar>
-        <!-- create a zip for releasing -->
-        <zip destfile="${broker.dist}/broker.zip">
-            <fileset dir="bin" includes="*.sh,*.bat"/>
-            <fileset file="${broker.dist}/broker-launch.jar" />
-            <zipfileset prefix="etc" dir="etc" includes="*"/>
-            <zipfileset prefix="lib" file="${broker.lib}/bdb/je-3.0.35.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/slf4j/slf4j-simple.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/logging-log4j/log4j-1.2.13.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/mina/mina-core-0.9.5-SNAPSHOT.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/commons-cli/commons-cli-1.0.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/commons-configuration/commons-configuration-1.2.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/commons-collections/commons-collections-3.1.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging-api.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging.jar"/>
-            <zipfileset prefix="lib" file="${common.lib}/commons-lang/commons-lang-2.1.jar"/>
-            <zipfileset prefix="lib" file="${broker.dist}/amqpd.jar"/>
-            <zipfileset prefix="lib" file="${broker.dist}/amqp-common.jar"/>
-        </zip>
-
-        <tar destfile="${broker.dist}/broker.tar.gz" compression="gzip">
-            <tarfileset dir="bin" includes="*.sh,*.bat"/>
-            <tarfileset file="${broker.dist}/broker-launch.jar" />
-            <tarfileset prefix="etc" dir="etc" includes="*"/>
-            <tarfileset prefix="lib" file="${broker.lib}/bdb/je-3.0.35.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/slf4j/slf4j-simple.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/logging-log4j/log4j-1.2.13.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/mina/mina-core-0.9.5-SNAPSHOT.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/commons-cli/commons-cli-1.0.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/commons-configuration/commons-configuration-1.2.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/commons-collections/commons-collections-3.1.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging-api.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging.jar"/>
-            <tarfileset prefix="lib" file="${common.lib}/commons-lang/commons-lang-2.1.jar"/>
-            <tarfileset prefix="lib" file="${broker.dist}/amqpd.jar"/>
-            <tarfileset prefix="lib" file="${broker.dist}/amqp-common.jar"/>
-        </tar>
-    </target>
-
-    <!-- @TODO finish this target MM !! -->
-    <target name="damit">
-
-		<property name="tarFileName" value="ams_amq.tar"/>
-		<delete failonerror="false" file="${tarFileName}"/>
-		<delete includeEmptyDirs="true" failonerror="false">
-			<fileset dir="${dam.dist}"/>
-		</delete>
-		<mkdir dir="${dam.dist}"/>
-		<copy todir="${dam.dist}">
-			<fileset dir="${basedir}/damPackage">
-				<exclude name="config/gps_domain/applications/gps.ear"/>
-			</fileset>
-		</copy>
-		<!-- Remove CR and EOF characters from shell scripts within the DAM package -->
-		<fixcrlf srcdir="${dam.dist}" eol="lf" eof="remove">
-			<include name="**/*.sh"/>
-			<include name="**/*.startup"/>
-		</fixcrlf>
-
-        <tar tarfile="${tarFileName}">
-			<!-- add everything _except_ shell scripts: rw_r__r__ -->
-			<tarfileset dir="${dam.dist}" mode="644">
-				<exclude name="**/*.sh"/>
-				<exclude name="**/*.startup"/>
-			</tarfileset>
-			<!-- add all shell scripts as executable: rwxr_xr_x -->
-			<tarfileset dir="${dam.dist}" mode="755">
-				<include name="**/*.sh"/>
-				<include name="**/*.startup"/>
-			</tarfileset>
-		</tar>
-
-	</target>
-
-    <target name="javadoc" depends="compile, compiletests" description="Generate javadoc for all broker classes">
-        <mkdir dir="${broker.dist}/docs/api"/>
-        <javadoc sourcepath="${broker.src}" destdir="${broker.dist}/docs/api"
-                 packagenames="org.apache.qpid.*" classpathref="amqp.classpath" author="true"
-                 version="true" windowTitle="AMQPd (Project Qpid) API" doctitle="AMQP Broker API"
-                 footer="See &lt;a href=&quot;http://www.amqp.org&quot;&gt;www.amqp.org&lt;/a&gt; for more information."
-                 use="true" verbose="false"/>
-    </target>
-
-    <target name="RunBroker" depends="compile" description="Run broker">
-        <java classpathref="amqp.classpath" fork="yes" classname="org.apache.qpid.server.Main">
-            <sysproperty key="amqj.logging.level" value="INFO"/>
-            <jvmarg value="-server"/>
-        </java>
-    </target>
-
-    <target name="profile" depends="compile" description="Run broker in Netbeans profiler">
-        <fail unless="netbeans.home">This target can only run inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-          <classpath refid="amqp.classpath"/>
-        </nbprofiledirect>
-
-        <java classpathref="amqp.classpath" fork="yes" classname="org.apache.qpid.server.Main"
-              dir="${profiler.session.working.dir}"
-              jvm="${profiler.info.jvm}">
-            <sysproperty key="amqj.logging.level" value="INFO"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <jvmarg value="-server"/>
-            <jvmarg value="-Xmx512m"/>
-            <env key="Path" path="${profiler.info.agentpath}:${env.Path}"/>
-        </java>
-    </target>
-
-    <target name="profile-single" depends="compile" description="Profile File">
-        <fail unless="netbeans.home">This target can only run inside the NetBeans IDE.</fail>
-        <nbprofile classname="${profile.class}">
-            <classpath refid="amqp.classpath"/>
-        </nbprofile>
-    </target>
-</project>
diff --git a/java/broker/test/build-module.xml b/java/broker/test/build-module.xml
deleted file mode 100644
index f40a659a28..0000000000
--- a/java/broker/test/build-module.xml
+++ /dev/null
@@ -1,50 +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.
- -
- -->
-<project name="Broker Tests" default="build">
-    <property name="module.depends" value="broker common"/>
-    <property name="module.dist" value="false"/>
-
-    <import file="../../module.xml"/>
-
-    <target name="test" depends="build">
-        <junit fork="yes" showoutput="true" haltonfailure="yes">
-            <test name="org.apache.qpid.server.UnitTests"/>
-            <formatter type="plain"/>
-            <classpath refid="module.class.path"/>
-        </junit>
-    </target>
-
-    <target name="testreport" depends="build">
-        <junit fork="yes" printsummary="yes" haltonfailure="no">
-            <test name="org.apache.qpid.server.UnitTests" fork="yes" todir="${module.test.reports}"/>
-            <formatter type="xml" />
-            <classpath refid="module.class.path" />
-        </junit>
-
-        <junitreport todir="${module.test.reports}">
-            <fileset dir="${module.test.reports}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report todir="${module.test.reports}"/>
-        </junitreport>
-    </target>
-
-</project>
diff --git a/java/build-old.xml b/java/build-old.xml
deleted file mode 100644
index 63b561bd8e..0000000000
--- a/java/build-old.xml
+++ /dev/null
@@ -1,40 +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.
- -
- -->
-<project name="AMQ Java" default="build">
-
-  <macrodef name="iterate">
-    <attribute name="target"/>
-    <sequential>
-      <subant target="@{target}">
-        <filelist dir="." files="common,broker,client"/>
-      </subant>
-    </sequential>
-  </macrodef>
-
-  <target name="build">
-    <iterate target=""/>
-  </target>
-
-  <target name="clean">
-    <iterate target="clean"/>
-  </target>
-
-</project>
diff --git a/java/build.properties b/java/build.properties
deleted file mode 100644
index c01dc7222b..0000000000
--- a/java/build.properties
+++ /dev/null
@@ -1,21 +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.
-#
-build.release.version=1.0
-build.release.name=incubator
-build.release.tag=M1
diff --git a/java/build.xml b/java/build.xml
deleted file mode 100644
index e7db51f152..0000000000
--- a/java/build.xml
+++ /dev/null
@@ -1,348 +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.
- -
- -->
-<project name="AMQ Java" default="build">
-
-  <import file="common.xml"/>
-
-  <property file="build.properties"/>
-  <property name="modules.extra" value=""/>
-  <property name="modules.client" value="common,client"/>
-  <property name="modules"
-            value="${modules.client},broker,broker/test,client/test,cluster,systests,${modules.extra}"/>
-
-  <property name="release.fullversion" value="${build.release.version}-${build.release.name}-${build.release.tag}"/>
-
-  <macrodef name="iterate">
-    <attribute name="target"/>
-    <attribute name="modules" default="${modules}"/>
-    <element name="elements" implicit="true" optional="true"/>
-    <sequential>
-      <subant target="@{target}" antfile="build-module.xml">
-        <filelist dir="." files="@{modules}"/>
-        <elements/>
-      </subant>
-    </sequential>
-  </macrodef>
-
-  <target name="build" description="compile java source code for each module">
-    <iterate target="build"/>
-  </target>
-
-  <target name="test" description="execute unit tests">
-    <iterate target="test"/>
-  </target>
-
-  <target name="testreport" description="execute unit tests and produce reports">
-    <iterate target="testreport"/>
-  </target>
-
-  <target name="doc" description="produce javadoc for each module">
-    <iterate target="doc"/>
-  </target>
-
-  <target name="jar"
-          description="create java class file archives for each module">
-    <iterate target="jar"/>
-  </target>
-
-  <target name="dist"
-          description="copy each module's files into a single distribution tree">
-    <iterate target="dist"/>
-    <iterate target="dist-lib" modules="${modules.client}">
-      <property name="dist.dir" value="${dist.client.dir}"/>
-    </iterate>
-  </target>
-
-  <target name="clean" description="remove all build artifacts">
-    <iterate target="clean"/>
-    <delete dir="${build.dir}"/>
-    <delete dir="${release.dir}"/>
-  </target>
-
-  <property name="client.includes" value="*/client/**"/>
-
-  <target name="zip" depends="dist"
-          description="produce a zip archive of the distribution tree">
-    <zip basedir="${dist.root}" destfile="${build.zip}"/>
-    <zip basedir="${dist.root}" destfile="${client.zip}"
-         includes="${client.includes}"/>
-  </target>
-
-  <target name="tar" depends="dist"
-          description="produce a tar archive of the distribution tree">
-    <tar basedir="${dist.root}" destfile="${build.tar}"/>
-    <tar basedir="${dist.root}" destfile="${client.tar}"
-         includes="${client.includes}"/>
-  </target>
-
-  <target name="gzip" depends="tar"
-          description="produce a gzipped tarball of the distribution tree">
-    <gzip src="${build.tar}" destfile="${build.tgz}"/>
-    <gzip src="${client.tar}" destfile="${client.tgz}"/>
-  </target>
-
-  <target name="bzip2" depends="tar"
-          description="produze a bzipped tarball of the distribution tree">
-    <bzip2 src="${build.tar}" destfile="${build.bz2}"/>
-    <bzip2 src="${client.tar}" destfile="${client.bz2}"/>
-  </target>
-
-  <target name="archive" depends="zip,gzip,bzip2"
-          description="produce all archive formats of the distribution tree"/>
-
-    <target name="preparerelease">
-        <mkdir dir="${release.dir}"/>
-    </target>
-
-    <target name="copymodule">
-        <copy todir="${todir}">
-            <fileset dir="${project.root}">
-                <!-- Module src -->
-                <include name="${module}/${bin.dir}/**"/>
-                <include name="${module}/${src.dir}/**"/>
-                <include name="${module}/${lib.dir}/**"/>
-                <include name="${module}/${etc.dir}/**"/>
-                <include name="${module}/${test.dir}/**"/>
-                <include name="${module}/${module.build.file}"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="preparereleasesrc" depends="preparerelease">
-
-        <property name="release.src.dir" value="${build.release.dir}/src"/>
-        <property name="release.java.src.dir" value="${build.release.dir}/src/java"/>
-
-        <!-- Copy Source to prepare directory -->
-        <mkdir dir="${release.java.src.dir}"/>
-
-        <antcall target="copymodule">
-            <param name="module" value="broker"/>
-            <param name="todir" value="${release.java.src.dir}"/>
-        </antcall>
-
-        <antcall target="copymodule">
-            <param name="module" value="client"/>
-            <param name="todir" value="${release.java.src.dir}"/>
-        </antcall>
-
-        <antcall target="copymodule">
-            <param name="module" value="common"/>
-            <param name="todir" value="${release.java.src.dir}"/>
-        </antcall>
-
-        <antcall target="copymodule">
-            <param name="module" value="cluster"/>
-            <param name="todir" value="${release.java.src.dir}"/>
-        </antcall>
-
-        <antcall target="copymodule">
-            <param name="module" value="systests"/>
-            <param name="todir" value="${release.java.src.dir}"/>
-        </antcall>
-
-         <copy todir="${release.java.src.dir}">
-            <fileset dir="${project.root}">                
-                <include name="${tasks.dir}/${src.dir}/**"/>
-                <include name="${doc.dir}/**"/>
-            </fileset>
-         </copy>
-
-        <copy todir="${release.java.src.dir}">
-            <fileset dir="${project.root}">
-                <!-- Module src -->
-                <!-- Extra Common files -->
-                <include name="${common.dir}/${stylesheets.dir}/**"/>
-                <include name="${common.dir}/${resources.dir}/**"/>
-
-                <!-- Root build Files -->
-                <include name="${build.file}"/>
-                <include name="${common.file}"/>
-                <include name="${module.file}"/>
-                <include name="${build.properties.file}"/>
-
-            </fileset>
-        </copy>
-
-        <!-- Copy Spec files for protocol generation -->
-        <copy todir="${release.src.dir}">
-            <fileset dir=".." casesensitive="false">
-                <include name="${specs.dir}/**"/>
-            </fileset>
-        </copy>
-
-        <antcall target="copyreleasedocs">
-            <param name="todir" value="${build.release.dir}"/>
-        </antcall>
-
-    </target>
-
-    <target name="copyreleasedocs">
-        <!-- Copy Various Txt files to prepare directory -->
-        <copy todir="${todir}">
-            <fileset dir="release-docs">
-                <include name="RELEASE_NOTES.txt"/>
-            </fileset>
-            <fileset dir="${project.root}">
-                <include name="README.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-	    <fileset dir="${resources.root.dir}/META-INF">
-                <include name="DISCLAIMER.txt"/>
-	    </fileset>
-        </copy>
-
-        <antcall target="createLicense">
-            <param name="fromdir" value="${todir}"/>
-            <param name="destdir" value="${todir}"/>
-        </antcall>
-
-    </target>
-
-    <target name="createLicense">
-
-        <!-- Copy our main License file-->
-        <copy file="LICENSE.txt" todir="${destdir}"/>
-
-        <!-- Find all the license files-->
-        <fileset dir="${fromdir}" id="license.files">
-            <include name="**/${lib.dir}/**/license*"/>
-        </fileset>
-
-        <!-- Path to use to remove from the start of the license file name -->
-        <path path="${todir}${file.separator}" id="release.prepare.dir.id" />
-
-        <!-- Convert this path to use the platform file separator \ or / -->
-        <pathconvert refid="release.prepare.dir.id" property="release.prepare.path" dirsep="${file.separator}"/>
-
-        <!-- For each of the license files remove the release prepare path-->
-        <pathconvert refid="license.files" id="licenses.convert.path.id" property="licenses.convert" pathsep="${line.separator}" >
-            <map from="${release.prepare.path}${file.separator}" to=''/>
-        </pathconvert>
-
-
-        <!-- Add the list of licence files to the end of the main license file.-->
-        <echo file="${destdir}/LICENSE.txt" append="yes">
-            ${line.separator}Additional license files can be found here:${line.separator}${licenses.convert}
-        </echo>
-
-    </target>
-
-    <target name="tgzandzip">
-        <tar compression="gzip" longfile="gnu"
-             destfile="${file}.tar.gz">
-            <tarfileset dir="${path}" mode="755" username="ant" group="ant">
-                <include name="${source}/**"/>
-            </tarfileset>
-        </tar>
-
-        <zip destfile="${file}.zip">
-            <zipfileset dir="${path}">
-                <include name="${source}/**"/>
-            </zipfileset>
-        </zip>
-    </target>
-
-    <target name="std-src-release" >
-
-        <!-- Setup the local variables -->
-        <property name="release.src.name" value="${project.name}-java-${release.fullversion}-src"/>
-        <property name="build.release.src.dir" value="${build.release}/${release.src.name}"/>
-
-        <antcall target="preparereleasesrc">
-            <param name="release.src.name" value="${release.src.name}"/>
-            <param name="build.release.dir" value="${build.release.src.dir}"/>
-        </antcall>
-
-        <antcall target="tgzandzip">
-            <param name="file" value="${release.dir}/${release.src.name}"/>
-            <param name="path" value="${build.release}"/>
-            <param name="source" value="${release.src.name}"/>
-        </antcall>
-
-    </target>
-
-    <target name="std-bin-release" depends="preparerelease">
-
-        <antcall target="std-bin-release-item">
-            <param name="module.content" value="client-broker"/>
-        </antcall>
-
-        <antcall target="std-bin-release-item">
-            <param name="module.content" value="client"/>
-            <param name="modules.include" value="${modules.client}"/>
-            <param name="release.libsonly" value=""/>
-        </antcall>
-
-    </target>
-
-    <!-- incoming params
-         module.content    i.e. client or client-server
-         modules.include   i.e. ${modules.client}
-         release.libsonly  determines what task to run on the iterate normally dist but if libs only then dist-lib
-    -->
-     <target name="std-bin-release-item" depends="preparerelease">
-
-         <!-- if modules.include has not been set set it to all modules-->
-         <property name="modules.include" value="${modules}"/>
-
-         <!-- Set the type of dist to do. Normally it is dist but if we are doing a libs only then set dist-lib -->
-         <condition property="disttype" value="dist-lib" else="dist">
-             <isset property="release.libsonly"/>
-         </condition>
-
-         <!-- If the module content has been specified then use then set that value-->
-         <condition property="module.release.suffix" value="-bin-${module.content}" else="">
-             <isset property="module.content"/>
-         </condition>
-
-        <!-- Setup the local variables -->
-        <property name="release.bin.name" value="${project.name}-java-${release.fullversion}${module.release.suffix}"/>
-        <property name="release.bin.dir" value="${build.release}/${release.bin.name}"/>
-        <property name="module.jar.prefix" value="${project.name}-"/>
-        <property name="module.jar.suffix" value="-${release.fullversion}"/>
-
-        <mkdir dir="${release.bin.dir}"/>
-
-        <iterate target="${disttype}" modules="${modules.include}" >
-            <property name="module.prefix" value="${module.jar.prefix}"/>
-            <property name="module.suffix" value="${module.jar.suffix}"/>
-            <property name="dist.dest.dir" value="${release.bin.dir}"/>
-        </iterate>
-
-        <antcall target="copyreleasedocs">
-            <param name="todir" value="${release.bin.dir}"/>
-        </antcall>
-
-        <mkdir dir="${release.bin.dir}/${log.dir}"/>
-
-        <antcall target="tgzandzip">
-            <param name="file" value="${release.dir}/${release.bin.name}"/>
-            <param name="path" value="${build.release}"/>
-            <param name="source" value="${release.bin.name}"/>
-        </antcall>
-
-    </target>
-
-
-    <target name="std-release" depends="std-src-release, std-bin-release"/>
-
-</project>
diff --git a/java/client/build-module.xml b/java/client/build-module.xml
deleted file mode 100644
index 5da9c72b72..0000000000
--- a/java/client/build-module.xml
+++ /dev/null
@@ -1,24 +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.
- -
- -->
-<project name="AMQ Client" default="build">
-  <property name="module.depends" value="common"/>
-  <import file="../module.xml"/>
-</project>
diff --git a/java/client/build-old.xml b/java/client/build-old.xml
deleted file mode 100644
index 89d8b5e807..0000000000
--- a/java/client/build-old.xml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.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.
- -
- -->
-
-<!-- AMQP Java build file -->
-
-<project name="qpid-client" default="jar" basedir=".">
-    <property name="lib" value="${basedir}/lib"/>
-    <property name="common.dir" value="${basedir}/../common"/>
-    <property name="common.lib" value="${basedir}/../common/lib"/>
-    <property name="client.dir" value="${basedir}"/>
-    <property name="common.src" value="${common.dir}/src"/>
-    <property name="common.resources" value="${common.dir}/resources"/>
-    <property name="common.classes" value="${common.dir}/classes"/>
-    <property name="client.src" value="${client.dir}/src"/>
-    <property name="client.lib" value="${client.dir}/lib"/>
-    <property name="client.tests" value="${client.dir}/test"/>
-    <property name="client.classes" value="${client.dir}/classes"/>
-    <property name="client.testclasses" value="${client.dir}/testclasses"/>
-    <property name="generated.java.src" value="${common.dir}/generated/java"/>
-    <property name="broker.classes" value="${basedir}/../broker/classes"/>
-    <property name="broker.testclasses" value="${basedir}/../broker/testclasses"/>
-    <property name="dist" value="${basedir}/dist"/>
-
-    <!-- Setup details -->
-    <target name="init">
-        <tstamp>
-            <format property="release" pattern="-dMMMyy" locale="en" timezone="GMT"/>
-        </tstamp>
-
-        <mkdir dir="${common.classes}"/>
-        <mkdir dir="${client.classes}"/>
-        <mkdir dir="${client.testclasses}"/>
-    </target>
-
-    <path id="amqp.classpath">
-        <fileset dir="${basedir}/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${common.dir}/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement path="${common.classes}"/>
-        <pathelement path="${client.classes}"/>
-        <pathelement path="${client.testclasses}/"/>
-        <pathelement path="${broker.classes}/"/>
-        <pathelement path="${broker.testclasses}/"/>
-    </path>
-
-    <path id="client.test.classpath">
-        <path refid="amqp.classpath"/>
-        <fileset dir="${basedir}/test/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
-    <!-- Remove all built files -->
-    <target name="clean" depends="init">
-        <delete dir="${common.classes}"/>
-        <delete dir="${client.classes}"/>
-        <delete dir="${client.testclasses}"/>
-    </target>
-
-    <!-- Compile Java -->
-    <target name="compile" depends="init, generate">
-        <javac destdir="${common.classes}" target="1.5" source="1.5" debug="on">
-            <classpath refid="amqp.classpath"/>
-            <src path="${common.src}"/>
-            <src path="${generated.java.src}"/>
-        </javac>
-
-        <javac destdir="${client.classes}" target="1.5" source="1.5" debug="on">
-            <classpath refid="amqp.classpath"/>
-            <src path="${client.src}"/>
-        </javac>
-
-        <copy todir="${common.classes}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${common.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-            <fileset dir="${common.resources}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-
-        <copy todir="${client.classes}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${client.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="compiletests" depends="compile">
-        <javac destdir="${client.testclasses}" target="1.5" source="1.5" classpathref="client.test.classpath" debug="on">
-            <src path="${client.tests}"/>
-        </javac>
-
-        <copy todir="${client.testclasses}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${client.tests}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Generate framing source code from protocol specification -->
-    <target name="generate" description="Generates framing source code from protocol specification">
-         <ant dir="../common" target="generate"/>
-    </target>
-
-    <!-- Build jar archive -->
-    <target name="jar" depends="compiletests">
-        <mkdir dir="${dist}"/>
-        <jar basedir="${common.classes}" jarfile="${dist}/amqp-common.jar"/>
-        <jar basedir="${client.classes}" jarfile="${dist}/amqp-jms.jar"/>
-        <jar basedir="${client.testclasses}" jarfile="${dist}/amqp-tests.jar"/>
-    </target>
-
-    <target name="dist" depends="compile">
-        <mkdir dir="${dist}"/>
-        <jar basedir="${common.classes}" jarfile="${dist}/amqp-common.jar"/>
-        <jar basedir="${client.classes}" jarfile="${dist}/amqp-jms.jar"/>
-    </target>
-
-    <target name="javadoc" depends="compile, compiletests">
-        <mkdir dir="${dist}/docs/api"/>
-        <javadoc sourcepath="${client.src}" destdir="${dist}/docs/api"
-                 packagenames="org.apache.qpid.*" classpathref="amqp.classpath" author="true"
-                 version="true" windowTitle="AMQP Client API" doctitle="AMQP Client API"
-                 footer="See &lt;a href=&quot;http://www.amqp.org&quot;&gt;www.amqp.org&lt;/a&gt; for more information."
-                 use="true" verbose="false"/>
-    </target>
-
-    <target name="ServiceProvidingClient" depends="compiletests">
-        <java fork="yes" classname="org.apache.qpid.requestreply1.ServiceProvidingClient">
-              <classpath refid="amqp.classpath"/>
-              <jvmarg value="-server"/>
-              <sysproperty key="amqj.logging.level" value="INFO"/>
-              <sysproperty key="amqj.server.shared_read_write_pool" value="true"/>
-              <arg value="localhost:5672"/>
-              <arg value="guest"/>
-              <arg value="guest"/>
-              <arg value="/vpath"/>
-              <arg value="serviceQ1"/>
-        </java>
-    </target>
-
-     <target name="ServiceRequestingClient" depends="compiletests">
-        <java fork="yes" classname="org.apache.qpid.requestreply1.ServiceRequestingClient">
-              <classpath refid="amqp.classpath"/>
-              <jvmarg value="-server"/>
-              <sysproperty key="amqj.logging.level" value="INFO"/>
-              <sysproperty key="amqj.server.shared_read_write_pool" value="true"/>
-              <arg value="localhost:5672"/>
-              <arg value="guest"/>
-              <arg value="guest"/>
-              <arg value="/vpath"/>
-              <arg value="serviceQ1"/>
-              <arg value="5000"/>
-              <arg value="512"/>
-        </java>
-    </target>
-
-    <target name="HeadersListener" depends="compiletests">
-        <java fork="yes" classname="org.apache.qpid.headers.Listener">
-              <classpath refid="amqp.classpath"/>
-              <jvmarg value="-server"/>
-              <sysproperty key="amqj.logging.level" value="INFO"/>
-              <sysproperty key="amqj.server.shared_read_write_pool" value="true"/>
-        </java>
-    </target>
-
-    <target name="HeadersPublisher" depends="compiletests">
-        <java fork="yes" classname="org.apache.qpid.headers.Publisher">
-              <classpath refid="amqp.classpath"/>
-              <jvmarg value="-server"/>
-              <sysproperty key="amqj.logging.level" value="INFO"/>
-              <sysproperty key="amqj.server.shared_read_write_pool" value="true"/>
-              <arg value="5000"/>
-              <arg value="1"/>
-        </java>
-    </target>
-
-    <target name="profile" depends="compile" description="Profile Project">
-        <fail unless="netbeans.home">This target can only run inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-          <classpath refid="amqp.classpath"/>
-        </nbprofiledirect>
-        <java fork="true" classname="org.apache.qpid.requestreply1.VmRequestReply"
-              dir="${profiler.session.working.dir}"
-              jvm="${profiler.info.jvm}">
-          <jvmarg line="${profiler.info.jvmargs}"/>
-          <env key="Path" path="${profiler.info.agentpath}:${env.Path}"/>
-          <classpath refid="amqp.classpath"/>
-          <jvmarg value="${profiler.info.jvmargs.agent}"/>
-          <jvmarg line="${profiler.info.jvmargs}"/>
-          <jvmarg value="-server"/>
-          <jvmarg value="-Damqj.logging.level=INFO"/>
-          <sysproperty key="amqj.shared_read_write_pool" value="true"/>
-          <arg value="localhost:5672"/>
-          <arg value="guest"/>
-          <arg value="guest"/>
-          <arg value="/vpath"/>
-          <arg value="serviceQ1"/>
-          <arg value="5000"/>
-          <arg value="512"/>
-        </java>
-    </target>
-
-    <target name="profile-single" depends="compile" description="Profile File">
-        <fail unless="netbeans.home">This target can only run inside the NetBeans IDE.</fail>
-        <nbprofile classname="${profile.class}">
-            <classpath refid="amqp.classpath"/>
-        </nbprofile>
-    </target>
-
-    <target name="release" depends="jar" description="Create a release package">
-            <!-- create a jar file that will contain classpath entries for all required jars -->
-            <jar jarfile="${dist}/amqj.jar">
-                <manifest>
-                    <attribute name="Class-Path" value="lib/jms.jar lib/slf4j-simple.jar lib/log4j-1.2.13.jar lib/mina-core-0.9.5-SNAPSHOT.jar lib/mina-filter-ssl-0.9.5-SNAPSHOT.jar lib/commons-cli-1.0.jar lib/commons-configuration-1.2.jar lib/commons-collections-3.1.jar lib/commons-logging-api.jar lib/commons-logging.jar lib/commons-lang-2.1.jar lib/junit-4.0.jar lib/amqp-tests.jar lib/amqp-common.jar lib/amqp-jms.jar"/>
-                </manifest>
-            </jar>
-            <!-- create a zip for releasing -->
-            <zip destfile="${dist}/client.zip">
-                <zipfileset dir="bin" includes="*.sh,*.bat" filemode="755"/>
-                <zipfileset file="${dist}/amqj.jar" />
-                <zipfileset prefix="lib" file="${client.lib}/jms/jms.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/slf4j/slf4j-simple.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/logging-log4j/log4j-1.2.13.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/mina/mina-core-0.9.5-SNAPSHOT.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/commons-cli/commons-cli-1.0.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/commons-configuration/commons-configuration-1.2.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/commons-collections/commons-collections-3.1.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging-api.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/commons-lang/commons-lang-2.1.jar"/>
-                <zipfileset prefix="lib" file="${common.lib}/junit/junit-4.0.jar"/>
-                <zipfileset prefix="lib" file="${dist}/amqp-tests.jar"/>
-                <zipfileset prefix="lib" file="${dist}/amqp-common.jar"/>
-                <zipfileset prefix="lib" file="${dist}/amqp-jms.jar"/>
-            </zip>
-
-            <tar destfile="${dist}/client.tar.gz" compression="gzip">
-                <tarfileset dir="bin" includes="*.sh,*.bat" mode="755"/>
-                <tarfileset file="${dist}/amqj.jar"/>
-                <tarfileset prefix="lib" file="${client.lib}/jms/jms.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/slf4j/slf4j-simple.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/logging-log4j/log4j-1.2.13.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/mina/mina-core-0.9.5-SNAPSHOT.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/commons-cli/commons-cli-1.0.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/commons-configuration/commons-configuration-1.2.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/commons-collections/commons-collections-3.1.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging-api.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/commons-logging/commons-logging.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/commons-lang/commons-lang-2.1.jar"/>
-                <tarfileset prefix="lib" file="${common.lib}/junit/junit-4.0.jar"/>
-                <tarfileset prefix="lib" file="${dist}/amqp-tests.jar"/>
-                <tarfileset prefix="lib" file="${dist}/amqp-common.jar"/>
-                <tarfileset prefix="lib" file="${dist}/amqp-jms.jar"/>
-            </tar>
-        </target>
-
-</project>
diff --git a/java/client/test/build-module.xml b/java/client/test/build-module.xml
deleted file mode 100644
index 0d4a6ccd8c..0000000000
--- a/java/client/test/build-module.xml
+++ /dev/null
@@ -1,67 +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.
- -
- -->
-<project name="Client Tests" default="build">
-    <property name="module.depends" value="client broker broker/test common"/>
-    <property name="module.dist" value="false"/>
-
-    <import file="../../module.xml"/>
-
-    <target name="test" depends="build">
-        <echo>Client Tests</echo>
-        <junit fork="yes" printsummary="yes" showoutput="true" haltonfailure="yes">
-            <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
-            <formatter type="plain"/>
-            <classpath refid="module.class.path"/>
-
-            <batchtest fork="yes" todir="${module.test.reports}">
-               <fileset dir="${module.src}">
-                 <include name="**/test/unit/**/*Test.java"/>                 
-                 <exclude name="**/test/unit/**/*UnitTests.java"/>
-               </fileset>
-             </batchtest>            
-        </junit>
-    </target>
-
-    <target name="testreport" depends="build">
-        <echo>Client Tests with Report</echo>
-        <junit fork="yes" printsummary="yes" haltonfailure="no" timeout="90000">
-            <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
-            <formatter type="xml" />
-            <classpath refid="module.class.path" />
-
-             <batchtest fork="yes" todir="${module.test.reports}">
-               <fileset dir="${module.src}">
-                 <include name="**/test/unit/**/*Test.java"/>
-                 <exclude name="**/test/unit/**/*UnitTests.java"/>
-               </fileset>
-             </batchtest>
-        </junit>
-
-        <junitreport todir="${module.test.reports}">
-            <fileset dir="${module.test.reports}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report todir="${module.test.reports}"/>
-        </junitreport>
-    </target>
-
-
-</project>
diff --git a/java/cluster/build-module.xml b/java/cluster/build-module.xml
deleted file mode 100644
index 9bca44fe66..0000000000
--- a/java/cluster/build-module.xml
+++ /dev/null
@@ -1,24 +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.
- -
- -->
-<project name="AMQ Cluster" default="build">
-  <property name="module.depends" value="common,broker,client"/>
-  <import file="../module.xml"/>
-</project>
diff --git a/java/cluster/build-old.xml b/java/cluster/build-old.xml
deleted file mode 100644
index 1904cc545c..0000000000
--- a/java/cluster/build-old.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.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.
- -
- -->
-
-<project name="qpid-clustered-broker" default="jar" basedir=".">
-
-    <!-- Global task properties -->
-    <property name="common.root" value="${basedir}/../common"/>
-    <property name="common.lib" value="${common.root}/lib"/>
-    <property name="common.src" value="${common.root}/src"/>
-    <property name="common.resources" value="${common.root}/resources"/>
-    <property name="common.classes" value="${common.root}/classes"/>
-
-    <property name="common.generated.java.src" value="${common.root}/generated/java"/>
-
-    <property name="client.root" value="../client"/>
-    <property name="client.lib" value="${client.root}/lib"/>
-    <property name="client.classes" value="${client.root}/classes"/>
-    <property name="client.testclasses" value="${client.root}/testclasses"/>
-
-    <property name="broker.root" value="../broker"/>
-    <property name="broker.lib" value="${broker.root}/lib"/>
-    <property name="broker.src" value="${broker.root}/src"/>
-    <property name="broker.tests" value="${broker.root}/test"/>
-    <property name="broker.classes" value="${broker.root}/classes"/>
-    <property name="broker.testclasses" value="${broker.root}/testclasses"/>
-    <property name="broker.dist" value="${broker.root}/dist"/>
-
-    <property name="cluster.root" value="."/>
-    <property name="cluster.lib" value="${cluster.root}/lib"/>
-    <property name="cluster.src" value="${cluster.root}/src"/>
-    <property name="cluster.tests" value="${cluster.root}/test"/>
-    <property name="cluster.classes" value="${cluster.root}/classes"/>
-    <property name="cluster.testclasses" value="${cluster.root}/testclasses"/>
-    <property name="cluster.dist" value="${cluster.root}/dist"/>
-
-    <!-- Path structures used by several tasks -->
-    <path id="amqp.classpath">
-        <fileset dir="${common.lib}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${client.lib}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement path="${broker.classes}"/>
-        <pathelement path="${client.classes}"/>
-        <pathelement path="${common.classes}"/>
-        <pathelement path="${cluster.classes}"/>
-    </path>
-
-    <!-- Task definitions -->
-
-    <target name="init" description="Initialise the build process">
-        <tstamp>
-            <format property="release" pattern="-dMMMyy" locale="en" timezone="GMT"/>
-        </tstamp>
-
-        <mkdir dir="${cluster.classes}"/>
-        <mkdir dir="${cluster.testclasses}"/>
-        <mkdir dir="${cluster.dist}"/>
-    </target>
-
-    <!-- Remove all built files -->
-    <target name="clean" depends="init" description="Remove all built and generated files">
-        <delete dir="${cluster.dist}"/>
-        <!--<delete dir="${generated.java.src}"/>-->
-        <delete dir="${cluster.classes}"/>
-        <delete dir="${cluster.testclasses}"/>
-    </target>
-
-    <!-- Compile Java -->
-    <target name="compile" depends="init" description="Compile all source files excluding tests">
-        <javac destdir="${cluster.classes}" target="1.5" source="1.5" classpathref="amqp.classpath" debug="on">
-            <src path="${cluster.src}"/>
-        </javac>
-        <javac destdir="${cluster.testclasses}" target="1.5" source="1.5" classpathref="amqp.classpath" debug="on">
-            <src path="${cluster.tests}"/>
-        </javac>
-
-        <copy todir="${cluster.classes}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${cluster.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-            <fileset dir="${common.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-            <fileset dir="${common.resources}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-
-    <target name="compiletests" depends="compile" description="Compile all tests">
-        <javac destdir="${cluster.testclasses}" target="1.5" source="1.5" classpathref="amqp.classpath" debug="on">
-            <src path="${cluster.tests}"/>
-        </javac>
-
-        <copy todir="${cluster.testclasses}">
-            <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-            <fileset dir="${cluster.tests}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Build jar archive -->
-    <target name="jar" depends="compile, compiletests" description="Create Jar files as the distribution">
-        <mkdir dir="${cluster.dist}"/>
-        <jar basedir="${cluster.classes}" jarfile="${cluster.dist}/cluster.jar"/>
-        <jar basedir="${cluster.testclasses}" jarfile="${cluster.dist}/cluster-tests.jar"/>
-    </target>
-
-
-    <target name="javadoc" depends="compile, compiletests" description="Generate javadoc for all broker classes">
-        <mkdir dir="${cluster.dist}/docs/api"/>
-        <javadoc sourcepath="${cluster.src}" destdir="${cluster.dist}/docs/api"
-                 packagenames="org.apache.qpid.*" classpathref="amqp.classpath" author="true"
-                 version="true" windowTitle="AMQPd (Project Qpid) API" doctitle="AMQP Clustered Broker API"
-                 footer="See &lt;a href=&quot;http://www.amqp.org&quot;&gt;www.amqp.org&lt;/a&gt; for more information."
-                 use="true" verbose="false"/>
-    </target>
-
-</project>
diff --git a/java/common.xml b/java/common.xml
deleted file mode 100644
index 9e25bd96e4..0000000000
--- a/java/common.xml
+++ /dev/null
@@ -1,102 +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.
- -
- -->
-<project name="common">
-
-  <dirname property="project.root" file="${ant.file.common}"/>
-  <property name="project.name" value="qpid"/>
-  <property name="project.version" value="0.9"/>
-  <property name="project.namever" value="${project.name}-${project.version}"/>
-  <property name="client.namever" value="${project.name}-client-${project.version}"/>
-  <property name="build.dir" value="${project.root}/build"/>
-
-
-  <property name="specs.dir" value="specs"/>
-  <property name="amqpspec.dir" value="${project.root}/../${specs.dir}"/>
-
-  <property name="classes.dir" value="classes"/>
-  <property name="src.dir" value="src"/>
-  <property name="lib.dir" value="lib"/>
-  <property name="doc.dir" value="doc"/>
-  <property name="etc.dir" value="etc"/>
-  <property name="bin.dir" value="bin"/>
-  <property name="etc.dir" value="etc"/>
-  <property name="log.dir" value="log"/>
-  <property name="test.dir" value="test"/>
-  <property name="tasks.dir" value="tasks"/>
-  <property name="metainf.dir" value="META-INF"/>
-  <property name="release.dir" value="release"/>
-  <property name="resources.dir" value="resources"/>
-  <property name="stylesheets.dir" value="stylesheets"/>
-  <property name="releasedocs.dir" value="release-docs"/>
-  <property name="src.bin" value="${bin.dir}"/>
-  <property name="launcher.sfx" value="-launch.jar"/>
-
-  <property name="release.root.dir" value="${project.root}/${release.dir}"/>
-  <property name="resources.root.dir" value="${project.root}/${resources.dir}"/>  
-
-
-  <property name="dist.root" value="${build.dir}/dist"/>
-  <property name="dist.dir" value="${dist.root}/${project.namever}"/>
-  <property name="dist.client.dir" value="${dist.dir}/client"/>
-  <property name="dist.bin" value="${dist.dir}/${bin.dir}"/>
-  <property name="dist.lib" value="${dist.dir}/${lib.dir}"/>
-  <property name="dist.doc" value="${dist.dir}/${doc.dir}"/>
-  <property name="dist.etc" value="${dist.dir}/${etc.dir}"/>
-
-  <property name="module.build.file" value="build-module.xml"/>
-  <property name="build.file" value="build.xml"/>
-  <property name="module.file" value="module.xml"/>
-  <property name="common.file" value="common.xml"/>
-  <property name="build.properties.file" value="build.properties"/>
-  <property name="build.release" value="${build.dir}/${release.dir}"/>
-  <property name="build.release.prepare" value="${build.dir}/${release.dir}/prepare"/>
-
-
-  <property name="build.zip" value="${build.dir}/${project.namever}.zip"/>
-  <property name="build.tar" value="${build.dir}/${project.namever}.tar"/>
-  <property name="build.tgz" value="${build.dir}/${project.namever}.tar.gz"/>
-  <property name="build.bz2" value="${build.dir}/${project.namever}.tar.bz2"/>
-
-  <property name="client.zip" value="${build.dir}/${client.namever}.zip"/>
-  <property name="client.tar" value="${build.dir}/${client.namever}.tar"/>
-  <property name="client.tgz" value="${build.dir}/${client.namever}.tar.gz"/>
-  <property name="client.bz2" value="${build.dir}/${client.namever}.tar.bz2"/>
-
-  <property name="java.target" value="1.5"/>
-  <property name="java.source" value="1.5"/>
-
-  <property name="tasks.root.dir" value="${project.root}/tasks"/>
-  <property name="tasks.classes" value="${tasks.root.dir}/classes"/>
-  <property name="tasks.src" value="${tasks.root.dir}/src"/>
-  <property name="common.dir" value="common"/>
-  <property name="common.root.dir" value="${project.root}/${common.dir}"/>
-
-  <mkdir dir="${tasks.classes}"/>  
-  <javac srcdir="${tasks.src}" destdir="${tasks.classes}"
-         classpath="${java.class.path}"/>
-  <taskdef name="map" classname="org.apache.qpid.tasks.Map"
-           classpath="${tasks.classes}"/>
-
-  <target name="clean-tasks">
-    <delete dir="${tasks.classes}"/>
-  </target>
-
-</project>
diff --git a/java/common/build-module.xml b/java/common/build-module.xml
deleted file mode 100644
index 57c320af62..0000000000
--- a/java/common/build-module.xml
+++ /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.
- -
- -->
-<project name="AMQ Common" default="build">
-
-  <import file="../module.xml"/>
-
-  <property name="cluster.asl" value="resources/cluster.asl"/>
-  <property name="stylesheet" value="stylesheets/framing.xsl"/>
-  <property name="registry_stylesheet" value="stylesheets/registry.xsl"/>
-  <property name="registry_template" value="resources/registry.template"/>
-  <property name="saxon.jar" value="lib/saxon/saxon8.jar"/>
-  <property name="generated.package" value="org/apache/qpid/framing"/>
-  <property name="generated.dir" value="${module.precompiled}/${generated.package}"/>
-  <property name="proto_version" value="${generated.dir}/ProtocolVersionList.java"/>
-  
-  <macrodef name="saxon">
-    <attribute name="out"/>
-    <attribute name="src"/>
-    <attribute name="xsl"/>
-    <element name="args" implicit="true" optional="true"/>
-    <sequential>
-      <java jar="${saxon.jar}" fork="true">
-        <arg value="-o"/>
-        <arg value="@{out}"/>
-        <arg value="@{src}"/>
-        <arg value="@{xsl}"/>
-        <args/>
-      </java>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="amqp">
-    <attribute name="ver"/>
-    <sequential>
-      <!-- Check for the existence of the AMQP specification file -->
-      <property name="amqpspecfile-@{ver}" value="${project.root}/../specs/amqp-@{ver}.xml"/>
-      <available file="${project.root}/../specs/amqp-@{ver}.xml"
-              property="amqpspecfile.present-@{ver}"/>
-      <fail unless="amqpspecfile.present-@{ver}"
-              message="ERROR: AMQP specification file ${project.root}/../specs/amqp-@{ver}.xml not found."/>
-      
-      <!-- Read in the file as a set of properties; extract the amqp version -->
-      <xmlproperty prefix="@{ver}" file="${project.root}/../specs/amqp-@{ver}.xml"/>
-      <echo>Found AMQP specification file "${project.root}/../specs/amqp-@{ver}.xml"; major=${@{ver}.amqp(major)} minor=${@{ver}.amqp(minor)}</echo>
-
-      <!-- Add the version to the ProtocolVersionList.java file -->
-      <replaceregexp file="${proto_version}" match=" // !VER!"
-              replace=",${line.separator}        {${@{ver}.amqp(major)}, ${@{ver}.amqp(minor)}} // !VER!"
-              flags="s" byline="true"/>
-      <replaceregexp file="${proto_version}" match=" // !VER1!"
-              replace="{${@{ver}.amqp(major)}, ${@{ver}.amqp(minor)}} // !VER!"
-              flags="s" byline="true"/>
-
-      <!-- Create directory; generate from specification file -->
-      <mkdir dir="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}"/>
-      <saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/results.out"
-             src="${project.root}/../specs/amqp-@{ver}.xml" 
-             xsl="${stylesheet}">
-        <arg value="major=${@{ver}.amqp(major)}"/>
-        <arg value="minor=${@{ver}.amqp(minor)}"/>
-        <arg value="registry_name=MainRegistry"/>
-      </saxon>
-      <!--  -->
-      <saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/cluster.out"
-             src="${cluster.asl}"
-             xsl="${stylesheet}">
-        <arg value="major=${@{ver}.amqp(major)}"/>
-        <arg value="minor=${@{ver}.amqp(minor)}"/>
-        <arg value="registry_name=ClusterRegistry"/>
-      </saxon>
-      <saxon out="${generated.dir}_${@{ver}.amqp(major)}_${@{ver}.amqp(minor)}/registry.out"
-             src="${registry_template}"
-             xsl="${registry_stylesheet}">
-        <arg value="major=${@{ver}.amqp(major)}"/>
-        <arg value="minor=${@{ver}.amqp(minor)}"/>
-      </saxon>
-    </sequential>
-  </macrodef>
-
-<!--  <uptodate property="generated" targetfile="${generated.dir}/results.out"
-            srcfile="${amqp.xml}"/> -->
-
-<!--  <target name="generate" unless="generated"> -->
-  <target name="generate">
-    <mkdir dir="${generated.dir}"/>
-    <copy file="resources/ProtocolVersionList.java" tofile="${proto_version}"
-            overwrite="true"/>
-    <!--
-    NOTE: Set the AMQP version numbers to be supported in this build here.
-    The last version in this list will be the version returned when a protocol
-    ProtocolInitiation NAK frame is returned by the broker. Usually this is the
-    highest or most recent version.
-    -->
-    <!-- <amqp ver="0.8"/>
-    <amqp ver="0.9"/>
-    <amqp ver="0.10"/> -->
-    <amqp ver="8.0"/>
-    
-<!--     <saxon out="${generated.dir}/results.out" src="${amqp.xml}"
-           xsl="${stylesheet}">
-      <arg value="asl_base=${asl.base}"/>
-      <arg value="registry_name=MainRegistry"/>
-    </saxon>
-    <saxon out="${generated.dir}/cluster.out" src="${cluster.asl}"
-           xsl="${stylesheet}">
-      <arg value="registry_name=ClusterRegistry"/>
-    </saxon>
-    <saxon out="${generated.dir}/registry.out" src="${registry_template}"
-           xsl="${registry_stylesheet}"/> -->
-  </target>
-
-  <target name="precompile" depends="generate"/>
-
-</project>
diff --git a/java/common/build-old.xml b/java/common/build-old.xml
deleted file mode 100644
index d6ced5019b..0000000000
--- a/java/common/build-old.xml
+++ /dev/null
@@ -1,101 +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.
- -
- -->
-<project name="AMQ Java Framing Layer" default="build">
-    <property name="amq.home" value="../.."/>
-    <path id="amq.home.path">
-      <pathelement location="${amq.home}"/>
-    </path>
-
-    <pathconvert targetos="unix" property="amq.home.fixed" refid="amq.home.path"/>
-
-    <property name="amq.asl" value="${amq.home.fixed}/specs/amqp.xml"/>
-    <property name="cluster.asl" value="resources/cluster.asl"/>
-
-    <property name="stylesheet" value="stylesheets/framing.xsl"/>
-    <property name="registry_stylesheet" value="stylesheets/registry.xsl"/>
-    <property name="registry_template" value="resources/registry.template"/>
-    <property name="saxon.jar" value="lib/saxon/saxon8.jar"/>
-    <property name="generated.src" value="generated/java/org.apache.qpid/framing"/>
-    <property name="static.src" value="src"/>
-    <property name="resources" value="resources"/>
-    <property name="base.lib" value="lib"/>
-
-    <path id="project.classpath">
-        <fileset dir="${base.lib}">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
-    <target name="prepare">
-        <mkdir dir="classes"/>
-    </target>
-
-    <target name="build" depends="regenerate, compile" description="re-generates and compiles static and generated source after cleaning">
-    </target>
-
-    <target name="compile" depends="prepare" description="compiles static and generated source">
-        <javac destdir="classes" debug="true" deprecation="true" source="1.5">
-            <src path="${generated.src}"/>
-            <src path="${static.src}"/>
-            <classpath refid="project.classpath"/>
-        </javac>
-    </target>
-
-    <target name="regenerate" depends="clean, generate" description="generates code">
-    </target>
-
-    <target name="check-generate">
-        <uptodate property="generateNotRequired" targetfile="${generated.src}/results.out" srcfile="${amq.asl}"/>
-    </target>
-
-    <target name="generate" depends="check-generate" unless="${generateNotRequired}" description="generates code">
-        <mkdir dir="${generated.src}"/>
-        <java jar="${saxon.jar}" fork="true">
-            <arg value="-o"/>
-            <arg value="${generated.src}/results.out"/>
-            <arg value="${amq.asl}"/>
-            <arg value="${stylesheet}"/>
-            <arg value="asl_base=${asl.base}"/>
-            <arg value="registry_name=MainRegistry"/>
-        </java>
-        <java jar="${saxon.jar}" fork="true">
-            <arg value="-o"/>
-            <arg value="${generated.src}/cluster.out"/>
-            <arg value="${cluster.asl}"/>
-            <arg value="${stylesheet}"/>
-            <arg value="registry_name=ClusterRegistry"/>
-        </java>
-        <java jar="${saxon.jar}" fork="true">
-            <arg value="-o"/>
-            <arg value="${generated.src}/registry.out"/>
-            <arg value="${registry_template}"/>
-            <arg value="${registry_stylesheet}"/>
-        </java>
-    </target>
-
-    <target name="clean" depends="prepare" description="deletes any products of the compile and generate tasks">
-        <delete quiet="true">
-            <fileset dir="classes" includes="**/*"/>
-            <fileset dir="${generated.src}" includes="**/*"/>
-        </delete>
-        <mkdir dir="${generated.src}"/>
-    </target>
-</project>
diff --git a/java/module.xml b/java/module.xml
deleted file mode 100644
index 0172ea2995..0000000000
--- a/java/module.xml
+++ /dev/null
@@ -1,276 +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.
- -
- -->
-<project name="module">
-
-    <import file="common.xml"/>
-
-    <map property="module" value="${basedir}" split="${path.separator}">
-        <globmapper from="${project.root}${file.separator}*" to="*"/>
-    </map>
-
-    <property name="module.dir" value="${build.dir}/${module}"/>
-    <property name="module.classes" value="${module.dir}/${classes.dir}"/>
-    <property name="module.precompiled" value="${module.dir}/${src.dir}"/>
-
-    <condition property="suffix" value="${module.suffix}" else="">
-        <isset property="module.suffix"/>
-    </condition>
-
-    <condition property="prefix" value="${module.prefix}" else="">
-        <isset property="module.prefix"/>
-    </condition>
-
-    <map property="module.name" value="${module}">
-        <filtermapper>
-            <replacestring from="${file.separator}" to="-"/>
-        </filtermapper>
-    </map>
-
-    <property name="dist.module.name" value="${prefix}${module.name}${suffix}" />
-      
-    <property name="module.jar" location="${module.dir}/${dist.module.name}.jar"/>
-    <property name="module.launcher"
-              location="${module.dir}/${module.name}${launcher.sfx}"/>
-    <property name="module.manifest"
-              location="${module.dir}/${dist.module.name}.mf"/>
-    <property name="module.doc" location="${module.dir}/${doc.dir}"/>
-    <property name="module.src" location="${src.dir}"/>
-    <property name="module.lib" location="${lib.dir}"/>
-    <property name="module.etc" location="${etc.dir}"/>
-
-    <!-- module.depends is supplied by the importing file -->
-    <pathconvert property="module.depends.dirs" pathSep=" ">
-        <path>
-            <dirset dir="${project.root}" includes="${module.depends}"/>
-        </path>
-        <globmapper from="${project.root}${file.separator}*" to="*"/>
-    </pathconvert>
-
-    <map property="module.depends.names" value="${module.depends.dirs}">
-        <filtermapper>
-            <replacestring from="${file.separator}" to="-"/>
-        </filtermapper>
-    </map>
-
-    <map property="module.depends.libs" value="${module.depends.dirs}"
-         setonempty="false">
-        <regexpmapper from="(.*)" to="\1/${lib.dir}/\*\*\/*\.jar" handledirsep="/"/>
-    </map>
-    <map property="module.depends.classes" value="${module.depends.dirs}" join=":">
-        <globmapper from="*" to="${build.dir}/*/${classes.dir}"/>
-    </map>
-
-    <path id="module.src.path">
-        <pathelement location="${module.src}"/>
-        <pathelement location="${module.precompiled}"/>
-    </path>
-
-    <path id="module.class.path">
-        <pathelement location="${module.classes}"/>
-        <fileset dir="${module.lib}" includes="**/*.jar"/>
-        <pathelement path="${module.depends.classes}"/>
-        <fileset dir="${project.root}" includes="${module.depends.libs}"/>
-    </path>
-
-    <pathconvert property="module.manifest.jars" pathsep=" " dirsep="/">
-        <path>
-            <fileset dir="${module.lib}" includes="**/*.jar"/>
-        </path>
-        <globmapper from="${module.lib}${file.separator}*" to="*"/>
-    </pathconvert>
-
-    <map property="module.manifest.deps" value="${module.depends.dirs}">
-        <globmapper from="*" to="*${launcher.sfx}"/>
-    </map>
-
-    <property name="module.manifest.classpath"
-              value="${dist.module.name}.jar ${module.manifest.jars} ${module.manifest.deps}"/>
-
-    <property name="module.test.reports" value="${module.dir}/reports/junit"/>
-
-    <target name="debug">
-        <echo message="basedir = ${basedir}"/>
-        <echo message="project.root = ${project.root}"/>
-        <echo message="module = ${module}"/>
-        <echo message="module.name = ${module.name}"/>
-        <echo message="module.jar = ${module.jar}"/>
-        <echo message="module.depends = ${module.depends}"/>
-        <echo message="module.depends.libs = ${module.depends.libs}"/>
-        <echo message="module.depends.dirs = ${module.depends.dirs}"/>
-        <echo message="module.depends.classes = ${module.depends.classes}"/>
-
-        <pathconvert property="module.class.path" refid="module.class.path"/>
-        <echo message="module.class.path = ${module.class.path}"/>
-        <pathconvert property="pretty.module.class.path"
-                     refid="module.class.path"
-                     pathsep="${line.separator}|   |-- "/>
-        <echo message="pretty.module.class.path = ${pretty.module.class.path}"/>
-
-        <pathconvert property="module.src.path" refid="module.src.path"/>
-        <echo message="module.src.path = ${module.src.path}"/>
-        <pathconvert property="pretty.module.src.path"
-                     refid="module.src.path"
-                     pathsep="${line.separator}|   |-- "/>
-        <echo message="pretty.module.src.path = ${pretty.module.src.path}"/>
-    </target>
-
-    <target name="prepare">
-        <mkdir dir="${module.classes}"/>
-        <mkdir dir="${module.precompiled}"/>
-        <mkdir dir="${module.doc}"/>
-        <mkdir dir="${module.test.reports}"/>
-    </target>
-
-    <target name="precompile"/>
-
-    <target name="compile" depends="prepare,precompile">
-        <javac destdir="${module.classes}" target="${java.target}"
-               source="${java.source}" debug="on">
-            <src refid="module.src.path"/>
-            <classpath refid="module.class.path"/>
-        </javac>
-
-        <!-- copy any non java src files into the build tree, e.g. log4j.properties -->
-        <copy todir="${module.classes}" verbose="true">
-            <fileset dir="${module.src}">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="dist-bin">
-        <mkdir dir="${destdir}/${bin.dir}"/>
-        <copy todir="${destdir}/${bin.dir}" failonerror="false">
-            <fileset dir="${src.bin}"/>
-        </copy>        
-        <chmod dir="${destdir}/${bin.dir}" perm="ugo+rx" includes="**/*"/>
-    </target>
-
-    <target name="build" depends="compile">
-        <antcall target="dist-bin">
-            <param name="destdir" value="${build.dir}"/>
-        </antcall>
-        <copy todir="${build.dir}/${etc.dir}" failonerror="false">
-            <fileset dir="${module.etc}" excludes="**/*.conf"/>
-        </copy>
-        <copy todir="${build.dir}/${etc.dir}" failonerror="false">
-            <fileset dir="${build.dir}/${etc.dir}" includes="**/*.dev"/>
-            <mapper>
-                <globmapper from="*.dev" to="*"/>
-            </mapper>
-        </copy>
-    </target>
-
-    <target name="test"/>
-
-    <target name="testreport"/>
-
-    <uptodate property="doc.done" targetfile="${module.doc}/index.html">
-        <srcfiles dir="${module.src}" includes="**/*.java"/>
-    </uptodate>
-
-    <target name="doc" depends="prepare" unless="doc.done">
-        <javadoc destdir="${module.doc}" sourcepathref="module.src.path"
-                 classpathref="module.class.path" packagenames="*"/>
-    </target>
-
-    <target name="jar" depends="build">
-
-        <copy todir="${module.classes}">
-            <fileset dir="${resources.root.dir}">
-                <include name="${metainf.dir}/**"/>
-            </fileset>
-        </copy>
-        <copy todir="${module.classes}/${metainf.dir}">
-             <fileset dir="${project.root}">
-                <include name="LICENSE.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-        </copy>
-
-        <jar destfile="${module.jar}" basedir="${module.classes}"/>
-    </target>
-
-    <target name="manifest-main" if="module.main">
-        <manifest file="${module.manifest}">
-            <attribute name="Main-Class" value="${module.main}"/>
-            <attribute name="Class-Path" value="${module.manifest.classpath}"/>
-            <attribute name="X-Compile-Source-JDK" value="${module.vm.version}"/>                        
-        </manifest>
-    </target>
-
-    <target name="manifest-lib" unless="module.main">
-        <manifest file="${module.manifest}">
-            <attribute name="Class-Path" value="${module.manifest.classpath}"/>
-            <attribute name="X-Compile-Source-JDK" value="${module.vm.version}"/>                                    
-        </manifest>
-    </target>
-
-    <target name="launcher" depends="manifest-main,manifest-lib">
-        <jar destfile="${module.launcher}" manifest="${module.manifest}"/>
-    </target>
-
-    <condition property="module.nodist">
-        <and>
-            <isset property="module.dist"/>
-            <isfalse value="${module.dist}"/>
-        </and>
-    </condition>
-
-    <condition property="module.vm.version" value="${module.vm.version}" else="1.4">
-          <isset property="module.vm.version"/>
-    </condition>    
-
-    <condition property="dist.destlib.dir" value="${dist.dest.dir}/${lib.dir}" else="${dist.lib}">
-         <isset property="dist.dest.dir"/>
-    </condition>
-
-    <target name="dist-lib" depends="jar,launcher,doc" unless="module.nodist">
-        <copy todir="${dist.destlib.dir}" file="${module.jar}"/>
-        <copy todir="${dist.destlib.dir}" file="${module.launcher}"/>
-        <copy todir="${dist.destlib.dir}" failonerror="false">
-            <fileset dir="${module.lib}"/>
-        </copy>
-        <copy todir="${dist.destdir}/${doc.dir}/${module}">
-            <fileset dir="${module.doc}"/>
-        </copy>
-    </target>
-
-
-    <condition property="dist.destdir" value="${dist.dest.dir}" else="${dist.dir}">
-        <isset property="dist.dest.dir"/>
-    </condition>
-
-    <target name="dist" depends="dist-lib" unless="module.nodist">
-        <antcall target="dist-bin">
-            <param name="destdir" value="${dist.destdir}"/>
-        </antcall>
-        <copy todir="${dist.destdir}/${etc.dir}" failonerror="false">
-            <fileset dir="${module.etc}" excludes="**/*.dev"/>
-        </copy>
-    </target>
-
-    <target name="clean">
-        <delete dir="${module.dir}"/>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/java/systests/build-module.xml b/java/systests/build-module.xml
deleted file mode 100644
index 9292bcd083..0000000000
--- a/java/systests/build-module.xml
+++ /dev/null
@@ -1,62 +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.
- -
- -->
-<project name="System Tests" default="build">
-    <property name="module.depends" value="client broker common"/>
-    <property name="module.dist" value="false"/>
-
-    <import file="../module.xml"/>
-
-    <target name="test" depends="build">
-        <junit fork="yes" showoutput="true" haltonfailure="yes">
-            <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
-            <formatter type="plain"/>
-            <classpath refid="module.class.path"/>
-            <batchtest fork="yes" todir="${module.test.reports}">
-                <fileset dir="${module.src}">
-                    <include name="**/server/UnitTests.java"/>
-                    <include name="**/test/unit/ack/UnitTests.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="testreport" depends="build">
-        <junit fork="yes" printsummary="yes" haltonfailure="no" timeout="90000">
-            <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
-            <formatter type="xml" />
-            <classpath refid="module.class.path" />
-            <batchtest fork="yes" todir="${module.test.reports}">
-                <fileset dir="${module.src}">
-                    <include name="**/server/UnitTests.java"/>
-                    <include name="**/test/unit/ack/UnitTests.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-
-        <junitreport todir="${module.test.reports}">
-            <fileset dir="${module.test.reports}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report todir="${module.test.reports}"/>
-        </junitreport>
-    </target>
-
-</project>