(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@512699 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 171 insertions, 13 deletions

diff --git a/qpid/java/client-java14/pom.xml b/qpid/java/client-java14/pom.xml
index cf45250f94..9a480b47b8 100644
--- a/qpid/java/client-java14/pom.xml
+++ b/qpid/java/client-java14/pom.xml
@@ -46,6 +46,36 @@
 

     <dependencies>

 

+        <dependency>

+            <groupId>log4j</groupId>

+            <artifactId>log4j</artifactId>

+        </dependency>

+

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>slf4j-simple</artifactId>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.mina</groupId>

+            <artifactId>mina-core</artifactId>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.geronimo.specs</groupId>

+            <artifactId>geronimo-jms_1.1_spec</artifactId>

+        </dependency>

+

+        <dependency>

+            <groupId>commons-collections</groupId>

+            <artifactId>commons-collections</artifactId>

+        </dependency>

+

+        <dependency>

+            <groupId>commons-lang</groupId>

+            <artifactId>commons-lang</artifactId>

+        </dependency>

+

         <!-- Use the java 1.4 retrotranslated client. -->

         <dependency>

             <groupId>org.apache.qpid</groupId>

@@ -64,8 +94,18 @@
             <classifier>java14</classifier>

         </dependency>

 

+        <!-- Use the java 1.4 retrotranslated integration tests. -->

         <dependency>

-            <groupId>net.sf.retrotranslator</groupId>

+            <groupId>org.apache.qpid</groupId>

+            <artifactId>qpid-integrationtests</artifactId>

+            <type>jar</type>

+            <version>${pom.version}</version>

+            <classifier>java14</classifier>

+            <!--<scope>test</scope>-->

+        </dependency>

+

+        <dependency>

+            <groupId>net.sf.retrotranslator</groupId>                

             <artifactId>retrotranslator-runtime</artifactId>

             <scope>package</scope>

         </dependency>

@@ -97,17 +137,44 @@
                 <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-assembly-plugin</artifactId>

                 <version>${assembly.version}</version>

-                <goals>

-                    <goal>single</goal>

-                </goals>

-                <configuration>

-                    <descriptors>

-                        <descriptor>src/main/assembly/client-java14-bin.xml</descriptor>

-                    </descriptors>

-                    <finalName>qpid-${pom.version}</finalName>

-                    <outputDirectory>${qpid.targetDir}</outputDirectory>

-                    <tarLongFileMode>gnu</tarLongFileMode>

-                </configuration>

+

+                <executions>

+

+                    <!-- Produces the distribution. -->

+                    <execution>

+                        <id>assembly-dist</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>assembly</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>src/main/assembly/client-java14-bin.xml</descriptor>

+                            </descriptors>

+                            <finalName>qpid-${pom.version}</finalName>

+                            <outputDirectory>${qpid.targetDir}</outputDirectory>

+                            <tarLongFileMode>gnu</tarLongFileMode>

+                        </configuration>

+                    </execution>

+                    

+                    <!-- Produces a jar with all test dependencies in it. For convenience in running tests from command line. -->

+                    <!-- Todo: Replace this with a manifest only jar, its much quicker to build that. -->

+                    <execution>

+                        <id>assembly-alltestdeps</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>assembly</goal>

+                        </goals>

+                        <configuration>

+                            <descriptors>

+                                <descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>

+                            </descriptors>

+                            <outputDirectory>target</outputDirectory>

+                            <workDirectory>target/assembly/work</workDirectory>

+                        </configuration>              

+                    </execution>

+

+                </executions>

             </plugin>

 

             <!-- Sets up surefire to run during the integration-test phase instead of the test phase. -->

diff --git a/qpid/java/client-java14/src/main/assembly/client-java14-bin.xml b/qpid/java/client-java14/src/main/assembly/client-java14-bin.xml
index 87c7f498f9..91e1f23975 100644
--- a/qpid/java/client-java14/src/main/assembly/client-java14-bin.xml
+++ b/qpid/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/qpid/java/client-java14/src/main/assembly/jar-with-dependencies.xml b/qpid/java/client-java14/src/main/assembly/jar-with-dependencies.xml
new file mode 100644
index 0000000000..dd279ffb3a
--- /dev/null
+++ b/qpid/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