From a707cad8e7bf0e7e5dc9725d2d08e63456dcb82d Mon Sep 17 00:00:00 2001
From: Robert Greig <rgreig@apache.org>
Date: Wed, 28 Feb 2007 11:05:20 +0000
Subject: (Patch submitted by Rupert Smith). java_iop.diff This adds some
 interop tests (which are just copies of the existing topic tests) in a new
 integrationtests module. The java 1.4. client build has been updated to be
 able to run these tests. They succesfully talk to each other and the .net
 code. This is intended to be a starting point of a more in depth interop test
 as per the spec, but does not implement what is in the draft spec yet.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@512699 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/assembly/client-java14-bin.xml        |  7 +-
 .../src/main/assembly/jar-with-dependencies.xml    | 86 ++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 java/client-java14/src/main/assembly/jar-with-dependencies.xml

(limited to 'java/client-java14/src')

diff --git a/java/client-java14/src/main/assembly/client-java14-bin.xml b/java/client-java14/src/main/assembly/client-java14-bin.xml
index 87c7f498f9..91e1f23975 100644
--- a/java/client-java14/src/main/assembly/client-java14-bin.xml
+++ b/java/client-java14/src/main/assembly/client-java14-bin.xml
@@ -53,14 +53,19 @@
       <dependencySet>
           <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
           <unpack>false</unpack>
+          
           <excludes>
-              <!-- Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. -->
+             <!-- Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. -->
              <exclude>org.apache.qpid:qpid-client:jar</exclude>
              <exclude>org.apache.qpid:qpid-common:jar</exclude>
 
+             <!-- Exclude the retrotranslated integration tests from the distriubtion. -->
+             <exclude>org.apache.qpid:qpid-integrationtests:jar:java14</exclude>
+
              <!-- Mina SSL support only available in Java 5. No SSL on 1.4. -->
              <exclude>org.apache.mina:mina-java5</exclude>
              <exclude>org.apache.mina:mina-filter-ssl</exclude>
+
           </excludes>         
       </dependencySet>
   </dependencySets>
diff --git a/java/client-java14/src/main/assembly/jar-with-dependencies.xml b/java/client-java14/src/main/assembly/jar-with-dependencies.xml
new file mode 100644
index 0000000000..dd279ffb3a
--- /dev/null
+++ b/java/client-java14/src/main/assembly/jar-with-dependencies.xml
@@ -0,0 +1,86 @@
+<!-- This is an assembly descriptor that produces a jar file that contains all the
+     test dependencies, fully expanded into a single jar, required to run the tests
+     of a maven project. 
+-->
+<!--
+<assembly>
+    <id>all-test-deps</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <formats>
+        <format>jar</format>
+    </formats>
+
+    <dependencySets>
+        <!## Include all test dependencies. ##>
+        <dependencySet>
+            <outputDirectory></outputDirectory>
+            <outputFileNameMapping></outputFileNameMapping>
+            <unpack>true</unpack>
+            <!##<scope>runtime</scope>##>
+
+            <!##
+            <includes>
+                <include>org.apache.qpid:qpid-client:jar:java14</include>
+                <include>org.apache.qpid:qpid-common:jar:java14</include>
+            </includes>
+            ##>
+
+            <excludes>
+                <!## Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. ##>
+                <exclude>org.apache.qpid:qpid-client:jar</exclude>
+                <exclude>org.apache.qpid:qpid-common:jar</exclude>
+                
+                <!## Mina SSL support only available in Java 5. No SSL on 1.4. ##>
+                <exclude>org.apache.mina:mina-java5</exclude>
+                <exclude>org.apache.mina:mina-filter-ssl</exclude>
+            </excludes>         
+
+        </dependencySet>
+
+    </dependencySets>
+
+    <fileSets>
+        <!## Include all project classes. ##>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+
+        <!## Include all project test classes. ##>
+        <fileSet>
+            <directory>target/test-classes</directory>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
+-->
+
+<assembly>
+  <id>all-test-deps</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>jar</format>
+  </formats>
+
+  <fileSets>
+  </fileSets>
+
+  <dependencySets>
+      <dependencySet>
+          <outputDirectory></outputDirectory>
+          <unpack>true</unpack>
+          
+          <excludes>
+             <!-- Exclude the Java 5 built client and common. The java 1.4 retrotranslated versions are used instead. -->
+             <exclude>org.apache.qpid:qpid-client:jar</exclude>
+             <exclude>org.apache.qpid:qpid-common:jar</exclude>
+
+             <!-- Mina SSL support only available in Java 5. No SSL on 1.4. -->
+             <exclude>org.apache.mina:mina-java5</exclude>
+             <exclude>org.apache.mina:mina-filter-ssl</exclude>
+
+          </excludes>         
+      </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file
-- 
cgit v1.2.1