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
---
 java/client-java14/pom.xml | 91 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 12 deletions(-)

(limited to 'java/client-java14/pom.xml')

diff --git a/java/client-java14/pom.xml b/java/client-java14/pom.xml
index cf45250f94..9a480b47b8 100644
--- a/java/client-java14/pom.xml
+++ b/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. -->
-- 
cgit v1.2.1