[jboss-svn-commits] JBL Code SVN: r31343 - in labs/jbosstm/trunk: maven and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2010-02-01 12:13:41 -0500 (Mon, 01 Feb 2010)
New Revision: 31343

Modified:
   labs/jbosstm/trunk/XTS/localjunit/build.xml
   labs/jbosstm/trunk/maven/pom-template.xml
Log:
updated pom to bring in dependencies for XTS localjunit and to remove CXF dependencies since we are now single build. modified localjunit to find its dependencies in TS build/extlib directroy. fixes JBTM-679

Modified: labs/jbosstm/trunk/XTS/localjunit/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/build.xml	2010-02-01 16:58:07 UTC (rev 31342)
+++ labs/jbosstm/trunk/XTS/localjunit/build.xml	2010-02-01 17:13:41 UTC (rev 31343)
@@ -8,10 +8,17 @@
 	<property name="javac.debug"             value="on"/>
 	<property name="javac.optimize"          value="off"/>
 
+    <!-- location of JBossTS parent tree -->
+    <property name="jbossts.dir" location="../.."/>
+
+    <!-- all libraries external to JBossTS should be found in parent build/extlib -->
+    <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
+    <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
+
 	<path id="tests.classpath">
-		<pathelement location="ext/commons-httpclient.jar"/>
-		<pathelement location="ext/commons-logging.jar"/>
-		<pathelement location="ext/commons-codec.jar"/>
+		<pathelement location="${jbossts.build.extlib.dir}/commons-httpclient.jar"/>
+		<pathelement location="${jbossts.build.extlib.dir}/commons-logging.jar"/>
+		<pathelement location="${jbossts.build.extlib.dir}/commons-codec.jar"/>
 		<pathelement location="../ext/junit.jar"/>
 	</path>
 

Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml	2010-02-01 16:58:07 UTC (rev 31342)
+++ labs/jbosstm/trunk/maven/pom-template.xml	2010-02-01 17:13:41 UTC (rev 31343)
@@ -171,19 +171,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
-            <!-- the default WS stack in AS is Native. To build XTS against CXF, we
-                need to pull it in separately. The tricky bit is knowing what version
-                to use, since the AS pom won't tell us. In general it's the same as the
-                'version.jboss.jbossws' in whatever version of AS you choose. -->
-            <dependency>
-                <groupId>org.jboss.ws.cxf</groupId>
-                <artifactId>jbossws-cxf</artifactId>
-                <version>3.2.2.GA</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -198,7 +185,18 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
 
+        <!-- XTS also requires commons-codec and commons-httpclient to compile the localjunit module -->
         <dependency>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>apache-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>