QPID-916 delete, about to recreate

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/tags/M2.1@648679 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 0 insertions, 868 deletions

diff --git a/RC6/java/distribution/pom.xml b/RC6/java/distribution/pom.xml
deleted file mode 100644
index 1d3b7c6983..0000000000
--- a/RC6/java/distribution/pom.xml
+++ /dev/null
@@ -1,223 +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-M2.1</version>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1</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>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-source-plugin</artifactId>
-               <executions>
-                 <execution>
-                   <id>attach-sources</id>
-                   <goals>
-                     <goal>jar</goal>
-                   </goals>
-                 </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/RC6/java/distribution/src/main/assembly/bin-test.xml b/RC6/java/distribution/src/main/assembly/bin-test.xml
deleted file mode 100644
index 04d83916e4..0000000000
--- a/RC6/java/distribution/src/main/assembly/bin-test.xml
+++ /dev/null
@@ -1,120 +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>
-   <!-- Include the currently hardwired Apache Legal bits -->
-    <fileSet>
-      <directory>../resources</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>README</include>
-      </includes>
-      <fileMode>0444</fileMode>
-    </fileSet>
-
-  <!-- Include any release information -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>../release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-    </fileSet>
-
-    <!-- Include the classpath jar qpid-incubating.jar -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <includes>
-          <include>qpid-incubating.jar</include>
-      </includes>
-    </fileSet>
-
-    <!-- Include etc -->
-    <fileSet>
-      <directory>../common/etc</directory>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <fileMode>0640</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../broker/etc</directory>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <fileMode>0640</fileMode>
-    </fileSet>
-
-    <!-- Include bin scripts-->
-    <fileSet>
-      <directory>../broker/bin</directory>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <fileMode>0750</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../common/bin</directory>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <fileMode>0750</fileMode>
-    </fileSet>
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <!-- Exclude the jar output of this build process -->
-        <exclude>org.apache.qpid:qpid-distribution</exclude>
-        <!-- Exclude the Console dependancies -->
-        <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/RC6/java/distribution/src/main/assembly/bin.xml b/RC6/java/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index 3620659e48..0000000000
--- a/RC6/java/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,127 +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>
-    <!-- Include the currently hardwired Apache Legal bits -->
-    <fileSet>
-      <directory>../resources</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>README</include>
-      </includes>
-      <fileMode>0444</fileMode>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>..//release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>../release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-    </fileSet>
-
-    <!-- Include the classpath jar qpid-incubating.jar -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <includes>
-          <include>qpid-incubating.jar</include>
-      </includes>
-    </fileSet>
-
-    <!-- Include etc -->
-    <fileSet>
-      <directory>../common/etc</directory>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <fileMode>0640</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../broker/etc</directory>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <fileMode>0640</fileMode>
-    </fileSet>
-
-    <!-- Include bin scripts-->
-    <fileSet>
-      <directory>../broker/bin</directory>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <fileMode>0750</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>../common/bin</directory>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <fileMode>0750</fileMode>
-    </fileSet>
-
-  </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <!-- Exclude the jar output of this build process -->
-        <exclude>org.apache.qpid:qpid-distribution</exclude>
-        <!-- Exclude the Console dependancies -->
-        <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/RC6/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/RC6/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
deleted file mode 100644
index 02ede019e5..0000000000
--- a/RC6/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
+++ /dev/null
@@ -1,131 +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>
-
-
-  <!-- Include the currently hardwired Apache Legal bits -->
-    <fileSet>
-      <directory>../resources</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>README</include>
-      </includes>
-      <fileMode>0444</fileMode>
-    </fileSet>
-
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>../release-docs</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources/unix/configuration</directory>
-      <outputDirectory>qpidmc/configuration</outputDirectory>
-    </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>0777</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/RC6/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/RC6/java/distribution/src/main/assembly/management-eclipse-plugin.xml
deleted file mode 100644
index 05df2c030b..0000000000
--- a/RC6/java/distribution/src/main/assembly/management-eclipse-plugin.xml
+++ /dev/null
@@ -1,162 +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>
-
-  <fileSets>
-
-  <!-- Include the currently hardwired Apache Legal bits -->
-    <fileSet>
-      <directory>../resources</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>README</include>
-      </includes>
-      <fileMode>0444</fileMode>
-    </fileSet>
-
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>../release-docs</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-    </fileSet>
-
-
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpidmc</outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>../management/eclipse-plugin/src/main/resources/win32/configuration</directory>
-      <outputDirectory>qpidmc/configuration</outputDirectory>
-    </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>
-      <excludes>
-        <!-- Exclude the Unix scripts -->
-        <exclude>qpidmc*.sh</exclude>
-      </excludes>
-      <fileMode>0777</fileMode>
-    </fileSet>
-
-    <!-- Required to make eclipse load the JMXRemote SASL pluging -->
-    <!-- This should be removed as JMXRemote SASL module is not ASF license friendly -->
-    <!-- However management console doesn't seem to work without it -->
-    <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>
-  </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/RC6/java/distribution/src/main/assembly/src.xml b/RC6/java/distribution/src/main/assembly/src.xml
deleted file mode 100644
index a9db9c79c1..0000000000
--- a/RC6/java/distribution/src/main/assembly/src.xml
+++ /dev/null
@@ -1,105 +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>../resources</directory>
-      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>README</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>src/main/release</directory>
-      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
-    </fileSet>
-
-    <!-- Include any release information -->
-    <fileSet>
-      <directory>../release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpid-${qpid.version}-src/java</outputDirectory>
-      <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>
-      <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>
-
-  <fileSet>
-      <directory>../../python</directory>
-      <outputDirectory>qpid-${qpid.version}-src/python</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>