removed maven build system

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

10 files changed, 0 insertions, 1337 deletions

diff --git a/qpid/java/distribution/pom.xml b/qpid/java/distribution/pom.xml
deleted file mode 100644
index 6acd8e9a85..0000000000
--- a/qpid/java/distribution/pom.xml
+++ /dev/null
@@ -1,210 +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 xmlns="http://maven.apache.org/POM/4.0.0" 
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-distribution</artifactId>
-    <packaging>jar</packaging>
-    <name>Qpid Distribution</name>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-        <java.source.version>1.5</java.source.version>
-        <qpid.version>${pom.version}</qpid.version>
-        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
-
-        <!-- This is an assembly/distribution pom so no test code exists -->
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
-
-    <repositories>
-      <repository>
-        <id>repo1.maven.org</id>
-        <name>Maven eclipse Repository</name>
-        <url>http://repo1.maven.org/eclipse</url>
-      </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>qpid-broker</artifactId>
-            <version>${pom.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>qpid-client</artifactId>
-            <version>${pom.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}.management</groupId>
-            <artifactId>org.apache.qpid.management.ui</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>${java.source.version}</source>
-                        <target>${java.source.version}</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${assembly.version}</version>
-                    <configuration>
-                        <descriptors>
-                               <descriptor>src/main/assembly/bin.xml</descriptor>
-                        </descriptors>
-                        <finalName>qpid-${pom.version}</finalName>
-                        <outputDirectory>${qpid.targetDir}</outputDirectory>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <finalName>qpid-incubating</finalName>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/bin.xml</descriptor>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                                <descriptor>src/main/assembly/management-eclipse-plugin.xml</descriptor>
-                                <descriptor>src/main/assembly/management-eclipse-plugin-unix.xml</descriptor>
-                            </descriptors>
-                            <finalName>qpid-${pom.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-         <defaultGoal>assembly:assembly</defaultGoal>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>tests</id>
-
-            <dependencies>
-                <dependency>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>qpid-broker</artifactId>
-                    <version>${pom.version}</version>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>qpid-broker</artifactId>
-                    <version>${pom.version}</version>
-                    <type>test-jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>qpid-client</artifactId>
-                    <version>${pom.version}</version>
-                    <type>jar</type>
-                </dependency>
-                 <dependency>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>qpid-client</artifactId>
-                    <version>${pom.version}</version>
-                    <type>test-jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>qpid-perftests</artifactId>
-                    <version>${pom.version}</version>
-                    <type>test-jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>${pom.groupId}</groupId>
-                    <artifactId>qpid-systests</artifactId>
-                    <version>${pom.version}</version>
-                    <type>test-jar</type>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                <plugin>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>distribution-package</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>single</goal>
-                            </goals>
-                            <configuration>
-                                <descriptors>
-                                    <descriptor>src/main/assembly/bin-test.xml</descriptor>
-                                </descriptors>
-                                <finalName>qpid-${pom.version}</finalName>
-                            </configuration>
-                        </execution>
-                        </executions>
-                    </plugin>
-               </plugins>
-            </build>
-
-        </profile>
-    </profiles>
-
-</project>  
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>
diff --git a/qpid/java/distribution/src/main/release/DISCLAIMER b/qpid/java/distribution/src/main/release/DISCLAIMER
deleted file mode 100644
index c321113c9e..0000000000
--- a/qpid/java/distribution/src/main/release/DISCLAIMER
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Qpid is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
-
-Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
-
-While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/qpid/java/distribution/src/main/release/LICENSE.txt b/qpid/java/distribution/src/main/release/LICENSE.txt
deleted file mode 100755
index 6b0b1270ff..0000000000
--- a/qpid/java/distribution/src/main/release/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/qpid/java/distribution/src/main/release/NOTICE.txt b/qpid/java/distribution/src/main/release/NOTICE.txt
deleted file mode 100644
index 82d3dbc632..0000000000
--- a/qpid/java/distribution/src/main/release/NOTICE.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Qpid distribution.                     ==
-=========================================================================
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/).
-
-Please read the LICENSE.txt file present in the root directory of this
-distribution.
-
-
-Aside from contributions to the Apache Qpid project, this software also 
-includes (binary only):
-
-	- The SAXON XSLT Processor from Michael Kay distributed under the 
-	  Mozilla Public License v1.0, which is available for download at 
-          http://saxon.sourceforge.net/
-
-	- The JUnit regression testing framework written by Erich Gamma 
-          and Kent Beck and distributed under the Common Public License v1.0.
-          JUnit is available for download at 
-          http://sourceforge.net/projects/junit/
-
-	- The Simple Logging Facade For Java (slf4j), Copyright (c) 
-          2004-2005 SLF4J.ORG, Copyright (c) 2004-2005 QOS.ch. slf4j is 
-          licensed under identical terms to the MIT/X11 license and 
-          available for download at http://www.slf4j.org/
-
-	- Software from the Eclipse project. The binaries from this project are
-          distributed under the Eclipse Public License and can be donwloaded
-          from http://www.eclipse.org/
-
-             
-
diff --git a/qpid/java/distribution/src/main/release/README.txt b/qpid/java/distribution/src/main/release/README.txt
deleted file mode 100644
index 14706170bc..0000000000
--- a/qpid/java/distribution/src/main/release/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-
-Documentation
---------------
-All of our user documentation for the Qpid Java components can be accessed on our wiki at:
-
-http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation
-
-This includes a Getting Started Guide and FAQ as well as detailed developer documentation.
-However, here's a VERY quick guide to running the installed Qpid broker, once you have installed it somewhere !
-
-
-Running the Broker
-------------------
-
-To run the broker, set the QPID_HOME environment variable to
-distribution directory and add $QPID_HOME/bin to your PATH. Then run
-the qpid-server shell script or qpid-server.bat batch file to start
-the broker. By default, the broker will use $QPID_HOME/etc to find
-the configuration files. You can supply a custom configuration using
-the -c argument.
-
-For example:
-
-qpid-server -c ~/etc/config.xml
-
-You can get a list of all command line arguments by using the -h argument.
-
-
-Developing
-----------
-
-In order to build Qpid you need Ant 1.6.5. Use ant -p to list the
-available targets. The default ant target, build, creates a working
-development-mode distribution in the build directory. To run the
-scripts in build/bin set QPID_HOME to the build directory and put
-${QPID_HOME}/bin on your PATH. The scripts in that directory include
-the standard ones in the distribution and a number of testing scripts.
-
-
-Running Tests
--------------
-
-The simplest test to ensure everything is working is the "service
-request reply" test. This involves one client that is known as a
-"service provider" and it listens on a well-known queue for
-requests. Another client, known as the "service requester" creates a
-private (temporary) response queue, creates a message with the private
-response queue set as the "reply to" field and then publishes the
-message to the well known service queue. The test allows you to time
-how long it takes to send messages and receive the response back. It
-also allows varying of the message size.
-
-You must start the service provider first:
-
-serviceProvidingClient.sh nop host:port
-
-where host:port is the host and port you are running the broker
-on.
-
-To run the service requester:
-
-serviceRequestingClient.sh nop host:post <count> <bytes>
-
-This requests <count> messages, each of size <bytes>. After
-receiving all the messages the client outputs the rate it achieved.
-
-A more realistic test is the "headers test", which tests the
-performance of routing messages based on message headers to a
-configurable number of clients (e.g. 50). A publisher sends 10000
-messages to each client and waits to receive a message from each
-client when it has received all the messages.
-
-You run the listener processes first:
-
-run_many.sh 10 header "headersListener.sh -host 10.0.0.1 -port 5672"
-
-In this command, the first argument means start 10 processes, the
-second is just a name use in the log files generated and the third
-argument is the command to run. In this case it runs another shell
-script but it could be anything.
-
-Then run the publisher process:
-
-headersPublisher.sh -host 10.0.0.1 -port 5672 10000 10
-
-The last two arguments are: the number of messages to send to each
-client, and the number of clients.
-
-Note that before starting the publisher you should wait about 30
-seconds to ensure all the clients are registered with the broker (you
-can see this from the broker output). Otherwise the numbers will be
-slightly skewed.
-
-A third useful test, which can easily be ported to other JMS
-implementations is the "topic test". It does the same as the headers
-test but using a standard topic (e.g. pub sub).
-
-To run the listeners:
-
-run_many.sh 10 topic "topicListener.sh -host 10.0.0.1 -port 5672"
-
-and to run the publisher:
-
-topicPublisher.sh -host 10.0.0.1 -port 5672 -clients 10 -messages 10000