[jboss-svn-commits] JBL Code SVN: r31742 - labs/jbosstm/trunk/XTS/localjunit.

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

Author: jhalliday
Date: 2010-02-19 10:18:05 -0500 (Fri, 19 Feb 2010)
New Revision: 31742

Modified:
   labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
   labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
Log:
Update XTS test harness scripts to use mvn dir for 3rd party libs. JBTM-687


Modified: labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml	2010-02-19 13:51:47 UTC (rev 31741)
+++ labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml	2010-02-19 15:18:05 UTC (rev 31742)
@@ -26,18 +26,18 @@
     <property name="base.url" value="http://${server.hostname}:8080"/>
     <property name="reports.dir" value="reports"/>
     <property name="localjunit.lib.dir" value="build" />
-    <property name="apache.httpclient.lib.dir" value="ext" />
-    <property name="apache.logging.lib.dir" value="ext" />
-    <property name="apache.codec.lib.dir" value="ext" />
-    <property name="junit.lib.dir" value="../ext" />
+
     <property name="testtype" value="tests-both" />
 
+    <!-- all libraries external to JBossTS should be found in parent build/extlib -->
+    <property name="jbossts.build.extlib.dir" location="../../build/extlib"/>
+
     <path id="tests.classpath">
         <pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
-        <pathelement location="${apache.httpclient.lib.dir}/commons-httpclient.jar"/>
-        <pathelement location="${apache.logging.lib.dir}/commons-logging.jar"/>
-        <pathelement location="${apache.codec.lib.dir}/commons-codec.jar"/>
-        <pathelement location="${junit.lib.dir}/junit.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>
 
     <target name="interop-tests" depends="wstf-interop-tests,wstx11-interop-tests"/>

Modified: labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-tests.xml	2010-02-19 13:51:47 UTC (rev 31741)
+++ labs/jbosstm/trunk/XTS/localjunit/run-tests.xml	2010-02-19 15:18:05 UTC (rev 31742)
@@ -26,17 +26,16 @@
     <property name="base.url" value="http://${server.hostname}:8080"/>
     <property name="reports.dir" value="reports"/>
     <property name="localjunit.lib.dir" value="build" />
-    <property name="apache.httpclient.lib.dir" value="ext" />
-    <property name="apache.logging.lib.dir" value="ext" />
-    <property name="apache.codec.lib.dir" value="ext" />
-    <property name="junit.lib.dir" value="../ext" />
 
+    <!-- all libraries external to JBossTS should be found in parent build/extlib -->
+    <property name="jbossts.build.extlib.dir" location="../../build/extlib"/>
+
     <path id="tests.classpath">
         <pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
-        <pathelement location="${apache.httpclient.lib.dir}/commons-httpclient.jar"/>
-        <pathelement location="${apache.logging.lib.dir}/commons-logging.jar"/>
-        <pathelement location="${apache.codec.lib.dir}/commons-codec.jar"/>
-        <pathelement location="${junit.lib.dir}/junit.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>