removed maven build system

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

5 files changed, 0 insertions, 779 deletions

diff --git a/qpid/java/distribution/src/main/assembly/bin-test.xml b/qpid/java/distribution/src/main/assembly/bin-test.xml
deleted file mode 100644
index a9e769e312..0000000000
--- a/qpid/java/distribution/src/main/assembly/bin-test.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?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-bin-with-tests</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-    <fileSet>
-      <directory>src/main/release</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>..</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/release/etc</directory>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <includes>
-    <include>logging.properties</include>
-    <include>log4j.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/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>
-  <files>
-    <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have
-         to use decimal numbers to specify fileMode -->
-    <file>
-      <source>../common/etc/qpid-run.conf</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>qpid-run.conf</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/config.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>config.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/log4j.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>log4j.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/passwd</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>passwd</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/qpid-server.conf</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>qpid-server.conf</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/virtualhosts.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>virtualhosts.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid.start</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid.start</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid.stop</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid.stop</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid.stopall</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid.stopall</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../common/bin/qpid-run</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-run</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid-server</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-server</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid-server.bat</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-server.bat</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/run.bat</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>run.bat</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/run.sh</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>run.sh</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/runAll</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>runAll</destName>
-      <fileMode>493</fileMode>
-    </file>
-  </files>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.qpid:qpid-distribution</exclude>
-        <exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.commands</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.expressions</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.jobs</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.auth</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.common</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.preferences</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.registry</exclude>
-        <exclude>org.eclipse.help:org.eclipse.help</exclude>
-        <exclude>org.eclipse.jface:org.eclipse.jface</exclude>
-        <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
-        <exclude>org.eclipse.swt:org.eclipse.swt</exclude>
-        <exclude>org.eclipse.swt:org.eclipse.swt.win32.win32.x86</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui.forms</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui.workbench</exclude>
-      </excludes>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/qpid/java/distribution/src/main/assembly/bin.xml b/qpid/java/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index 0461f0f643..0000000000
--- a/qpid/java/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?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-bin</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-    <fileSet>
-      <directory>src/main/release</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>..</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/release/etc</directory>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <includes>
-    <include>logging.properties</include>
-    <include>log4j.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/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>
-  <files>
-    <!-- due to a bug in the assembly 2.1 plugin (MASSEMBLY-153) you have
-         to use octal numbers to specify fileMode note not valid in 2.2 assembly plugin -->
-    <file>
-      <source>../common/etc/qpid-run.conf</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>qpid-run.conf</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/config.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>config.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/jmxremote.access</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>jmxremote.access</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/transient_config.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>transient_config.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/persistent_config.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>persistent_config.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/log4j.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>log4j.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/passwd</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>passwd</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-        <source>../broker/etc/passwdVhost</source>
-        <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-        <destName>passwdVhost</destName>
-        <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/qpid-server.conf</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>qpid-server.conf</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/etc/virtualhosts.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>virtualhosts.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid.start</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid.start</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid.stop</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid.stop</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid.stopall</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid.stopall</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../common/bin/qpid-run</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-run</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid-server</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-server</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/qpid-server.bat</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-server.bat</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/run.bat</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>run.bat</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/run.sh</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>run.sh</destName>
-      <fileMode>493</fileMode>
-    </file>
-    <file>
-      <source>../broker/bin/runAll</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>runAll</destName>
-      <fileMode>493</fileMode>
-    </file>
-  </files>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.qpid:qpid-distribution</exclude>
-        <exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.commands</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.expressions</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.jobs</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.auth</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.common</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.preferences</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.registry</exclude>
-        <exclude>org.eclipse.help:org.eclipse.help</exclude>
-        <exclude>org.eclipse.jface:org.eclipse.jface</exclude>
-        <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
-        <exclude>org.eclipse.swt:org.eclipse.swt</exclude>
-        <exclude>org.eclipse.swt:org.eclipse.swt.win32.win32.x86</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui.forms</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui.workbench</exclude>
-      </excludes>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
deleted file mode 100644
index 1318248b2a..0000000000
--- a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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>management-console-unix</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-<!--
-  <moduleSets>
-      <moduleSet>
-          <includes>
-              <include>org.apache.qpid.management:org.apache.qpid.management.ui</include>
-          </includes>
-          <binaries>
-              <includeDependencies>true</includeDependencies>
-              <unpack>false</unpack>
-          </binaries>
-      </moduleSet>
-  </moduleSets>
- -->
-  <fileSets>
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/release/docs</directory>
-      <outputDirectory>qpidmc/docs</outputDirectory>
-      <includes>
-        <include>RELEASE_NOTES.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources/unix/configuration</directory>
-      <outputDirectory>qpidmc/configuration</outputDirectory>
-      <includes>
-        <include>**</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>license.eclipse.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>README.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/bin</directory>
-      <outputDirectory>qpidmc/bin</outputDirectory>
-      <includes>
-        <include>qpidmc*.sh</include>
-      </includes>
-      <fileMode>777</fileMode>
-    </fileSet>
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpidmc/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0</outputDirectory>
-      <outputFileNameMapping>${artifactId}_${version}/</outputFileNameMapping>
-      <unpack>true</unpack>
-      <includes>
-        <include>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</include>
-      </includes>
-      <scope>runtime</scope>
-    </dependencySet>
-  
-  <dependencySet>
-        <outputDirectory>qpidmc/eclipse/plugins</outputDirectory>
-        <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
-        <unpack>false</unpack>
-        <excludes>
-            <exclude>org.apache.qpid:qpid-distribution</exclude>
-        </excludes>
-        <includes>
-          <include>org.eclipse.ui:org.eclipse.ui.forms</include>
-          <include>org.apache.qpid.management:org.apache.qpid.management.ui</include>
-        </includes>
-        <scope>runtime</scope>
-    </dependencySet>
-</dependencySets>
-</assembly>
diff --git a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml
deleted file mode 100644
index 5c109181ff..0000000000
--- a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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>management-console-win32</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>zip</format>
-  </formats>
-<!--
-  <moduleSets>
-      <moduleSet>
-          <includes>
-              <include>org.apache.qpid.management:org.apache.qpid.management.ui</include>
-          </includes>
-          <binaries>
-              <includeDependencies>true</includeDependencies>
-              <unpack>false</unpack>
-          </binaries>
-      </moduleSet>
-  </moduleSets>
- -->
-  <fileSets>
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/release/docs</directory>
-      <outputDirectory>qpidmc/docs</outputDirectory>
-      <includes>
-        <include>RELEASE_NOTES.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources/win32/configuration</directory>
-      <outputDirectory>qpidmc/configuration</outputDirectory>
-      <includes>
-        <include>**</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources</directory>
-      <outputDirectory>qpidmc/eclipse</outputDirectory>
-      <includes>
-        <include>*.*</include>
-      </includes>      
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>README.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/bin</directory>
-      <outputDirectory>qpidmc/bin</outputDirectory>
-      <fileMode>777</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources/sasl</directory>
-      <outputDirectory>qpidmc/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF</outputDirectory>
-      <includes>
-        <include>MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-        <directory>../management/eclipse-plugin/src/main/resources/org.apache.commons.codec</directory>
-        <outputDirectory>qpidmc/eclipse/plugins/</outputDirectory>
-    </fileSet>
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpidmc/eclipse/plugins</outputDirectory>
-      <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.qpid:qpid-distribution</exclude>
-        <exclude>org.apache.qpid:qpid-common</exclude>
-        <exclude>org.apache.qpid:qpid-broker</exclude>
-        <exclude>org.apache.qpid:qpid-client</exclude>
-        <exclude>commons-cli:commons-cli</exclude>        
-        <exclude>commons-configuration:commons-configuration</exclude>
-        <exclude>commons-lang:commons-lang</exclude>
-        <exclude>org.apache.mina:mina-filter-ssl</exclude>
-        <exclude>org.apache.mina:mina-java5</exclude>
-        <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
-        <exclude>org.slf4j:slf4j-simple</exclude>
-        <exclude>junit:junit</exclude>
-        <exclude>org.easymock:easymockclassextension</exclude>
-        <exclude>commons-codec:commons-codec</exclude>
-        <exclude>org.apache.geronimo.specs:geronimo-jms_1.1_spec</exclude>
-        <exclude>commons-collections:commons-collections</exclude>
-        <exclude>commons-lang:commons-lang</exclude>
-        <exclude>org.apache.mina:mina-core</exclude>
-        <exclude>commons-beanutils:commons-beanutils</exclude>
-        <exclude>commons-beanutils:commons-beanutils-core</exclude>
-        <exclude>commons-digester:commons-digester</exclude>
-        <exclude>commons-logging:commons-logging</exclude>
-        <exclude>commons-logging:commons-logging-api</exclude>
-        <exclude>dom4j:dom4j</exclude>
-        <exclude>isorelax:isorelax</exclude>
-        <exclude>jaxen:jaxen</exclude>
-        <exclude>log4j:log4j</exclude>
-        <exclude>msv:msv</exclude>
-        <exclude>xalan:xalan</exclude>
-        <exclude>xml-apis:xml-apis</exclude>
-        <exclude>saxpath:saxpath</exclude>
-        <exclude>servletapi:servletapi</exclude>
-        <exclude>relaxngDatatype:relaxngDatatype</exclude>
-        <exclude>xerces:xercesImpl</exclude>
-        <exclude>javax.servlet:servlet-api</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude>
-      </excludes>
-      <scope>runtime</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>qpidmc/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0</outputDirectory>
-      <outputFileNameMapping>${artifactId}_${version}/</outputFileNameMapping>
-      <unpack>true</unpack>
-      <includes>
-        <include>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</include>
-      </includes>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-
-</assembly>
diff --git a/qpid/java/distribution/src/main/assembly/src.xml b/qpid/java/distribution/src/main/assembly/src.xml
deleted file mode 100644
index 8aa6183b4d..0000000000
--- a/qpid/java/distribution/src/main/assembly/src.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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-src</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-        <include>LICENSE.txt</include>
-        <include>licenses/*.*</include>
-        <include>NOTICE.txt</include>
-        <include>README.txt</include>
-        <include>BUILDING.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpid-${qpid.version}-src/java</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>build.xml</exclude>
-        <exclude>distribution/build.xml</exclude>
-        <exclude>benchmark</exclude>
-        <exclude>benchmark/**/*</exclude>
-        <exclude>**/target</exclude>
-        <exclude>**/target/**/*</exclude>
-        <exclude>**/build</exclude>
-        <exclude>**/build/**/*</exclude>
-        <exclude>**/.settings</exclude>
-        <exclude>**/.classpath</exclude>
-        <exclude>**/.project</exclude>
-        <exclude>**/.wtpmodules</exclude>
-        <exclude>**/surefire*</exclude>
-        <exclude>**/cobertura.ser</exclude>
-        <exclude>bin</exclude>
-        <exclude>bin/*</exclude>
-        <exclude>lib</exclude>
-        <exclude>lib/**/*</exclude>
-        <exclude>**/var/journal</exclude>
-        <exclude>**/build.out*</exclude>
-        <exclude>**/eclipse-plugin/bin/**</exclude>
-        <exclude>**/eclipse-plugin/plugins/**</exclude>
-        <exclude>**/eclipse-plugin/src/main/resources/**</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../../gentools</directory>
-      <outputDirectory>qpid-${qpid.version}-src/gentools</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <excludes>
-        <exclude>**/build</exclude>
-        <exclude>**/build/**/*</exclude>
-        <exclude>**/*.class</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../../specs</directory>
-      <outputDirectory>qpid-${qpid.version}-src/specs</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>