QPID-916 tag RC6

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

5 files changed, 490 insertions, 0 deletions

diff --git a/RC6/java/client/distribution/pom.xml b/RC6/java/client/distribution/pom.xml
new file mode 100644
index 0000000000..50115edcfa
--- /dev/null
+++ b/RC6/java/client/distribution/pom.xml
@@ -0,0 +1,169 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.qpid</groupId>
+    <artifactId>qpid-client-distribution</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-incubating-M2.1</version>
+    <name>Qpid Client Distributions</name>
+    <url>http://cwiki.apache.org/confluence/display/qpid</url>
+
+    <parent>
+        <groupId>org.apache.qpid</groupId>
+        <artifactId>qpid</artifactId>
+        <version>1.0-incubating-M2.1</version>
+    </parent>
+
+    <properties>
+        <topDirectoryLocation>..</topDirectoryLocation>
+        <java.source.version>1.5</java.source.version>
+        <qpid.version>${pom.version}</qpid.version>
+        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
+        <qpid.root>${basedir}/..</qpid.root>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-client</artifactId>
+            <type>jar</type>
+            <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/client-bin.xml</descriptor>
+                        </descriptors>
+                        <finalName>qpid-${pom.version}</finalName>
+                        <outputDirectory>${qpid.targetDir}</outputDirectory>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                 <configuration>
+                        <finalName>qpid-incubating</finalName>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/client-bin.xml</descriptor>
+                                <descriptor>src/main/assembly/client-src.xml</descriptor>
+                            </descriptors>
+                            <finalName>qpid-${pom.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <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>
+
+    </build>
+
+<profiles>
+    <profile>
+        <id>tests</id>
+
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.qpid</groupId>
+                <artifactId>qpid-client</artifactId>
+                <type>test-jar</type>
+                 <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+
+        <build>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>distribution-package</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/client-bin-tests.xml</descriptor>
+                                </descriptors>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+</profiles>
+
+</project>
diff --git a/RC6/java/client/distribution/src/main/assembly/client-bin-tests.xml b/RC6/java/client/distribution/src/main/assembly/client-bin-tests.xml
new file mode 100644
index 0000000000..ec4df1c9a7
--- /dev/null
+++ b/RC6/java/client/distribution/src/main/assembly/client-bin-tests.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+  <id>java-client-bin-with-tests</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+      <fileSet>
+          <!-- Apache license files -->
+          <directory>../../resources</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>DISCLAIMER</include>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+              <include>README.txt</include>
+          </includes>
+      </fileSet>
+
+      <fileSet>
+          <directory>../../release-docs</directory>
+          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+          <includes>
+              <include>RELEASE_NOTES.txt</include>
+          </includes>
+      </fileSet>
+
+    <!-- Include easy access to test source-->
+      <fileSet>
+          <directory>../src/test</directory>
+          <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
+          <includes>
+              <include>**/*.java</include>
+          </includes>
+      </fileSet>
+
+      <!-- fileSet>  Client contains a readme.txt as does qpid root.
+                    Which will cause problems on windows as the zip will
+                    contain: readme.txt and README.txt
+          < Client local documentation>
+          <directory>..</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>*.txt</include>
+          </includes>
+      </fileSet-->
+
+    <!-- Configuration -->
+     <fileSet>
+          <directory>../test/etc</directory>
+          <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+          <includes>
+              <include>**/*</include>
+          </includes>
+    </fileSet>
+
+    <!-- Execution Scripts -->
+     <fileSet>
+          <directory>../test/bin</directory>
+          <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+          <includes>
+              <include>**/*</include>
+          </includes>
+          <fileMode>777</fileMode> <!-- RWX -->
+    </fileSet>
+
+    <!-- Metadata Jar -->
+      <fileSet>
+          <directory>target</directory>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <includes>
+              <include>qpid-incubating.jar</include>
+          </includes>
+      </fileSet>
+  </fileSets>
+
+  <dependencySets>
+      <dependencySet>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <unpack>false</unpack>
+           <excludes>
+               <exclude>org.apache.qpid:qpid-client-distribution</exclude>
+          </excludes>
+      </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/RC6/java/client/distribution/src/main/assembly/client-bin.xml b/RC6/java/client/distribution/src/main/assembly/client-bin.xml
new file mode 100644
index 0000000000..70874b09a4
--- /dev/null
+++ b/RC6/java/client/distribution/src/main/assembly/client-bin.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+  <id>java-client-bin</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+      <fileSet>
+          <!-- Apache license files -->
+          <directory>../../resources</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>DISCLAIMER</include>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+              <include>README.txt</include>
+          </includes>
+      </fileSet>
+
+      <!--fileSet>
+          < Client local documentation>
+          <directory>..</directory>
+          <outputDirectory>qpid-${qpid.version}</outputDirectory>
+          <includes>
+              <include>*.txt</include>
+          </includes>
+      </fileSet-->
+
+      <fileSet>
+          <directory>../../release-docs</directory>
+          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
+          <includes>
+              <include>RELEASE_NOTES.txt</include>
+          </includes>
+      </fileSet>
+
+      <fileSet>
+          <directory>target</directory>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <includes>
+              <include>qpid-incubating.jar</include>
+          </includes>
+      </fileSet>
+  </fileSets>
+
+  <dependencySets>
+      <dependencySet>
+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
+          <unpack>false</unpack>
+          <excludes>
+             <exclude>org.apache.qpid:qpid-client:jar:java14</exclude>
+             <exclude>org.apache.qpid:qpid-common:jar:java14</exclude>
+             <exclude>org.apache.qpid:qpid-client-distribution</exclude>
+          </excludes>
+      </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/RC6/java/client/distribution/src/main/assembly/client-java1.4-bin.xml b/RC6/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
new file mode 100644
index 0000000000..6a2dd17c5c
--- /dev/null
+++ b/RC6/java/client/distribution/src/main/assembly/client-java1.4-bin.xml
@@ -0,0 +1,74 @@
+<?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 instructions for a client that runs on Java 1.4 -->

+<assembly>

+  <id>java-client-java1.4-bin</id>

+  <includeBaseDirectory>false</includeBaseDirectory>

+  <formats>

+    <format>tar.gz</format>

+    <format>zip</format>

+  </formats>

+

+  <fileSets>

+      <fileSet>

+          <!-- Apache license files -->

+          <directory>../../resources</directory>

+          <outputDirectory>qpid-${qpid.version}</outputDirectory>

+          <includes>

+              <include>DISCLAIMER</include>

+              <include>LICENSE.txt</include>

+              <include>NOTICE.txt</include>

+              <include>README.txt</include>

+          </includes>

+      </fileSet>

+

+      <fileSet>

+          <directory>../../release-docs</directory>

+          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>

+          <includes>

+              <include>RELEASE_NOTES.txt</include>

+          </includes>

+      </fileSet>

+

+      <fileSet>

+          <directory>target</directory>

+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>

+          <includes>

+              <include>qpid-incubating.jar</include>

+          </includes>

+      </fileSet>

+  </fileSets>

+

+  <dependencySets>

+      <dependencySet>

+          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>

+          <unpack>false</unpack>

+          <excludes>

+             <exclude>org.apache.qpid:qpid-client:jar</exclude>

+             <exclude>org.apache.qpid:qpid-common:jar</exclude>

+             <exclude>org.apache.qpid:qpid-client-distribution</exclude>

+             <exclude>org.apache.mina:mina-java5</exclude>

+             <exclude>org.apache.mina:mina-filter-ssl</exclude>

+          </excludes>

+      </dependencySet>

+  </dependencySets>

+</assembly>

+

+

diff --git a/RC6/java/client/distribution/src/main/assembly/client-src.xml b/RC6/java/client/distribution/src/main/assembly/client-src.xml
new file mode 100644
index 0000000000..b5055f05d7
--- /dev/null
+++ b/RC6/java/client/distribution/src/main/assembly/client-src.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+  <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+  <id>java-client-src</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+   
+      <fileSet>
+          <!-- Apache license files -->
+          <directory>../../resources</directory>
+          <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+          <includes>
+              <include>DISCLAIMER</include>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+              <include>README.txt</include>
+          </includes>
+      </fileSet>
+
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+      <includes>
+        <include>src/main/**</include>
+        <include>src/test/**</include>
+        <include>test/main/**</include>
+        <include>test/test/**</include>
+        <include>pom.xml</include>
+        <include>distribution/**</include>
+      </includes>
+      <excludes>
+        <exclude>**/target</exclude>
+        <exclude>**/target/**/*</exclude>
+        <exclude>**/build</exclude>
+        <exclude>**/build/**/*</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>