[jboss-svn-commits] JBL Code SVN: r36630 - in labs/jbosstm/trunk: ArjunaCore/arjuna and 1 other directories.

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

Author: tomjenkinson
Date: 2011-02-19 13:01:56 -0500 (Sat, 19 Feb 2011)
New Revision: 36630

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/maven/pom-template.xml
   labs/jbosstm/trunk/sharedbuild.xml
Log:
Updated to use bmunit

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2011-02-17 16:48:06 UTC (rev 36629)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2011-02-19 18:01:56 UTC (rev 36630)
@@ -38,7 +38,7 @@
     <target name="compile-tests">
         <compile-tests.macro>
             <additional.classpath>
-                <fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs} byteman.jar"/>
+                <fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs} byteman.jar byteman-bmunit.jar byteman-install.jar byteman-submit.jar"/>
             </additional.classpath>
         </compile-tests.macro>
     </target>
@@ -92,7 +92,7 @@
             </tests>
         </run.tests.macro>
         <!-- reaper tests run using script reaper.txt -->
-        <run.tests.macro script="reaper.txt">
+        <run.tests.macro>
             <tests>
                 <fileset dir="tests/classes">
                     <include name="**/reaper/ReaperMonitorTest.java"/>
@@ -111,7 +111,7 @@
              
         </run.tests.macro>
         <!-- object store tests run using script objectstore.txt -->
-        <run.tests.macro script="objectstore.txt">
+        <run.tests.macro>
             <tests>
                 <fileset dir="tests/classes">
                     <include name="**/objectstore/LogStoreRecoveryTest.java"/>
@@ -119,7 +119,7 @@
                 </fileset>
             </tests>
         </run.tests.macro>
-        <run.tests.macro script="recovery.txt">
+        <run.tests.macro>
             <tests>
                 <fileset dir="tests/classes" includes="**/recovery/RecoveryManagerStartStopTest.java"/>
             </tests>

Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml	2011-02-17 16:48:06 UTC (rev 36629)
+++ labs/jbosstm/trunk/maven/pom-template.xml	2011-02-19 18:01:56 UTC (rev 36630)
@@ -247,17 +247,35 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.byteman</groupId>
-            <artifactId>byteman</artifactId>
-            <version>1.4.0</version>
-            <scope>test</scope>
-        </dependency>
+	<dependency>
+		<groupId>org.jboss.byteman</groupId>
+		<artifactId>byteman</artifactId>
+        	<version>${byteman-version}</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>org.jboss.byteman</groupId>
+		<artifactId>byteman-install</artifactId>
+        	<version>${byteman-version}</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>org.jboss.byteman</groupId>
+		<artifactId>byteman-submit</artifactId>
+        	<version>${byteman-version}</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>org.jboss.byteman</groupId>
+		<artifactId>byteman-bmunit</artifactId>
+        	<version>${byteman-version}</version>
+		<scope>test</scope>
+	</dependency>
         <!-- txbridge uses the dtest addon -->
         <dependency>
             <groupId>org.jboss.byteman</groupId>
             <artifactId>byteman-dtest</artifactId>
-            <version>1.4.0</version>
+            <version>${byteman-version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -419,5 +437,8 @@
         </dependency>
 
     </dependencies>
-
+    
+    <properties>
+        <byteman-version>1.5.1</byteman-version>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2011-02-17 16:48:06 UTC (rev 36629)
+++ labs/jbosstm/trunk/sharedbuild.xml	2011-02-19 18:01:56 UTC (rev 36630)
@@ -78,6 +78,17 @@
         <pathelement location="${emma.dir}/emma_ant.jar" />
     </path>
 
+    <property name="byteman.dir" value="${global.ext.lib.dir}" />
+
+    <path id="byteman.lib" >
+        <pathelement location="${byteman.dir}/byteman.jar" />
+        <pathelement location="${byteman.dir}/byteman-bmunit.jar" />
+        <pathelement location="${byteman.dir}/byteman-install.jar" />
+        <pathelement location="${byteman.dir}/byteman-submit.jar" />
+        <pathelement location="${byteman.dir}/byteman-dtest.jar" />
+        <pathelement location="${java.home}/../lib/tools.jar" />
+    </path>
+
     <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
 
 
@@ -463,6 +474,10 @@
                 message="&lt;!DOCTYPE properties SYSTEM &quot;http://java.sun.com/dtd/properties.dtd&quot;&gt;&lt;properties/&gt;"/>
 
         <copy file="${sharedbuild.base.dir}/ArjunaCore/arjuna/etc/log4j.properties" todir="${build.dir}/classes"/>
+        	
+        <copy todir="${build.dir}" failonerror="false">
+        	<fileset dir="tests/byteman-scripts/"/> 
+       	</copy>
 
         <mkdir dir="${build.dir}/testresults"/>
         <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" includeantruntime="true">
@@ -479,6 +494,7 @@
                 <fileset dir="${global.ext.lib.dir}" includes="jboss-logging.jar,log4j.jar"/>
                 <additional.classpath.aux/>
                 <path refid="emma.lib" />
+                <path refid="byteman.lib" />
             </classpath>
 
             <batchtest haltonerror="yes" haltonfailure="yes" fork="yes" todir="${build.dir}/testresults">