[jboss-svn-commits] JBL Code SVN: r38202 - labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests.

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

Author: istudens at redhat.com
Date: 2012-09-26 05:58:07 -0400 (Wed, 26 Sep 2012)
New Revision: 38202

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml
   labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/pom.xml
Log:
modify scope of Arjuna dependencies to the system scope, JBTM-1272

Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml	2012-09-25 17:51:20 UTC (rev 38201)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml	2012-09-26 09:58:07 UTC (rev 38202)
@@ -17,7 +17,7 @@
         </mvn.macro>
     </target>
 
-    <target name="dist" depends="clean, install-deps">
+    <target name="dist" depends="clean">
         <mvn.macro>
             <mvn.args>
                 <arg value="compile"/>
@@ -33,13 +33,6 @@
         </mvn.macro>
     </target>
 
-    <target name="install-deps">
-        <!-- installs built jbossts bits to the local maven repository -->
-        <mvn-install-artifact.macro artifact="jbosstxbridge" file="${basedir}/../build/txbridge.jar" version="${jbossts.version}" />
-        <mvn-install-artifact.macro artifact="jbossjts" file="${basedir}/../../install/lib/jbossjts.jar" version="${jbossts.version}" />
-        <mvn-install-artifact.macro artifact="jbossxts-api" file="${basedir}/../../XTS/xts-install/lib/jbossxts-api.jar" version="${jbossts.version}" />
-    </target>
-
     <target name="enable-recovery-listener">
         <!-- recovery listener is needed by crash rec tests -->
         <echo message="enabling the recovery listener in ${standalone.xts.conf.path}"/>
@@ -50,27 +43,6 @@
     </target>
 
     <!-- ==================    macros    =================== -->
-    <macrodef name="mvn-install-artifact.macro">
-        <attribute name="artifact"/>
-        <attribute name="file"/>
-        <attribute name="packaging" default="jar"/>
-        <attribute name="version"/>
-
-        <sequential>
-            <mvn.macro>
-                <mvn.args>
-                    <arg value="install:install-file"/>
-                    <arg value="-Dfile=@{file}"/>
-                    <arg value="-DgroupId=${groupid}"/>
-                    <arg value="-DartifactId=@{artifact}"/>
-                    <arg value="-Dversion=@{version}"/>
-                    <arg value="-Dpackaging=@{packaging}"/>
-                    <arg value="-DgeneratePom=true"/>
-                </mvn.args>
-            </mvn.macro>
-        </sequential>
-    </macrodef>
-
     <macrodef name="mvn.macro">
         <element name="mvn.args"/>
 

Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/pom.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/pom.xml	2012-09-25 17:51:20 UTC (rev 38201)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/pom.xml	2012-09-26 09:58:07 UTC (rev 38202)
@@ -34,21 +34,24 @@
             <groupId>org.jboss.jbossts</groupId>
             <artifactId>jbossxts-api</artifactId>
             <version>${version.jbossts}</version>
-            <scope>test</scope>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../../XTS/sar/build/jbossxts-api.jar</systemPath>
        </dependency>
 
        <dependency>
             <groupId>org.jboss.jbossts</groupId>
             <artifactId>jbossjts</artifactId>
             <version>${version.jbossts}</version>
-            <scope>test</scope>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../../ArjunaJTS/build/lib/jbossjts.jar</systemPath>
        </dependency>
 
        <dependency>
             <groupId>org.jboss.jbossts</groupId>
             <artifactId>jbosstxbridge</artifactId>
             <version>${version.jbossts}</version>
-            <scope>test</scope>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../build/txbridge.jar</systemPath>
        </dependency>
 
        <dependency>