[jboss-svn-commits] JBL Code SVN: r38078 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP: ext and 1 other directories.

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

Author: tomjenkinson
Date: 2012-05-09 05:34:59 -0400 (Wed, 09 May 2012)
New Revision: 38078

Added:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman/
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman/byteman-122.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman/byteman-201.jar
Removed:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman-122.jar
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman-201.jar
Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/build.xml
Log:
Provide both 122 and 201 byteman jar (JDK5 v JDK7)

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/build.xml	2012-05-09 08:16:26 UTC (rev 38077)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/build.xml	2012-05-09 09:34:59 UTC (rev 38078)
@@ -459,6 +459,12 @@
         	</batchtest>
         </junit>
 
+        <condition property="bytemanversion" value="201" else="201">
+            <not>
+                 <contains string="${java.version}" substring="1.5" casesensitive="false" />
+            </not>
+        </condition>
+
         <junit printsummary="yes" fork="true" dir="${basedir}" showoutput="false">
             <formatter type="plain"/>
             <classpath>
@@ -477,7 +483,7 @@
                 </fileset>
             </batchtest>
 
-            <jvmarg value="-javaagent:../../ext/byteman-122.jar=script:tests/byteman-scripts/reaper.txt"/>
+            <jvmarg value="-javaagent:../../ext/byteman/byteman-${bytemanversion}.jar=script:tests/byteman-scripts/reaper.txt"/>
             <jvmarg value="-Dorg.jboss.byteman.debug"/>
         </junit>
     </target>

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman/byteman-122.jar (from rev 38077, labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman-122.jar)
===================================================================
(Binary files differ)

Copied: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman/byteman-201.jar (from rev 38077, labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman-201.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman-122.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ext/byteman-201.jar
===================================================================
(Binary files differ)