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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jul 8 06:21:18 EDT 2009 

Author: jhalliday
Date: 2009-07-08 06:21:16 -0400 (Wed, 08 Jul 2009)
New Revision: 27731

Added:
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java
Removed:
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/README.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output1.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output2.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/README.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output1.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output2.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output3.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output4.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output5.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/README.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/README.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output1.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output2.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output3.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output1.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output2.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output3.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/README.txt
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/expected_output1.txt
Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
   labs/jbosstm/trunk/ArjunaCore/txoj/build.xml
   labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
   labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
   labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
   labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/Performance.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/SynchTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest1.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest3.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest4.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest5.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/checked/CheckedTransactions.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/grid/GridTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance1.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance3.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/timeout/TerminationTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicObject.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicResource.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker1.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker3.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3a.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3b.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoArjunaResource.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoResource.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoSubTranResource.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker1.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker3.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ExplicitStackImple.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/HammerObject.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/StackImple.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3a.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3b.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/demosync.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/grid_i.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/heuristic.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/setget_i.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/trangrid_i.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/tranobject_i.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/SuspendResume.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/recovery/RCTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TransactionalThread.java
   labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/UtilityTest.java
   labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
   labs/jbosstm/trunk/common/build.xml
   labs/jbosstm/trunk/sharedbuild.xml
Log:
Updates to unit tests. JBTM-576


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -22,8 +22,6 @@
 
     <property name="modulename" value="arjuna"/>
 
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
-
     <import file="../../sharedbuild.xml"/>
 
     <target name="init" depends="sharedbuild.init">

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -22,8 +22,6 @@
 
     <property name="modulename" value="tsmx"/>
 
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
-    
     <import file="../../sharedbuild.xml"/>
 
     <target name="init" depends="sharedbuild.init">

Modified: labs/jbosstm/trunk/ArjunaCore/txoj/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -22,8 +22,6 @@
 
     <property name="modulename" value="txoj"/>
 
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
-
     <import file="../../sharedbuild.xml"/>
 
     <target name="init" depends="sharedbuild.init">

Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -26,7 +26,6 @@
     <property name="excluded.test.classes" value="**/Oracle*.java"/>
 
     <property name="global.ext.libs" value="jta-1_1-classes.zip"/>
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
 
     <import file="../../sharedbuild.xml"/>
 

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -23,7 +23,6 @@
     <property name="modulename" value="jta"/>
 
     <property name="global.ext.libs" value="jta-1_1-classes.zip,connector-api.jar"/>
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
 
     <import file="../../sharedbuild.xml"/>
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -23,7 +23,6 @@
     <property name="modulename" value="jtax"/>
 
     <property name="global.ext.libs" value="jta-1_1-classes.zip,connector-api.jar"/>
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
 
     <import file="../sharedbuild.xml"/>
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -22,8 +22,6 @@
 
     <property name="modulename" value="jts"/>
 
-    <property name="global.ext.test.libs" value="junit.jar,TestingFramework.jar"/>
-
     <import file="../sharedbuild.xml"/>
 
     <target name="init" depends="sharedbuild.init">
@@ -96,4 +94,30 @@
         </propertyfile>
     </target>
 
+
+    <target name="run.tests">
+        <run.tests.macro>
+            <additional.classpath>
+                <path refid="jacorb.classpath"/>
+            </additional.classpath>
+            <tests>
+                <fileset dir="tests/classes">
+                    <exclude name="**/exceptions/**"/>
+                    <exclude name="**/orbspecific/resources/**"/>
+                    <exclude name="**/resources/**"/>
+                    <exclude name="**/utils/ResourceTrace.java"/>
+                    <exclude name="**/utils/Util.java"/>
+
+
+                    <exclude name="**/HeuristicTest.java"/>
+                    <exclude name="**/TransactionTest1.java"/>
+                    <exclude name="**/TransactionTest2.java"/>
+                    <exclude name="**/CheckedTransactions.java"/>
+                    <exclude name="**/GridTest.java"/>
+                    <exclude name="**/remote/**"/>
+                </fileset>
+            </tests>
+        </run.tests.macro>
+    </target>
+
 </project>
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,146 +31,104 @@
 
 package com.hp.mwtests.ts.jts.local.arjuna;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
-
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
 
-public class ArjunaNestingTest extends Test
-{
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-    public void run(String[] args)
+public class ArjunaNestingTest
+{
+    @Test
+    public void run() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	    assertFailure();
-	}
+        boolean doAbort = false;
+        boolean registerSubtran = false;
+        org.omg.CosTransactions.Current current = OTSManager.get_current();
+        DemoArjunaResource sr = new DemoArjunaResource();
 
-	boolean doAbort = false;
-	boolean registerSubtran = false;
-	org.omg.CosTransactions.Current current = OTSManager.get_current();
-	DemoArjunaResource sr = new DemoArjunaResource();
-
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		logInformation("Usage: ArjunaNestingTest [-abort] [-subtran] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-abort") == 0)
-		doAbort = true;
-	    if (args[i].compareTo("-subtran") == 0)
-		registerSubtran = true;
-	}
-
-	try
-	{
-	    current.begin();
-	    current.begin();
-	    current.begin();
-	}
-	catch (SystemException sysEx)
-	{
-	    System.err.println("Unexpected system exception:" +sysEx);
+        try
+        {
+            current.begin();
+            current.begin();
+            current.begin();
+        }
+        catch (SystemException sysEx)
+        {
+            fail("Unexpected system exception:" +sysEx);
             sysEx.printStackTrace(System.err);
-	    assertFailure();
-	}
-	catch (UserException se)
-	{
-	    System.err.println("Unexpected user exception:" +se);
+        }
+        catch (UserException se)
+        {
+            fail("Unexpected user exception:" +se);
             se.printStackTrace(System.err);
-	    assertFailure();
-	}
+        }
 
-	try
-	{
-	    sr.registerResource(registerSubtran);
-	}
-	catch (SystemException ex1)
-	{
-	    System.err.println("Unexpected system exception: "+ex1);
+        try
+        {
+            sr.registerResource(registerSubtran);
+        }
+        catch (SystemException ex1)
+        {
+            fail("Unexpected system exception: "+ex1);
             ex1.printStackTrace(System.err);
-	    assertFailure();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("call to registerSubtran failed: "+e);
+        }
+        catch (Exception e)
+        {
+            fail("call to registerSubtran failed: "+e);
             e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        }
 
-	try
-	{
-	    logInformation("committing first nested transaction");
-	    current.commit(true);
+        try
+        {
+            System.out.println("committing first nested transaction");
+            current.commit(true);
 
-	    logInformation("committing second nested transaction");
-	    current.commit(true);
+            System.out.println("committing second nested transaction");
+            current.commit(true);
 
-	    if (!doAbort)
-	    {
-		logInformation("committing top-level transaction");
-		current.commit(true);
-	    }
-	    else
-	    {
-		logInformation("aborting top-level transaction");
-		current.rollback();
-	    }
-	}
-	catch (Exception ex)
-	{
-	    System.err.println("Caught unexpected exception: "+ex);
+            if (!doAbort)
+            {
+                System.out.println("committing top-level transaction");
+                current.commit(true);
+            }
+            else
+            {
+                System.out.println("aborting top-level transaction");
+                current.rollback();
+            }
+        }
+        catch (Exception ex)
+        {
+            fail("Caught unexpected exception: "+ex);
             ex.printStackTrace(System.err);
-	    assertFailure();
-	}
+        }
 
-	logInformation("Test completed successfully.");
-        assertSuccess();
+        myOA.shutdownObject(sr);
 
-	myOA.shutdownObject(sr);
-
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
 
-	public static void main(String[] args)
-	{
-		ArjunaNestingTest test = new ArjunaNestingTest();
-		test.initialise(null, null, args, new LocalHarness());
-		test.runTest();
-	}
 }
 

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/README.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/README.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/README.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,34 +0,0 @@
-JBoss, Home of Professional Open Source
-Copyright 2006, Red Hat Middleware LLC, and individual contributors
-as indicated by the @author tags. 
-See the copyright.txt in the distribution for a full listing 
-of individual contributors.
-This copyrighted material is made available to anyone wishing to use,
-modify, copy, or redistribute it subject to the terms and conditions
-of the GNU Lesser General Public License, v. 2.1.
-This program is distributed in the hope that it will be useful, but WITHOUT A
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License,
-v.2.1 along with this distribution; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA  02110-1301, USA.
-
-
-(C) 2005-2006,
- at author JBoss Inc.
-This    example      demonstrates   the    difference    between    an
-ArjunaSubtranAwareResource   and   the  standard   OTS   version.   An
-ArjunaSubtranAwareResource  always  participates  within  a  two-phase
-commit protocol for  nested  transactions.  Propagation occurs  in the
-same way,  however,  i.e., if registered using  register_subtran_aware
-then the  resource    is  not propagated  to  the    parent;  if using
-register_resource then  it   will be   propagated. For   each   nested
-transaction, it will take part in the two-phase protocol.
-
-Not a remote test.
-
-expected_output1: from ArjunaNestingTest
-
-expected_output2: from ArjunaNestingTest -subtran
-

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output1.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output1.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output1.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,10 +0,0 @@
-Registered DemoArjunaResource
-committing first nested transaction
-DEMOARJUNARESOURCE : PREPARE_SUBTRANSACTION
-DEMOARJUNARESOURCE : COMMIT_SUBTRANSACTION
-committing second nested transaction
-DEMOARJUNARESOURCE : PREPARE_SUBTRANSACTION
-DEMOARJUNARESOURCE : COMMIT_SUBTRANSACTION
-committing top-level transaction
-DEMOARJUNARESOURCE : COMMIT_ONE_PHASE
-Test completed successfully.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output2.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output2.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/expected_output2.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,7 +0,0 @@
-Registered DemoArjunaResource
-committing first nested transaction
-DEMOARJUNARESOURCE : PREPARE_SUBTRANSACTION
-DEMOARJUNARESOURCE : COMMIT_SUBTRANSACTION
-committing second nested transaction
-committing top-level transaction
-Test completed successfully.

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,116 +31,81 @@
 
 package com.hp.mwtests.ts.jts.local.async;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.SubtransactionsUnavailable;
-import org.omg.CosTransactions.NotPrepared;
-import org.omg.CosTransactions.HeuristicRollback;
-import org.omg.CosTransactions.HeuristicCommit;
-import org.omg.CosTransactions.HeuristicMixed;
-import org.omg.CosTransactions.HeuristicHazard;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class AsyncTest extends Test
+public class AsyncTest
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	boolean errorp = false;
-	boolean errorc = false;
+        boolean errorp = false;
+        boolean errorc = false;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		logInformation("Usage: AsyncTest [-errorp] [-errorc] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-errorp") == 0)
-		errorp = true;
-	    if (args[i].compareTo("-errorc") == 0)
-		errorc = true;
-	}
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	ORB myORB = null;
-	RootOA myOA = null;
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+        try {
 
-	    Current current = OTSManager.get_current();
+            Current current = OTSManager.get_current();
 
-	    DemoResource.printThread = true;
+            DemoResource.printThread = true;
 
-	    current.begin();
+            current.begin();
 
-	    for (int j = 0; j < 100; j++)
-	    {
-		if ((j == 10) && (errorp || errorc))
-		{
-		    boolean heuristicPrepare = errorp;
-		    heuristic h = new heuristic(heuristicPrepare);
+            for (int j = 0; j < 100; j++)
+            {
+                if ((j == 10) && (errorp || errorc))
+                {
+                    boolean heuristicPrepare = errorp;
+                    heuristic h = new heuristic(heuristicPrepare);
 
-		    current.get_control().get_coordinator().register_resource(h.getReference());
+                    current.get_control().get_coordinator().register_resource(h.getReference());
 
-		    h = null;
-		}
+                    h = null;
+                }
 
-		DemoResource r = new DemoResource();
+                DemoResource r = new DemoResource();
 
-		r.registerResource();
+                r.registerResource();
 
-		r = null;
-	    }
+                r = null;
+            }
 
-	    logInformation("committing top-level transaction");
-	    current.commit(false);
+            System.out.println("committing top-level transaction");
+            current.commit(false);
 
-	    logInformation("Test completed.");
-            assertSuccess();
-	}
+            System.out.println("Test completed.");
+        }
         catch (org.omg.CORBA.TRANSACTION_ROLLEDBACK e)
-	{
-	    logInformation("Caught exception: "+e);
-	    if ((!errorp)&&(!errorc))
-	    {
-	    	assertFailure();
-	    }
-	    else
-	    {
-		assertSuccess();
-	    }
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Caught exception: "+e);
-            e.printStackTrace(System.err);
-            assertFailure();
-	}
+        {
+            System.out.println("Caught exception: "+e);
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+            assertTrue(errorp || errorc);
 
-}
+        }
 
+        myOA.destroy();
+        myORB.shutdown();
+        
+    }
+}
\ No newline at end of file

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/README.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/README.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/README.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,31 +0,0 @@
-JBoss, Home of Professional Open Source
-Copyright 2006, Red Hat Middleware LLC, and individual contributors
-as indicated by the @author tags. 
-See the copyright.txt in the distribution for a full listing 
-of individual contributors.
-This copyrighted material is made available to anyone wishing to use,
-modify, copy, or redistribute it subject to the terms and conditions
-of the GNU Lesser General Public License, v. 2.1.
-This program is distributed in the hope that it will be useful, but WITHOUT A
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License,
-v.2.1 along with this distribution; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA  02110-1301, USA.
-
-
-(C) 2005-2006,
- at author JBoss Inc.
-This test illustrates the use  of threads to  complete the prepare and
-commit protocol for a transaction.
-
-expected_output1: no threading optimisations.
-
-expected_output2: ASYNC_PREPARE enabled.
-
-expected_output3: ASYNC_COMMIT enabled as well.
-
-expected_output4: with an error during prepare. (-errorp option and ASYNC_PREPARE)
-
-expected_output5: with an error during commit. (-errorc option and ASYNC_PREPARE only)

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output1.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output1.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output1.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,402 +0,0 @@
-committing top-level transaction
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Test completed.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output2.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output2.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output2.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,402 +0,0 @@
-committing top-level transaction
-Thread[Thread-0,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-1,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-2,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-3,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-4,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-5,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-6,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-7,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-8,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-9,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-10,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-11,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-12,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-13,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-14,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-15,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-16,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-17,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-18,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-19,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-20,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-21,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-22,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-23,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-24,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-25,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-26,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-27,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-28,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-29,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-30,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-31,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-32,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-33,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-34,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-35,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-36,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-37,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-38,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-39,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-40,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-41,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-42,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-43,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-44,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-45,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-46,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-47,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-48,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-49,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-50,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-51,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-52,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-53,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-54,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-55,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-56,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-57,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-58,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-59,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-60,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-61,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-62,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-63,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-64,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-65,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-66,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-67,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-68,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-69,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-70,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-71,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-72,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-73,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-74,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-75,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-76,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-77,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-78,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-79,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-80,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-81,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-82,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-83,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-84,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-85,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-86,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-87,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-88,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-89,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-90,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-91,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-92,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-93,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-94,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-95,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-96,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-97,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-98,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-99,5,main]
-DEMORESOURCE : PREPARE
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Thread[main,5,main]
-DEMORESOURCE : COMMIT
-Test completed.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output3.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output3.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output3.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,402 +0,0 @@
-committing top-level transaction
-Thread[Thread-0,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-1,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-2,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-3,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-4,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-5,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-6,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-7,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-8,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-9,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-10,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-11,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-12,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-13,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-14,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-15,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-16,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-17,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-18,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-19,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-20,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-21,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-22,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-23,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-24,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-25,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-26,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-27,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-28,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-29,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-30,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-31,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-32,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-33,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-34,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-35,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-36,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-37,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-38,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-39,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-40,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-41,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-42,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-43,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-44,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-45,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-46,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-47,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-48,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-49,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-50,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-51,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-52,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-53,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-54,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-55,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-56,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-57,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-58,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-59,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-60,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-61,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-62,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-63,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-64,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-65,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-66,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-67,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-68,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-69,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-70,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-71,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-72,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-73,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-74,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-75,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-76,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-77,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-78,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-79,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-80,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-81,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-82,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-83,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-84,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-85,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-86,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-87,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-88,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-89,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-90,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-91,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-92,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-93,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-94,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-95,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-96,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-97,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-98,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-99,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Test completed.
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-100,5,main]
-DEMORESOURCE : COMMIT

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output4.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output4.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output4.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,406 +0,0 @@
-committing top-level transaction
-Thread[Thread-0,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-1,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-2,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-3,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-4,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-5,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-6,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-7,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-8,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-9,5,main]
-DEMORESOURCE : PREPARE
-HEURISTIC : PREPARE
-HEURISTIC : throwing HeuristicHazard
-Thread[Thread-11,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-12,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-13,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-14,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-15,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-16,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-17,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-18,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-19,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-20,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-21,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-22,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-23,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-24,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-25,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-26,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-27,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-28,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-29,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-30,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-31,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-32,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-33,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-34,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-35,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-36,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-37,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-38,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-39,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-40,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-41,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-42,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-43,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-44,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-45,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-46,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-47,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-48,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-49,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-50,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-51,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-52,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-53,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-54,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-55,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-56,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-57,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-58,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-59,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-60,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-61,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-62,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-63,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-64,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-65,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-66,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-67,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-68,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-69,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-70,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-71,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-72,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-73,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-74,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-75,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-76,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-77,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-78,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-79,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-80,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-81,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-82,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-83,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-84,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-85,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-86,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-87,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-88,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-89,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-90,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-91,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-92,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-93,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-94,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-95,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-96,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-97,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-98,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-99,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-100,5,main]
-DEMORESOURCE : PREPARE
-BasicAction.End() - prepare phase of action-id -7f0f69ac:62009532:38031ee7:0 failed. Action aborting.
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-Thread[main,5,main]
-DEMORESOURCE : ROLLBACK
-HEURISTIC : ROLLBACK
-Caught exception: org.omg.CORBA.TRANSACTION_ROLLEDBACK:   minor code: 50001  completed: No

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output5.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output5.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/expected_output5.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,406 +0,0 @@
-committing top-level transaction
-Thread[Thread-0,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-1,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-2,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-3,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-4,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-5,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-6,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-7,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-8,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-9,5,main]
-DEMORESOURCE : PREPARE
-HEURISTIC : PREPARE
-	HEURISTIC : VoteCommit
-Thread[Thread-11,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-12,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-13,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-14,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-15,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-16,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-17,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-18,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-19,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-20,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-21,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-22,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-23,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-24,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-25,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-26,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-27,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-28,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-29,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-30,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-31,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-32,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-33,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-34,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-35,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-36,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-37,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-38,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-39,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-40,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-41,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-42,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-43,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-44,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-45,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-46,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-47,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-48,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-49,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-50,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-51,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-52,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-53,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-54,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-55,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-56,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-57,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-58,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-59,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-60,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-61,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-62,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-63,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-64,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-65,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-66,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-67,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-68,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-69,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-70,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-71,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-72,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-73,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-74,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-75,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-76,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-77,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-78,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-79,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-80,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-81,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-82,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-83,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-84,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-85,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-86,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-87,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-88,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-89,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-90,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-91,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-92,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-93,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-94,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-95,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-96,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-97,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-98,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-99,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-100,5,main]
-DEMORESOURCE : PREPARE
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Test completed.
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-HEURISTIC : COMMIT
-HEURISTIC : throwing HeuristicRollback
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT
-Thread[Thread-101,5,main]
-DEMORESOURCE : COMMIT

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,115 +31,73 @@
 
 package com.hp.mwtests.ts.jts.local.hammer;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-import java.util.Random;
-
-public class AtomicObject1 extends Test
+public class AtomicObject1
 {
     private final static int START_VALUE_1 = 10;
     private final static int START_VALUE_2 = 101;
     private final static int EXPECTED_VALUE = START_VALUE_1 + START_VALUE_2;
 
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-            assertFailure();
-	}
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	AtomicWorker1.init();
+        AtomicWorker1.init();
 
-	AtomicWorker1.atomicObject_1 = new AtomicObject();
-	AtomicWorker1.atomicObject_2 = new AtomicObject();
+        AtomicWorker1.atomicObject_1 = new AtomicObject();
+        AtomicWorker1.atomicObject_2 = new AtomicObject();
 
-	System.out.println(AtomicWorker1.atomicObject_1.get_uid());
-	System.out.println(AtomicWorker1.atomicObject_2.get_uid());
+        System.out.println(AtomicWorker1.atomicObject_1.get_uid());
+        System.out.println(AtomicWorker1.atomicObject_2.get_uid());
 
-	if (!AtomicWorker1.atomicObject_1.set(START_VALUE_1))
-        {
-	    System.out.println("m set1 : failed");
-            assertFailure();
-        }
+        assertTrue( AtomicWorker1.atomicObject_1.set(START_VALUE_1) );
 
-	if (!AtomicWorker1.atomicObject_2.set(START_VALUE_2))
-        {
-	    System.out.println("m set2 : failed");
-            assertFailure();
-        }
+        assertTrue( AtomicWorker1.atomicObject_2.set(START_VALUE_2) );
 
-	AtomicWorker1.get12('m', 0);
-	AtomicWorker1.get21('m', 0);
+        AtomicWorker1.get12('m', 0);
+        AtomicWorker1.get21('m', 0);
 
-	for (int i = 0; i < 100; i++)
-	    AtomicWorker1.randomOperation('1', 0);
+        for (int i = 0; i < 100; i++)
+            AtomicWorker1.randomOperation('1', 0);
 
-	AtomicWorker1.get12('m', 0);
-	AtomicWorker1.get21('m', 0);
+        AtomicWorker1.get12('m', 0);
+        AtomicWorker1.get21('m', 0);
 
         try
         {
             int value1 = AtomicWorker1.get1();
             int value2 = AtomicWorker1.get2();
 
-            if ( ( value1 + value2 ) != EXPECTED_VALUE )
-            {
-                logInformation(value1+" "+value2+" incorrect values");
-                assertFailure();
-            }
-            else
-            {
-                logInformation(value1+" "+value2+" correct values");
-                assertSuccess();
-            }
+            assertEquals(EXPECTED_VALUE, (value1 + value2) );
+
         }
         catch (Exception e)
         {
             e.printStackTrace(System.err);
-            assertFailure();
+            fail();
         }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-	public static void main(String[] args)
-	{
-		AtomicObject1 test = new AtomicObject1();
-		test.initialise(null, null, args, new LocalHarness());
-		test.runTest();
-	}
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,121 +31,81 @@
 
 package com.hp.mwtests.ts.jts.local.hammer;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-import java.util.Random;
-
-public class AtomicObject2 extends Test
+public class AtomicObject2
 {
     private final static int START_VALUE_1 = 10;
     private final static int START_VALUE_2 = 101;
     private final static int EXPECTED_VALUE = START_VALUE_1 + START_VALUE_2;
 
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	AtomicWorker2.init();
+        AtomicWorker2.init();
 
-	AtomicWorker2.atomicObject_1 = new AtomicObject();
-	AtomicWorker2.atomicObject_2 = new AtomicObject();
+        AtomicWorker2.atomicObject_1 = new AtomicObject();
+        AtomicWorker2.atomicObject_2 = new AtomicObject();
 
-	System.out.println(AtomicWorker2.atomicObject_1.get_uid());
-	System.out.println(AtomicWorker2.atomicObject_2.get_uid());
+        System.out.println(AtomicWorker2.atomicObject_1.get_uid());
+        System.out.println(AtomicWorker2.atomicObject_2.get_uid());
 
-	if (!AtomicWorker2.atomicObject_1.set(START_VALUE_1))
+        assertTrue( AtomicWorker2.atomicObject_1.set(START_VALUE_1) );
+
+        assertTrue( AtomicWorker2.atomicObject_2.set(START_VALUE_2) );
+
+        ThreadObject2 thr1 = new ThreadObject2('1');
+        ThreadObject2 thr2 = new ThreadObject2('2');
+
+        thr1.start();
+        thr2.start();
+
+        try
         {
-	    System.out.println("m set1 : failed");
-            assertFailure();
+            thr1.join();
+            thr2.join();
         }
-
-	if (!AtomicWorker2.atomicObject_2.set(START_VALUE_2))
+        catch (InterruptedException e)
         {
-	    System.out.println("m set2 : failed");
-            assertFailure();
+            System.err.println(e);
         }
 
-	ThreadObject2 thr1 = new ThreadObject2('1');
-	ThreadObject2 thr2 = new ThreadObject2('2');
+        AtomicWorker2.get12('m', 0);
+        AtomicWorker2.get21('m', 0);
 
-	thr1.start();
-	thr2.start();
-
-	try
-	{
-	    thr1.join();
-	    thr2.join();
-	}
-	catch (InterruptedException e)
-	{
-	    System.err.println(e);
-	}
-
-	AtomicWorker2.get12('m', 0);
-	AtomicWorker2.get21('m', 0);
-
         try
         {
             int value1 = AtomicWorker2.get1();
             int value2 = AtomicWorker2.get2();
 
-            if ( ( value1 + value2 ) != EXPECTED_VALUE )
-            {
-                logInformation(value1+" "+value2+" incorrect values");
-                assertFailure();
-            }
-            else
-            {
-                logInformation(value1+" "+value2+" correct values");
-                assertSuccess();
-            }
+            assertEquals(EXPECTED_VALUE, (value1 + value2) );
         }
         catch (Exception e)
         {
             e.printStackTrace(System.err);
-            assertFailure();
+            fail();
         }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main(String[] args)
-    {
-	AtomicObject3 oa = new AtomicObject3();
-
-	oa.run(args);
-    }
-
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,125 +31,83 @@
 
 package com.hp.mwtests.ts.jts.local.hammer;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-import java.util.Random;
-
-public class AtomicObject3 extends Test
+public class AtomicObject3
 {
     private final static int START_VALUE_1 = 10;
     private final static int START_VALUE_2 = 101;
     private final static int EXPECTED_VALUE = START_VALUE_1 + START_VALUE_2;
 
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-            e.printStackTrace(System.err);
-            assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	AtomicWorker3.init();
 
-	AtomicWorker3.atomicObject_1 = new AtomicObject();
-	AtomicWorker3.atomicObject_2 = new AtomicObject();
+        AtomicWorker3.init();
 
-	System.out.println(AtomicWorker3.atomicObject_1.get_uid());
-	System.out.println(AtomicWorker3.atomicObject_2.get_uid());
+        AtomicWorker3.atomicObject_1 = new AtomicObject();
+        AtomicWorker3.atomicObject_2 = new AtomicObject();
 
-	if (!AtomicWorker3.atomicObject_1.set(START_VALUE_1))
-        {
-	    System.out.println("m set1 : failed");
-            assertFailure();
-        }
+        System.out.println(AtomicWorker3.atomicObject_1.get_uid());
+        System.out.println(AtomicWorker3.atomicObject_2.get_uid());
 
-	if (!AtomicWorker3.atomicObject_2.set(START_VALUE_2))
-        {
-	    System.out.println("m set2 : failed");
-            assertFailure();
-        }
+        assertTrue( AtomicWorker3.atomicObject_1.set(START_VALUE_1) );
 
-	Thread thr1 = new ThreadObject3b(1);
-	Thread thr2 = new ThreadObject3b(2);
+        assertTrue( AtomicWorker3.atomicObject_2.set(START_VALUE_2) );
 
-	thr1.start();
-	thr2.start();
+        Thread thr1 = new ThreadObject3b(1);
+        Thread thr2 = new ThreadObject3b(2);
 
-	try
-	{
-	    thr1.join();
-	    thr2.join();
-	}
-	catch (InterruptedException e)
-	{
-	    System.err.println(e);
-            assertFailure();
-	}
+        thr1.start();
+        thr2.start();
 
-	AtomicWorker3.get12(0, 0);
-	AtomicWorker3.get21(0, 0);
+        try
+        {
+            thr1.join();
+            thr2.join();
+        }
+        catch (InterruptedException e)
+        {
+            fail(e.toString());
+        }
 
+        AtomicWorker3.get12(0, 0);
+        AtomicWorker3.get21(0, 0);
+
         try
         {
             int value1 = AtomicWorker3.get1();
             int value2 = AtomicWorker3.get2();
 
-            if ( ( value1 + value2 ) != EXPECTED_VALUE )
-            {
-                logInformation(value1+" "+value2+" incorrect values");
-                assertFailure();
-            }
-            else
-            {
-                logInformation(value1+" "+value2+" correct values");
-                assertSuccess();
-            }
+            assertEquals(EXPECTED_VALUE, (value1 + value2) );
         }
         catch (Exception e)
         {
             e.printStackTrace(System.err);
-            assertFailure();
+            fail();
         }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main(String[] args)
-    {
-	AtomicObject3 oa = new AtomicObject3();
-
-	oa.run(args);
-    }
-
 }
 

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/README.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/README.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/README.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,22 +0,0 @@
-JBoss, Home of Professional Open Source
-Copyright 2006, Red Hat Middleware LLC, and individual contributors
-as indicated by the @author tags. 
-See the copyright.txt in the distribution for a full listing 
-of individual contributors.
-This copyrighted material is made available to anyone wishing to use,
-modify, copy, or redistribute it subject to the terms and conditions
-of the GNU Lesser General Public License, v. 2.1.
-This program is distributed in the hope that it will be useful, but WITHOUT A
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License,
-v.2.1 along with this distribution; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA  02110-1301, USA.
-
-
-(C) 2005-2006,
- at author JBoss Inc.
-The sum of the two integers should always be 111.
-
-Note: No servers are required, and no transaction manager is needed.

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,9 +31,7 @@
 
 package com.hp.mwtests.ts.jts.local.heuristics;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 import com.hp.mwtests.ts.jts.utils.ResourceTrace;
 
 import com.arjuna.orbportability.*;
@@ -41,182 +39,157 @@
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
 import com.arjuna.ats.jts.utils.Utility;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
-public class HeuristicTest extends Test
-{
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-    public void run(String[] args)
+public class HeuristicTest
+{
+    @Test
+    public void test() throws Exception
     {
-	boolean shouldCommit = true;
-	boolean heuristicPrepare = false;
+        boolean shouldCommit = true;
+        boolean heuristicPrepare = false;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-abort") == 0)
-		shouldCommit = false;
-	    if (args[i].compareTo("-prepare") == 0)
-		heuristicPrepare = true;
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: HeuristicTest [-abort] [-prepare]");
-		assertFailure();
-	    }
-	}
+        Coordinator coord = null;
 
-	Coordinator coord = null;
-
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
         heuristic hImpl = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    Current current = OTSManager.get_current();
-	    hImpl = new heuristic(heuristicPrepare);
-	    Resource heuristicObject = hImpl.getReference();
-	    AtomicResource aImpl = new AtomicResource(shouldCommit);
-	    Resource atomicObject = aImpl.getReference();
+            Current current = OTSManager.get_current();
+            hImpl = new heuristic(heuristicPrepare);
+            Resource heuristicObject = hImpl.getReference();
+            AtomicResource aImpl = new AtomicResource(shouldCommit);
+            Resource atomicObject = aImpl.getReference();
 
-	    System.out.println("beginning top-level transaction.");
+            System.out.println("beginning top-level transaction.");
 
-	    current.begin();
+            current.begin();
 
-	    Control myControl = current.get_control();
+            Control myControl = current.get_control();
 
-	    if (myControl == null)
-	    {
-		System.err.println("Error - myControl is nil");
-		assertFailure();
-	    }
+            assertNotNull( myControl );
 
-	    System.out.println("getting coordinator");
+            System.out.println("getting coordinator");
 
-	    coord = myControl.get_coordinator();
+            coord = myControl.get_coordinator();
 
-	    myControl = null;
+            myControl = null;
 
-	    System.out.println("registering resources.");
+            System.out.println("registering resources.");
 
-	    try
-	    {
-		coord.register_resource(heuristicObject);
-		coord.register_resource(atomicObject);
-	    }
-	    catch (Exception ex)
-	    {
-		System.out.println("Failed to register resources: "+ex);
-		ex.printStackTrace(System.err);
+            try
+            {
+                coord.register_resource(heuristicObject);
+                coord.register_resource(atomicObject);
+            }
+            catch (Exception ex)
+            {
+                fail("Failed to register resources: "+ex);
+                ex.printStackTrace(System.err);
+            }
 
-		assertFailure();
-	    }
+            System.out.println("committing top-level transaction.");
 
-	    System.out.println("committing top-level transaction.");
-
-	    current.commit(true);
-	}
-	catch (TRANSACTION_ROLLEDBACK  e1)
-	{
-	    System.out.println("\nTransaction RolledBack exception");
-	}
-	catch (HeuristicMixed e2)
-	{
-	    System.out.println("\nTransaction HeuristicMixed exception");
-	}
-	catch (HeuristicHazard e3)
-	{
-	    System.out.println("\nTransaction HeuristicHazard exception");
-	}
-	catch (Exception e4)
-	{
-	    System.out.println("Caught unexpected exception: "+e4);
+            current.commit(true);
+        }
+        catch (TRANSACTION_ROLLEDBACK  e1)
+        {
+            System.out.println("\nTransaction RolledBack exception");
+        }
+        catch (HeuristicMixed e2)
+        {
+            System.out.println("\nTransaction HeuristicMixed exception");
+        }
+        catch (HeuristicHazard e3)
+        {
+            System.out.println("\nTransaction HeuristicHazard exception");
+        }
+        catch (Exception e4)
+        {
+            fail("Caught unexpected exception: "+e4);
             e4.printStackTrace(System.err);
-            assertFailure();
-	}
+        }
 
-	System.out.println("Trying to determing final transaction outcome.");
+        System.out.println("Trying to determing final transaction outcome.");
 
 
-	org.omg.CosTransactions.Status status = Status.StatusUnknown;
+        org.omg.CosTransactions.Status status = Status.StatusUnknown;
 
 
-	try
-	{
-	    if (coord != null)
-	    {
-		status = coord.get_status();
+        try
+        {
+            if (coord != null)
+            {
+                status = coord.get_status();
 
-		coord = null;
-	    }
-	    else
+                coord = null;
+            }
+            else
             {
-		System.out.println("\nCould not determine action status.");
-                assertFailure();
+                fail("\nCould not determine action status.");
             }
-	}
-	catch (SystemException ex1)
-	{
-	    // assume invalid reference - tx may have been garbage collected
-	}
-	catch (Exception e5)
-	{
-	    System.out.println("Caught unexpected exception:" +e5);
+        }
+        catch (SystemException ex1)
+        {
+            // assume invalid reference - tx may have been garbage collected
+        }
+        catch (Exception e5)
+        {
+            fail("Caught unexpected exception:" +e5);
             e5.printStackTrace(System.err);
-            assertFailure();
-	}
+        }
 
-	System.out.println("\nFinal action status: "+Utility.stringStatus(status));
+        System.out.println("\nFinal action status: "+Utility.stringStatus(status));
 
-	System.out.println("Test completed successfully.");
+        System.out.println("Test completed successfully.");
 
         ResourceTrace trace = hImpl.getTrace();
 
-	if ( (!heuristicPrepare) && (shouldCommit) && (trace.getTrace() == ResourceTrace.ResourceTracePrepareCommitHeurisiticRollbackForget) )
-	{
-	    assertSuccess();
-	}
-	else
-	{
-	    if ( (!heuristicPrepare) && (!shouldCommit) && (trace.getTrace() == ResourceTrace.ResourceTracePrepareRollback) )
-	    {
-	    	assertSuccess();
-	    }
-	    else
-	    {
-	    	if ( (heuristicPrepare) && (shouldCommit) && (trace.getTrace() == ResourceTrace.ResourceTracePrepareHeuristicHazardForget) )
-	    	{
-	    	    assertSuccess();
-	    	}
-	    	else
-	    	{
-		    assertFailure();
-		}
-	    }
-	}
+        if ( (!heuristicPrepare) && (shouldCommit) && (trace.getTrace() == ResourceTrace.ResourceTracePrepareCommitHeurisiticRollbackForget) )
+        {
+            //assertSuccess();
+        }
+        else
+        {
+            if ( (!heuristicPrepare) && (!shouldCommit) && (trace.getTrace() == ResourceTrace.ResourceTracePrepareRollback) )
+            {
+                //assertSuccess();
+            }
+            else
+            {
+                if ( (heuristicPrepare) && (shouldCommit) && (trace.getTrace() == ResourceTrace.ResourceTracePrepareHeuristicHazardForget) )
+                {
+                    //assertSuccess();
+                }
+                else
+                {
+                    fail();
+                }
+            }
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
 }
 

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/README.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/README.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/README.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,26 +0,0 @@
-JBoss, Home of Professional Open Source
-Copyright 2006, Red Hat Middleware LLC, and individual contributors
-as indicated by the @author tags. 
-See the copyright.txt in the distribution for a full listing 
-of individual contributors.
-This copyrighted material is made available to anyone wishing to use,
-modify, copy, or redistribute it subject to the terms and conditions
-of the GNU Lesser General Public License, v. 2.1.
-This program is distributed in the hope that it will be useful, but WITHOUT A
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License,
-v.2.1 along with this distribution; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA  02110-1301, USA.
-
-
-(C) 2005-2006,
- at author JBoss Inc.
-This tests the heuristic capabilities of the OTS.
-
-expected_output1: from HeuristicTest
-
-expected_output2: from HeuristicTest -abort
-
-expected_output3: from HeuristicTest -prepare

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output1.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output1.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output1.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,18 +0,0 @@
-beginning top-level transaction.
-getting coordinator
-registering resources.
-committing top-level transaction.
-HEURISTIC : PREPARE
-	HEURISTIC : VoteCommit
-ATOMIC : PREPARE
-	ATOMIC : VoteCommit
-HEURISTIC : COMMIT
-HEURISTIC : throwing HeuristicRollback
-ATOMIC : ROLLBACK
-HEURISTIC : FORGET
-
-Transaction RolledBack exception
-Trying to determing final transaction outcome.
-
-Final action status: CosTransactions::StatusUnknown
-Test completed successfully.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output2.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output2.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output2.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,17 +0,0 @@
-beginning top-level transaction.
-getting coordinator
-registering resources.
-committing top-level transaction.
-HEURISTIC : PREPARE
-	HEURISTIC : VoteCommit
-ATOMIC : PREPARE
-	ATOMIC : VoteRollback
-BasicAction.End() - prepare phase of action-id -7f0f2f9a:80c98a2:36cee66e:0 failed. Action aborting.
-HEURISTIC : ROLLBACK
-ATOMIC : ROLLBACK
-
-Transaction RolledBack exception
-Trying to determing final transaction outcome.
-
-Final action status: CosTransactions::StatusUnknown
-Test completed successfully.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output3.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output3.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/expected_output3.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,16 +0,0 @@
-beginning top-level transaction.
-getting coordinator
-registering resources.
-committing top-level transaction.
-HEURISTIC : PREPARE
-HEURISTIC : throwing HeuristicHazard
-Prepare phase of action -7f0f2f9a:80c98a2:36cee684:0 received heuristic decision: PrepareOutcome.HEURISTIC_HAZARD
-BasicAction.End() - prepare phase of action-id -7f0f2f9a:80c98a2:36cee684:0 failed. Received heuristic: PrepareOutcome.HEURISTIC_HAZARD. Action aborting.
-ATOMIC : ROLLBACK
-HEURISTIC : FORGET
-
-Transaction HeuristicHazard exception
-Trying to determing final transaction outcome.
-
-Final action status: CosTransactions::StatusUnknown
-Test completed successfully.

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,166 +31,137 @@
 
 package com.hp.mwtests.ts.jts.local.nested;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 import com.hp.mwtests.ts.jts.utils.ResourceTrace;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
-import org.omg.CosTransactions.*;
-
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.SubtransactionsUnavailable;
-import org.omg.CosTransactions.NotPrepared;
-import org.omg.CosTransactions.HeuristicRollback;
-import org.omg.CosTransactions.HeuristicCommit;
-import org.omg.CosTransactions.HeuristicMixed;
-import org.omg.CosTransactions.HeuristicHazard;
 
-public class NestedTester extends Test
-{
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-    public void run(String[] args)
+public class NestedTester
+{
+    @Test
+    public void test()
     {
-	boolean registerSubtran = false;
-	boolean doAbort = false;
+        boolean registerSubtran = false;
+        boolean doAbort = false;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: NestedTester [-subtran] [-abort] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-subtran") == 0)
-		registerSubtran = true;
-	    if (args[i].compareTo("-abort") == 0)
-		doAbort = true;
-	}
+        DemoResource r = null;
+        DemoSubTranResource sr = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	DemoResource r = null;
-	DemoSubTranResource sr = null;
-	ORB myORB = null;
-	RootOA myOA = null;
+        try
+        {
+            myORB = ORB.getInstance("test");
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    myOA = OA.getRootOA(myORB);
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            org.omg.CosTransactions.Current current = OTSManager.get_current();
 
-	    org.omg.CosTransactions.Current current = OTSManager.get_current();
+            r = new DemoResource();
+            sr = new DemoSubTranResource();
 
-	    r = new DemoResource();
-	    sr = new DemoSubTranResource();
+            current.begin();
+            current.begin();
+            current.begin();
 
-	    current.begin();
-	    current.begin();
-	    current.begin();
+            sr.registerResource(registerSubtran);
+            r.registerResource();
 
-	    sr.registerResource(registerSubtran);
-	    r.registerResource();
+            System.out.println("committing first nested transaction");
+            current.commit(true);
 
-	    System.out.println("committing first nested transaction");
-	    current.commit(true);
+            System.out.println("committing second nested transaction");
+            current.commit(true);
 
-	    System.out.println("committing second nested transaction");
-	    current.commit(true);
+            if (!doAbort)
+            {
+                System.out.println("committing top-level transaction");
+                current.commit(true);
+            }
+            else
+            {
+                System.out.println("aborting top-level transaction");
+                current.rollback();
+            }
 
-	    if (!doAbort)
-	    {
-		System.out.println("committing top-level transaction");
-		current.commit(true);
-	    }
-	    else
-	    {
-		System.out.println("aborting top-level transaction");
-		current.rollback();
-	    }
+            System.out.println("Test completed successfully.");
 
-	    System.out.println("Test completed successfully.");
-
             if ( (!doAbort) && (!registerSubtran) &&
-	         (sr.getNumberOfSubtransactionsRolledBack() == 0) &&
-	         (sr.getNumberOfSubtransactionsCommitted() == 1) &&
-	         (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTracePrepareCommit) &&
-	         (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTracePrepareCommit) )
-	    {
-	    	assertSuccess();
-	    }
-	    else
-	    {
-	    	if ( (doAbort) && (!registerSubtran) &&
-	             (sr.getNumberOfSubtransactionsRolledBack()==0) &&
-	             (sr.getNumberOfSubtransactionsCommitted()==1) &&
-	             (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceRollback) &&
-	             (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceRollback) )
-		{
-		    assertSuccess();
-		}
-		else
-		{
-	    	    if ( (!doAbort) && (registerSubtran) &&
-	                 (sr.getNumberOfSubtransactionsRolledBack()==0) &&
-	                 (sr.getNumberOfSubtransactionsCommitted()==1) &&
-	                 (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceNone) &&
-	                 (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceCommitOnePhase) )
-	            {
-	            	assertSuccess();
-	            }
-	            else
-	            {
-			if ( (doAbort) && (registerSubtran) &&
-	                     (sr.getNumberOfSubtransactionsRolledBack()==0) &&
-	                     (sr.getNumberOfSubtransactionsCommitted()==1) &&
-	                     (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceNone) &&
-	                     (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceRollback) )
-			{
-			    assertSuccess();
-			}
-			else
-			    assertFailure();
-		    }
-		}
+                    (sr.getNumberOfSubtransactionsRolledBack() == 0) &&
+                    (sr.getNumberOfSubtransactionsCommitted() == 1) &&
+                    (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTracePrepareCommit) &&
+                    (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTracePrepareCommit) )
+            {
+                //assertSuccess();
             }
-	}
-	catch (UserException e)
-	{
-	    System.err.println("Caught UserException: "+e);
-	    e.printStackTrace(System.err);
-            assertFailure();
-	}
-	catch (SystemException e)
-	{
-	    System.err.println("Caught SystemException: "+e);
-	    e.printStackTrace(System.err);
-            assertFailure();
-	}
+            else
+            {
+                if ( (doAbort) && (!registerSubtran) &&
+                        (sr.getNumberOfSubtransactionsRolledBack()==0) &&
+                        (sr.getNumberOfSubtransactionsCommitted()==1) &&
+                        (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceRollback) &&
+                        (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceRollback) )
+                {
+                    //assertSuccess();
+                }
+                else
+                {
+                    if ( (!doAbort) && (registerSubtran) &&
+                            (sr.getNumberOfSubtransactionsRolledBack()==0) &&
+                            (sr.getNumberOfSubtransactionsCommitted()==1) &&
+                            (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceNone) &&
+                            (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceCommitOnePhase) )
+                    {
+                        //assertSuccess();
+                    }
+                    else
+                    {
+                        if ( (doAbort) && (registerSubtran) &&
+                                (sr.getNumberOfSubtransactionsRolledBack()==0) &&
+                                (sr.getNumberOfSubtransactionsCommitted()==1) &&
+                                (sr.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceNone) &&
+                                (r.getResourceTrace().getTrace() == ResourceTrace.ResourceTraceRollback) )
+                        {
+                            //assertSuccess();
+                        }
+                        else
+                            fail();
+                    }
+                }
+            }
+        }
+        catch (UserException e)
+        {
+            fail("Caught UserException: "+e);
+            e.printStackTrace(System.err);
+        }
+        catch (SystemException e)
+        {
+            fail("Caught SystemException: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	myOA.shutdownObject(r);
-	myOA.shutdownObject(sr);
+        myOA.shutdownObject(r);
+        myOA.shutdownObject(sr);
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
 }
 

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output1.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output1.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output1.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,11 +0,0 @@
-Registered DemoSubTranResource
-Registered DemoResource
-committing first nested transaction
-DEMOSUBTRANRESOURCE : COMMIT_SUBTRANSACTION
-committing second nested transaction
-committing top-level transaction
-DEMOSUBTRANRESOURCE : PREPARE
-DEMORESOURCE : PREPARE
-DEMOSUBTRANRESOURCE : COMMIT
-DEMORESOURCE : COMMIT
-Test completed successfully.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output2.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output2.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output2.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,8 +0,0 @@
-Registered DemoSubTranResource
-Registered DemoResource
-committing first nested transaction
-DEMOSUBTRANRESOURCE : COMMIT_SUBTRANSACTION
-committing second nested transaction
-committing top-level transaction
-DEMORESOURCE : COMMIT_ONE_PHASE
-Test completed successfully.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output3.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output3.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/expected_output3.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,9 +0,0 @@
-Registered DemoSubTranResource
-Registered DemoResource
-committing first nested transaction
-DEMOSUBTRANRESOURCE : COMMIT_SUBTRANSACTION
-committing second nested transaction
-aborting top-level transaction
-DEMOSUBTRANRESOURCE : ROLLBACK
-DEMORESOURCE : ROLLBACK
-Test completed successfully.

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -30,8 +30,6 @@
  */
 package com.hp.mwtests.ts.jts.local.orbsetup;
 
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.orbportability.internal.utils.PostInitLoader;
 import com.arjuna.orbportability.ORB;
@@ -39,30 +37,26 @@
 import com.arjuna.orbportability.OA;
 import com.arjuna.ats.arjuna.exceptions.FatalError;
 
-public class ORBSetupTest extends Test
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ORBSetupTest
 {
     private final static String ORB_NAME = "testorb";
 
-    public void run(String[] args)
+    @Test
+    public void test()
     {
         boolean staticSet = false;
         ORB myORB = null;
-	RootOA myOA = null;
+        RootOA myOA = null;
 
-        for (int count=0;count<args.length;count++)
-        {
-            if ( args[count].equalsIgnoreCase("-setstatically") )
-            {
-                staticSet = true;
-            }
-        }
-
         System.setProperty( PostInitLoader.generateORBPropertyName("com.arjuna.orbportability.orb", ORB_NAME), "com.arjuna.ats.jts.utils.ORBSetup");
 
-	try
-	{
-	    myORB = ORB.getInstance(ORB_NAME);
-	    myOA = OA.getRootOA(myORB);
+        try
+        {
+            myORB = ORB.getInstance(ORB_NAME);
+            myOA = OA.getRootOA(myORB);
 
             if (staticSet)
             {
@@ -71,54 +65,32 @@
 
             try
             {
-                myORB.initORB(args, null);
+                myORB.initORB(new String[] {}, null);
                 myOA.initOA();
 
-                if (ORBManager.getORB() != myORB)
-                {
-                    logInformation("The ORB reference returned by ORBManager was not the ORB previously initialised");
-                    assertFailure();
-                }
-                else
-                {
-                    logInformation("The ORB reference returned by ORBManager is the previously initialised ORB");
-                    assertSuccess();
-                }
+                assertEquals(myORB, ORBManager.getORB());
             }
             catch (FatalError e)
             {
                 if (staticSet)
                 {
-                    logInformation("FatalError thrown as expected");
-                    assertSuccess();
+                    System.out.println("FatalError thrown as expected");
                 }
                 else
                 {
-                    logInformation("Error: "+e);
+                    fail("Error: "+e);
                     e.printStackTrace(System.err);
-                    assertFailure();
                 }
             }
 
             myORB.destroy();
             myOA.destroy();
-	}
-	catch (Throwable e)
-	{
-	    logInformation("Error: "+e);
+        }
+        catch (Throwable e)
+        {
+            fail("Error: "+e);
             e.printStackTrace(System.err);
-
-	    assertFailure();
-	}
-
+        }
     }
-
-    public static void main(String[] args)
-    {
-        ORBSetupTest test = new ORBSetupTest();
-
-        test.initialise( null, null, args, new LocalHarness());
-        test.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/Performance.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/Performance.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/Performance.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,91 +31,78 @@
 
 package com.hp.mwtests.ts.jts.local.synchronizations;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class Performance
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
-	long stime = System.currentTimeMillis();
-	demosync sync = null;
+        ORB myORB = null;
+        RootOA myOA = null;
+        long stime = System.currentTimeMillis();
+        demosync sync = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
+        try
+        {
+            myORB = ORB.getInstance("test");
 
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);	
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    org.omg.CosTransactions.Current current = OTSManager.get_current();
-	    sync = new demosync(false);
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    for (int i = 0; i < 1000; i++)
-	    {
-		current.begin();
+            org.omg.CosTransactions.Current current = OTSManager.get_current();
+            sync = new demosync(false);
 
-		Control myControl = current.get_control();
-		Coordinator coord = myControl.get_coordinator();
+            for (int i = 0; i < 1000; i++)
+            {
+                current.begin();
 
-		coord.register_synchronization(sync.getReference());
+                Control myControl = current.get_control();
+                Coordinator coord = myControl.get_coordinator();
 
-		current.commit(true);
-	    }
-	}
-	catch (UserException e1)
-	{
-	    System.out.println("Caught UserException: "+e1);
-	    e1.printStackTrace();
+                coord.register_synchronization(sync.getReference());
 
-	    System.exit(0);
-	}	
-	catch (SystemException e2)
-	{
-	    System.out.println("Caught SystemException: " +e2);
-	    e2.printStackTrace();
-	    
-	    System.exit(0);
-	}
+                current.commit(true);
+            }
+        }
+        catch (UserException e1)
+        {
+            fail("Caught UserException: "+e1);
+        }
+        catch (SystemException e2)
+        {
+            fail("Caught SystemException: " +e2);
+            e2.printStackTrace();
+        }
 
-	long ftime = System.currentTimeMillis();
-	double elapsedTime = (ftime - stime)/1000.0;
-	double tps = 1000.0/elapsedTime;
-	
-	System.err.println("TPS: "+tps);
+        long ftime = System.currentTimeMillis();
+        double elapsedTime = (ftime - stime)/1000.0;
+        double tps = 1000.0/elapsedTime;
 
-	myOA.shutdownObject(sync);
+        System.err.println("TPS: "+tps);
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+        myOA.shutdownObject(sync);
 
-}
-
+        myOA.destroy();
+        myORB.shutdown();
+    }
+}
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/SynchTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/SynchTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/SynchTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,111 +31,100 @@
 
 package com.hp.mwtests.ts.jts.local.synchronizations;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class SynchTest
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	org.omg.CosTransactions.Status status = Status.StatusUnknown;
-	tranobject_i localObject = null;
-	demosync sync = null;
-	ORB myORB = null;
-	RootOA myOA = null;
+        org.omg.CosTransactions.Status status = Status.StatusUnknown;
+        tranobject_i localObject = null;
+        demosync sync = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
+        try
+        {
+            myORB = ORB.getInstance("test");
 
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);	
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    Control myControl = null;
-	    org.omg.CosTransactions.Current current = OTSManager.get_current();
-	    Coordinator coord = null;
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    sync = new demosync();
-	    localObject = new tranobject_i();
-	    
-	    current.begin();
+            Control myControl = null;
+            org.omg.CosTransactions.Current current = OTSManager.get_current();
+            Coordinator coord = null;
 
-	    myControl = current.get_control();
+            sync = new demosync();
+            localObject = new tranobject_i();
 
-	    coord = myControl.get_coordinator();
+            current.begin();
 
-	    coord.register_resource(localObject.getReference());
-	    coord.register_synchronization(sync.getReference());
+            myControl = current.get_control();
 
-	    try
-	    {
-		current.commit(true);
-	    }
-	    catch (TRANSACTION_ROLLEDBACK  e1)
-	    {
-		System.out.println("Transaction rolledback");
-	    }
+            coord = myControl.get_coordinator();
 
-	    try
-	    {
-		status = coord.get_status();
-	    }
-	    catch (SystemException ex)
-	    {
-		// assume reference no longer valid!
+            coord.register_resource(localObject.getReference());
+            coord.register_synchronization(sync.getReference());
 
-		status = Status.StatusUnknown;
-	    }
-	}
-	catch (UserException e1)
-	{
-	    System.out.println("Caught UserException: "+e1);
-	    e1.printStackTrace();
+            try
+            {
+                current.commit(true);
+            }
+            catch (TRANSACTION_ROLLEDBACK  e1)
+            {
+                System.out.println("Transaction rolledback");
+            }
 
-	    System.exit(0);
-	}	
-	catch (SystemException e2)
-	{
-	    System.out.println("Caught SystemException: " +e2);
-	    e2.printStackTrace();
-	    
-	    System.exit(0);
-	}
-	    
-	System.out.print("Final action status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(status));
-	System.out.println("\nTest completed successfully.");
+            try
+            {
+                status = coord.get_status();
+            }
+            catch (SystemException ex)
+            {
+                // assume reference no longer valid!
 
-	myOA.shutdownObject(sync);
-	myOA.shutdownObject(localObject);
+                status = Status.StatusUnknown;
+            }
+        }
+        catch (UserException e1)
+        {
+            fail("Caught UserException: "+e1);
+            e1.printStackTrace();
+        }
+        catch (SystemException e2)
+        {
+            fail("Caught SystemException: " +e2);
+            e2.printStackTrace();
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+        System.out.print("Final action status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(status));
+        System.out.println("\nTest completed successfully.");
 
-}
+        myOA.shutdownObject(sync);
+        myOA.shutdownObject(localObject);
 
+        myOA.destroy();
+        myORB.shutdown();
+    }
+}
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/DefaultTimeout.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,8 +31,6 @@
 
 package com.hp.mwtests.ts.jts.local.timeout;
 
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.jts.common.jtsPropertyManager;
@@ -42,15 +40,13 @@
 
 import com.arjuna.ats.internal.jts.ORBManager;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
-
 public class DefaultTimeout
 {
-    
-public static void main (String[] args)
+    @Test
+    public void test()
     {
 	ORB myORB = null;
 	RootOA myOA = null;
@@ -60,7 +56,7 @@
 	    myORB = ORB.getInstance("test");
 	    myOA = OA.getRootOA(myORB);
 	    
-	    myORB.initORB(args, null);
+	    myORB.initORB(new String[] {}, null);
 	    myOA.initOA();
 
 	    ORBManager.setORB(myORB);

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/README.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/README.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/README.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,29 +0,0 @@
-JBoss, Home of Professional Open Source
-Copyright 2006, Red Hat Middleware LLC, and individual contributors
-as indicated by the @author tags. 
-See the copyright.txt in the distribution for a full listing 
-of individual contributors.
-This copyrighted material is made available to anyone wishing to use,
-modify, copy, or redistribute it subject to the terms and conditions
-of the GNU Lesser General Public License, v. 2.1.
-This program is distributed in the hope that it will be useful, but WITHOUT A
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License,
-v.2.1 along with this distribution; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA  02110-1301, USA.
-
-
-(C) 2005-2006,
- at author JBoss Inc.
-These tests  check that transactions   which have timeouts  associated
-with them when they are created are  rolled back if the timeout period
-elapses. They also  check that the default  timeout (the meaning of  0
-for the transaction timeout) is configurable.
-
-When running TerminationTest,  set TX_REAPER_TIMEOUT property variable
-to 1000.
-
-When running DefaultTimeout, set the DEFAULT_TIMEOUT property variable
-to 2, and do not unset TX_REAPER_TIMEOUT.

Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/expected_output1.txt
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/expected_output1.txt	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/timeout/expected_output1.txt	2009-07-08 10:21:16 UTC (rev 27731)
@@ -1,9 +0,0 @@
-Thread Thread[main,5,main] starting transaction.
-Abort of action id -7f0f69ac:67e89:3833e3f3:0 invoked while multiple threads active within it.
-
-WARNING CheckedAction::check - atomic action -7f0f69ac:67e89:3833e3f3:0 aborting with 1 threads active!
-
-Thread Thread[main,5,main] committing transaction.
-Caught exception: org.omg.CORBA.INVALID_TRANSACTION:   minor code: 0  completed: No
-Timeout went off.
-Test completed successfully.

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest1.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest1.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,187 +31,167 @@
 
 package com.hp.mwtests.ts.jts.local.transactions;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.jts.common.Environment;
 import com.arjuna.ats.jts.OTSManager;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.ORBManager;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
 import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class TransactionTest1
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
-	
-	TransactionFactory theFactory = OTSManager.get_factory();
-	Control topLevelControl = null;
-	Control nestedControl = null;
-	Terminator terminator = null;
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	/*
-	 * First with current.
-	 */
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	try
-	{
-	    org.omg.CosTransactions.Current current = OTSManager.get_current();
 
-	    current.begin();
+        TransactionFactory theFactory = OTSManager.get_factory();
+        Control topLevelControl = null;
+        Control nestedControl = null;
+        Terminator terminator = null;
 
-	    topLevelControl = current.get_control();
+        /*
+       * First with current.
+       */
 
-	    current.begin();
+        try
+        {
+            org.omg.CosTransactions.Current current = OTSManager.get_current();
 
-	    nestedControl = current.get_control();
+            current.begin();
 
-	    /*
-	     * Try to commit top-level action without terminating nested
-	     * action.
-	     */
-    
-	    terminator = topLevelControl.get_terminator();
+            topLevelControl = current.get_control();
 
-	    System.out.println("\nAttempting to terminate out of sequence 'current'. Should fail!");
+            current.begin();
 
-	    try
-	    {
-		terminator.commit(true);
-	    }
-	    catch (TRANSACTION_ROLLEDBACK  e)
-	    {
-		System.err.println("Commit failed! "+e);
-	    }
+            nestedControl = current.get_control();
 
-	    System.out.println("\nNow attempting to terminate 'current' hierarchy. Should fail!");
+            /*
+            * Try to commit top-level action without terminating nested
+            * action.
+            */
 
-	    /*
-	     * This should fail since Arjuna will already have aborted the top-level
-	     * action and all of its children.
-	     */
+            terminator = topLevelControl.get_terminator();
 
-	    try
-	    {
-		current.commit(true);
-	    }
-	    catch (INVALID_TRANSACTION  e1)
-	    {
-		System.err.println("Nested commit failed! "+e1);
-	    }
-	    catch (Exception e2)
-	    {
-		System.err.println("Nested commit threw unexpected exception: "+e2);
-		System.exit(0);
-	    }
+            System.out.println("\nAttempting to terminate out of sequence 'current'. Should fail!");
 
-	    try
-	    {
-		current.commit(true);
-	    }
-	    catch (TRANSACTION_ROLLEDBACK  e1)
-	    {
-		System.err.println("Top-level commit failed! "+e1);
-	    }
-	    catch (INVALID_TRANSACTION  e2)
-	    {
-		System.err.println("Top-level commit failed! "+e2);
-	    }
-	    catch (Exception e3)
-	    {
-		System.err.println("Top-level commit threw unexpected exception: "+e3);
-		System.exit(0);
-	    }
-	    
-	    /*
-	     * Now with the factory.
-	     */
+            try
+            {
+                terminator.commit(true);
+            }
+            catch (TRANSACTION_ROLLEDBACK  e)
+            {
+                System.err.println("Commit failed! "+e);
+            }
 
-	    System.out.println("\nNow creating new top-level action.");
-    
-	    topLevelControl = theFactory.create(0);
-	    nestedControl = topLevelControl.get_coordinator().create_subtransaction();
+            System.out.println("\nNow attempting to terminate 'current' hierarchy. Should fail!");
 
-	    terminator = topLevelControl.get_terminator();
+            /*
+            * This should fail since Arjuna will already have aborted the top-level
+            * action and all of its children.
+            */
 
-	    System.out.println("\nAttempting to terminate out of sequence 'factory' action. Should fail!");
-    
-	    try
-	    {
-		terminator.commit(true);
-	    }
-    	    catch (TRANSACTION_ROLLEDBACK  e1)
-	    {
-		System.err.println("Commit failed! "+e1);
-	    }
-    	    catch (INVALID_TRANSACTION  e2)
-	    {
-		System.err.println("Commit failed! "+e2);
-	    }	    
+            try
+            {
+                current.commit(true);
+            }
+            catch (INVALID_TRANSACTION  e1)
+            {
+                System.err.println("Nested commit failed! "+e1);
+            }
+            catch (Exception e2)
+            {
+                fail("Nested commit threw unexpected exception: "+e2);
+            }
 
-	    terminator = nestedControl.get_terminator();
+            try
+            {
+                current.commit(true);
+            }
+            catch (TRANSACTION_ROLLEDBACK  e1)
+            {
+                System.err.println("Top-level commit failed! "+e1);
+            }
+            catch (INVALID_TRANSACTION  e2)
+            {
+                System.err.println("Top-level commit failed! "+e2);
+            }
+            catch (Exception e3)
+            {
+                fail("Top-level commit threw unexpected exception: "+e3);
+            }
 
-	    System.out.println("\nNow attempting to terminate 'factory' nested action. Should fail!");
+            /*
+            * Now with the factory.
+            */
 
-	    try
-	    {
-		terminator.commit(true);
-	    }
-    	    catch (TRANSACTION_ROLLEDBACK  e1)
-	    {
-		System.err.println("Commit failed! "+e1);
-	    }
-	    catch (INVALID_TRANSACTION  e2)
-	    {
-		System.err.println("Commit failed! "+e2);
-	    }
+            System.out.println("\nNow creating new top-level action.");
 
-	    System.out.println("Test completed successfully.");
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Test failed - received unexpected exception "+e);
-	    System.exit(1);
-	}
+            topLevelControl = theFactory.create(0);
+            nestedControl = topLevelControl.get_coordinator().create_subtransaction();
 
-	myOA.destroy();
-	myORB.shutdown();
+            terminator = topLevelControl.get_terminator();
+
+            System.out.println("\nAttempting to terminate out of sequence 'factory' action. Should fail!");
+
+            try
+            {
+                terminator.commit(true);
+            }
+            catch (TRANSACTION_ROLLEDBACK  e1)
+            {
+                System.err.println("Commit failed! "+e1);
+            }
+            catch (INVALID_TRANSACTION  e2)
+            {
+                System.err.println("Commit failed! "+e2);
+            }
+
+            terminator = nestedControl.get_terminator();
+
+            System.out.println("\nNow attempting to terminate 'factory' nested action. Should fail!");
+
+            try
+            {
+                terminator.commit(true);
+            }
+            catch (TRANSACTION_ROLLEDBACK  e1)
+            {
+                System.err.println("Commit failed! "+e1);
+            }
+            catch (INVALID_TRANSACTION  e2)
+            {
+                System.err.println("Commit failed! "+e2);
+            }
+
+            System.out.println("Test completed successfully.");
+        }
+        catch (Exception e)
+        {
+            fail("Test failed - received unexpected exception "+e);
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
     }
- 
+
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,124 +31,102 @@
 
 package com.hp.mwtests.ts.jts.local.transactions;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.jts.common.Environment;
 import com.arjuna.ats.jts.OTSManager;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.ORBManager;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
-
 public class TransactionTest2
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	int count = 0;
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	System.out.println("Testing memory allocation.");
-	System.out.println("Creating as many transactions as possible.\n");
-	    
-	try
-	{
-	    for (;;)
-	    {
-		OTSManager.get_current().begin();
-		count++;
-	    }
-	}
-	catch (Exception e)
-	{
-	    System.err.println("begin caught: "+e);
 
-	    System.gc();
-	}
-	catch (Error e)
-	{
-	    System.err.println("begin caught: "+e);
-	    e.printStackTrace();
+        int count = 0;
 
-	    System.gc();
-	}	
+        System.out.println("Testing memory allocation.");
+        System.out.println("Creating as many transactions as possible.\n");
 
-	System.out.println("\nbegan: "+count);
+        try
+        {
+            for (;;)
+            {
+                OTSManager.get_current().begin();
+                count++;
+            }
+        }
+        catch (Exception e)
+        {
+            System.err.println("begin caught: "+e);
 
-	try
-	{
-	    int created = count;
+            System.gc();
+        }
+        catch (Error e)
+        {
+            System.err.println("begin caught: "+e);
+            e.printStackTrace();
 
-	    System.out.println("\nNow rolling back transactions.");
-	    
-	    for (int i = 0; i < created; i++)
-	    {
-		try
-		{
-		    System.out.println(""+count);
-		    OTSManager.get_current().rollback();
-		    count--;
-		}
-		catch (OutOfMemoryError em)
-		{
-		    em.printStackTrace();
-		    
-		    System.gc();
-		}
-	    }
-	}
-	catch (Exception e)
-	{
-	    System.err.println("rollback caught: "+e);
+            System.gc();
+        }
 
-	    System.gc();
-	}
-	catch (Error e)
-	{
-	    System.err.println("rollback caught: "+e);
-	    e.printStackTrace();
+        System.out.println("\nbegan: "+count);
 
-	    System.gc();
-	}
+        try
+        {
+            int created = count;
 
-	System.out.println("\nStill to rollback: "+count);
+            System.out.println("\nNow rolling back transactions.");
 
-	myOA.destroy();
-	myORB.shutdown();
+            for (int i = 0; i < created; i++)
+            {
+                try
+                {
+                    System.out.println(""+count);
+                    OTSManager.get_current().rollback();
+                    count--;
+                }
+                catch (OutOfMemoryError em)
+                {
+                    em.printStackTrace();
+
+                    System.gc();
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            System.err.println("rollback caught: "+e);
+
+            System.gc();
+        }
+        catch (Error e)
+        {
+            System.err.println("rollback caught: "+e);
+            e.printStackTrace();
+
+            System.gc();
+        }
+
+        System.out.println("\nStill to rollback: "+count);
+
+        myOA.destroy();
+        myORB.shutdown();
     }
- 
+
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest3.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest3.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,79 +31,55 @@
 
 package com.hp.mwtests.ts.jts.local.transactions;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.jts.common.Environment;
 import com.arjuna.ats.jts.OTSManager;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.ORBManager;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class TransactionTest3
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	try
-	{
-	    OTSManager.get_current().begin();
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	    Control cont = OTSManager.get_current().get_control();
-	    
-	    OTSManager.get_current().commit(true);
-	    
-	    OTSManager.get_current().resume(cont);
+        try
+        {
+            OTSManager.get_current().begin();
 
-	    System.out.println("\nPassed.");
-	}
-	catch (Throwable e)
-	{
-	    System.err.println("caught: "+e);
+            Control cont = OTSManager.get_current().get_control();
 
-	    e.printStackTrace();
+            OTSManager.get_current().commit(true);
 
-	    System.out.println("\nFailed.");
-	}	
+            OTSManager.get_current().resume(cont);
 
-	myOA.destroy();
-	myORB.shutdown();
+            System.out.println("\nPassed.");
+        }
+        catch (Throwable e)
+        {
+            fail("caught: "+e);
+
+            e.printStackTrace();
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
     }
- 
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest4.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest4.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest4.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,80 +31,57 @@
 
 package com.hp.mwtests.ts.jts.local.transactions;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.jts.common.Environment;
 import com.arjuna.ats.jts.OTSManager;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.ORBManager;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class TransactionTest4
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	try
-	{
-	    OTSManager.get_current().begin();
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	    Control cont = OTSManager.get_current().get_control();
-	    
-	    OTSManager.get_current().commit(true);
-	    
-	    OTSManager.get_current().resume(cont);
+        try
+        {
+            OTSManager.get_current().begin();
 
-	    cont = OTSManager.get_current().suspend();
-	    
-	    System.out.println("\nPassed.");
-	}
-	catch (Throwable e)
-	{
-	    System.err.println("caught: "+e);
+            Control cont = OTSManager.get_current().get_control();
 
-	    e.printStackTrace();
+            OTSManager.get_current().commit(true);
 
-	    System.out.println("\nFailed.");
-	}	
+            OTSManager.get_current().resume(cont);
 
-	myOA.destroy();
-	myORB.shutdown();
+            cont = OTSManager.get_current().suspend();
+
+            System.out.println("\nPassed.");
+        }
+        catch (Throwable e)
+        {
+            fail("caught: "+e);
+
+            e.printStackTrace();
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
     }
- 
+
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest5.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest5.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/transactions/TransactionTest5.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,84 +31,67 @@
 
 package com.hp.mwtests.ts.jts.local.transactions;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.jts.common.Environment;
 import com.arjuna.ats.jts.OTSManager;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.ORBManager;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class TransactionTest5
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	try
-	{
-	    OTSManager.get_current().begin();
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
+        }
+        catch (Exception e)
+        {
+            System.err.println("Initialisation failed: "+e);
+        }
 
-	    Control cont = OTSManager.get_current().get_control();
-	    
-	    OTSManager.get_current().commit(true);
-	    
-	    OTSManager.get_current().resume(cont);
+        try
+        {
+            OTSManager.get_current().begin();
 
-	    OTSManager.get_current().rollback_only();
-	    
-	    System.out.println("\nFailed.");
-	}
-	catch (org.omg.CosTransactions.NoTransaction ex)
-	{
-	    System.out.println("\nPassed.");
-	}
-	catch (Throwable e)
-	{
-	    System.err.println("caught: "+e);
+            Control cont = OTSManager.get_current().get_control();
 
-	    e.printStackTrace();
+            OTSManager.get_current().commit(true);
 
-	    System.out.println("\nFailed.");
-	}	
+            OTSManager.get_current().resume(cont);
 
-	myOA.destroy();
-	myORB.shutdown();
+            OTSManager.get_current().rollback_only();
+
+            System.out.println("\nFailed.");
+        }
+        catch (org.omg.CosTransactions.NoTransaction ex)
+        {
+            System.out.println("\nPassed.");
+        }
+        catch (Throwable e)
+        {
+            fail("caught: "+e);
+
+            e.printStackTrace();
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
     }
- 
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/checked/CheckedTransactions.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/checked/CheckedTransactions.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/checked/CheckedTransactions.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -34,43 +34,28 @@
 import com.arjuna.ats.arjuna.coordinator.CheckedAction;
 import com.arjuna.ats.arjuna.common.Uid;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.SubtransactionsUnavailable;
-import org.omg.CosTransactions.NotPrepared;
-import org.omg.CosTransactions.HeuristicRollback;
-import org.omg.CosTransactions.HeuristicCommit;
-import org.omg.CosTransactions.HeuristicMixed;
-import org.omg.CosTransactions.HeuristicHazard;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
 import java.util.*;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 class MyCheckedAction extends CheckedAction
 {
-    
     public synchronized void check (boolean isCommit, Uid actUid, Hashtable list)
     {
-	// don't do anything so that no warning message is printed!
+        // don't do anything so that no warning message is printed!
     }
-    
 }
 
 class TXThread extends Thread
 {
-
     public TXThread (Control c)
     {
         cont = c;
@@ -78,91 +63,73 @@
 
     public void run ()
     {
-	try
-	{
-	    System.out.println("Thread "+Thread.currentThread()+" attempting to rollback transaction.");
-	    
-	    cont.get_terminator().rollback();
+        try
+        {
+            System.out.println("Thread "+Thread.currentThread()+" attempting to rollback transaction.");
 
-	    System.out.println("Transaction rolled back. Checked transactions disabled.");
-	}
-	catch (Exception e)
-	{
-	    System.out.println("Caught exception: "+e);
-	    System.out.println("Checked transactions enabled!");
-	}
+            cont.get_terminator().rollback();
+
+            System.out.println("Transaction rolled back. Checked transactions disabled.");
+        }
+        catch (Exception e)
+        {
+            System.out.println("Caught exception: "+e);
+            System.out.println("Checked transactions enabled!");
+        }
     }
-    
+
     private Control cont;
-    
-};
 
+}
+
 public class CheckedTransactions
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    for (int i = 0; i < args.length; i++)
-	    {
-		if (args[i].compareTo("-check") == 0)
-		{
-		    Properties p = System.getProperties();
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-		    p.put(com.arjuna.ats.jts.common.Environment.CHECKED_TRANSACTIONS, "YES");
-		    
-		    System.setProperties(p);
-		}
-		if (args[i].compareTo("-help") == 0)
-		{
-		    System.out.println("Usage: CheckedTransactions [-check] [-help]");
-		    System.exit(0);
-		}
-	    }
-	    
-	    Control tx = null;
+            Control tx = null;
 
-	    System.out.println("Thread "+Thread.currentThread()+" starting transaction.");
+            System.out.println("Thread "+Thread.currentThread()+" starting transaction.");
 
-	    OTSImpleManager.current().setCheckedAction(new MyCheckedAction());
-	    
-	    OTSImpleManager.current().begin();
+            OTSImpleManager.current().setCheckedAction(new MyCheckedAction());
 
-	    tx = OTSImpleManager.current().get_control();
+            OTSImpleManager.current().begin();
 
-	    TXThread txThread = new TXThread(tx);
+            tx = OTSImpleManager.current().get_control();
 
-	    txThread.start();
-	    txThread.join();
+            TXThread txThread = new TXThread(tx);
 
-	    System.out.println("Thread "+Thread.currentThread()+" committing transaction.");
+            txThread.start();
+            txThread.join();
 
-	    OTSImpleManager.current().commit(false);
+            System.out.println("Thread "+Thread.currentThread()+" committing transaction.");
 
-	    System.out.println("Transaction committed. Checked transactions enabled.");
-	}
-	catch (Exception e)
-	{
-	    System.out.println("Caught exception: "+e);
-	    System.out.println("Checked transactions disabled!");
-	}
+            OTSImpleManager.current().commit(false);
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+            System.out.println("Transaction committed. Checked transactions enabled.");
+        }
+        catch (Exception e)
+        {
+            System.out.println("Caught exception: "+e);
+            fail("Checked transactions disabled!");
+        }
 
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/grid/GridTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/grid/GridTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/grid/GridTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -33,7 +33,6 @@
 
 import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
@@ -44,162 +43,145 @@
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
 import org.omg.CORBA.INVALID_TRANSACTION;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class GridTest
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	    
-	    TransactionFactoryImple theOTS = new TransactionFactoryImple();
-	    Control myControl;
-	    grid_i localGrid = new grid_i(100, 100);
-	    int h, w, v;
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    myControl = theOTS.create(0);
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    if (myControl == null)
-	    {
-		System.err.println("Could not create transaction!");
-		System.exit(-1);
-	    }
+            TransactionFactoryImple theOTS = new TransactionFactoryImple();
+            Control myControl;
+            grid_i localGrid = new grid_i(100, 100);
+            int h, w, v;
 
-	    h = localGrid.height();
-	    w = localGrid.width();
+            myControl = theOTS.create(0);
 
-	    localGrid.set( 2, 4, 123, myControl);
-	    v = localGrid.get(2, 4, myControl);
+            assertNotNull( myControl );
+            
+            h = localGrid.height();
+            w = localGrid.width();
 
-	    // no problem setting and getting the elememt:
-	    
-	    System.out.println("grid[2,4] is "+v);
+            localGrid.set( 2, 4, 123, myControl);
+            v = localGrid.get(2, 4, myControl);
 
-	    // sanity check: make sure we got the value 123 back:
-	    if (v != 123)
-	    {
-		// oops - we didn't:
-		System.err.println("something went seriously wrong");
-		
-		myControl.get_terminator().rollback();
-	
-		System.exit(1);
-	    }
-	    else
-	    {
-		Terminator handle = myControl.get_terminator();
+            // no problem setting and getting the elememt:
 
-		try
-		{
-		    if (handle != null)
-		    {
-			handle.commit(false);
-		    }
-		    else
-			System.err.println("Error - no transaction terminator!");
-		}
-		catch (Exception ex)
-		{
-		    System.out.println("Test error! Caught: "+ex);
-		}
-	    }
+            System.out.println("grid[2,4] is "+v);
 
-	    ORBManager.getPOA().shutdownObject(theOTS);
-	    ORBManager.getPOA().shutdownObject(localGrid);
-	}
-	catch (UserException e)
-	{
-	    System.err.println("Caught UserException: "+e);
+            assertEquals(123, v);
 
-	    e.printStackTrace();
-	    System.exit(0);
-	}
-	catch (SystemException e)
-	{
-	    System.err.println("Caught SystemException: "+e);
+                Terminator handle = myControl.get_terminator();
 
-	    e.printStackTrace();
-	    System.exit(0);
-	}
+                try
+                {
+                    if (handle != null)
+                    {
+                        handle.commit(false);
+                    }
+                    else
+                        System.err.println("Error - no transaction terminator!");
+                }
+                catch (Exception ex)
+                {
+                    System.out.println("Test error! Caught: "+ex);
+                }
 
-	System.out.println("\nWill now try different thread terminating transaction.\n");
 
-	try
-	{
-	    org.omg.CosTransactions.Current current = OTSManager.get_current();
-	    
-	    System.out.println("Starting new transaction.");
-	    
-	    current.begin();
+            ORBManager.getPOA().shutdownObject(theOTS);
+            ORBManager.getPOA().shutdownObject(localGrid);
+        }
+        catch (UserException e)
+        {
+            fail("Caught UserException: "+e);
 
-	    Control tc = current.get_control();
+            e.printStackTrace();
+        }
+        catch (SystemException e)
+        {
+            fail("Caught SystemException: "+e);
 
-	    if (tc != null)
-	    {
-		System.out.println("Creating new thread.");
-		
-		TransactionalThread tranThread = new TransactionalThread(tc);
+            e.printStackTrace();
+        }
 
-		System.out.println("Waiting for thread to terminate transaction.\n");
-		
-		tranThread.start();
+        System.out.println("\nWill now try different thread terminating transaction.\n");
 
-		while (!tranThread.finished())
-		    Thread.yield();
+        try
+        {
+            org.omg.CosTransactions.Current current = OTSManager.get_current();
 
-		System.out.println("\nCreator will now attempt to rollback transaction. Should fail.");
+            System.out.println("Starting new transaction.");
 
-		try
-		{
-		    current.rollback();
+            current.begin();
 
-		    System.out.println("Error - managed to rollback transaction!");
-		}
-		catch (NoTransaction e1)
-		{
-		    System.out.println("Correct termination - caught: "+e1);
-		}
-		catch (INVALID_TRANSACTION e2)
-		{
-		    System.out.println("Correct termination - caught: "+e2);
-		}
-		catch (Exception e3)
-		{
-		    System.out.println("Wrong termination - caught unexpected exception: "+e3);
-		    e3.printStackTrace();
-		    
-		    System.exit(0);
-		}
+            Control tc = current.get_control();
 
-		System.out.println("Test completed successfully.");
-	    }
-	    else
-		System.err.println("Error - null transaction control!");
-	}
-	catch (Exception e)
-	{
-	    System.out.println("Caught unexpected exception: "+e);
-	}
+            if (tc != null)
+            {
+                System.out.println("Creating new thread.");
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+                TransactionalThread tranThread = new TransactionalThread(tc);
 
+                System.out.println("Waiting for thread to terminate transaction.\n");
+
+                tranThread.start();
+
+                while (!tranThread.finished())
+                    Thread.yield();
+
+                System.out.println("\nCreator will now attempt to rollback transaction. Should fail.");
+
+                try
+                {
+                    current.rollback();
+
+                    fail("Error - managed to rollback transaction!");
+                }
+                catch (NoTransaction e1)
+                {
+                    System.out.println("Correct termination - caught: "+e1);
+                }
+                catch (INVALID_TRANSACTION e2)
+                {
+                    System.out.println("Correct termination - caught: "+e2);
+                }
+                catch (Exception e3)
+                {
+                    fail("Wrong termination - caught unexpected exception: "+e3);
+                    e3.printStackTrace();
+                }
+
+                System.out.println("Test completed successfully.");
+            }
+            else
+                System.err.println("Error - null transaction control!");
+        }
+        catch (Exception e)
+        {
+            System.out.println("Caught unexpected exception: "+e);
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance1.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance1.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,117 +31,87 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.local.performance;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
-import org.omg.CosTransactions.*;
-
 import java.util.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class Performance1
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
+        try
+        {
+            myORB = ORB.getInstance("test");
 
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    double iters = 1000.0;
-	    boolean doCommit = true;
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    for (int i = 0; i < args.length; i++)
-	    {
-		if (args[i].equals("-rollback"))
-		    doCommit = false;
-		else
-		{
-		    if (args[i].equals("-help"))
-		    {
-			System.out.println("Usage: Performance1 [-rollback] [-help]");
-			System.exit(0);
-		    }
-		    else
-		    {
-			System.err.println("Unknown option: "+args[i]);
-			System.exit(0);
-		    }
-		}
-	    }
+            double iters = 1000.0;
+            boolean doCommit = true;
 
-	    // Run ten interations first.
+            // Run ten interations first.
 
-	    CurrentImple current = OTSImpleManager.current();
-	    
-	    for (int i = 0; i < 10; i++)
-	    {
-		current.begin();
+            CurrentImple current = OTSImpleManager.current();
 
-		if (doCommit)
-		    current.commit(true);
-		else
-		    current.rollback();
-	    }
+            for (int i = 0; i < 10; i++)
+            {
+                current.begin();
 
-	    // Record the start time.
+                if (doCommit)
+                    current.commit(true);
+                else
+                    current.rollback();
+            }
 
-	    Date startTime = new Date();
+            // Record the start time.
 
-	    // Run 1000 interations.
-	    
-	    for (int i = 0; i < iters; i++)
-	    {
-		current.begin();
+            Date startTime = new Date();
 
-		if (doCommit)
-		    current.commit(true);
-		else
-		    current.rollback();
-	    }
+            // Run 1000 interations.
 
-	    // Record the end time.
+            for (int i = 0; i < iters; i++)
+            {
+                current.begin();
 
-	    Date endTime = new Date();
-	    double txnTime = (float)((endTime.getTime()-startTime.getTime())/iters);
-	    double txnPSec = 1000.0/txnTime;
+                if (doCommit)
+                    current.commit(true);
+                else
+                    current.rollback();
+            }
 
-	    System.out.println("Average time for empty transaction = "+txnTime);
-	    System.out.println("Transactions per second = "+txnPSec);
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace();
-	}
+            // Record the end time.
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+            Date endTime = new Date();
+            double txnTime = (float)((endTime.getTime()-startTime.getTime())/iters);
+            double txnPSec = 1000.0/txnTime;
 
+            System.out.println("Average time for empty transaction = "+txnTime);
+            System.out.println("Transactions per second = "+txnPSec);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            fail();
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,118 +31,90 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.local.performance;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
 import org.omg.CosTransactions.*;
 
 import java.util.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class Performance2
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
+        try
+        {
+            myORB = ORB.getInstance("test");
 
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    double iters = 1000.0;
-	    boolean doCommit = true;
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    for (int i = 0; i < args.length; i++)
-	    {
-		if (args[i].equals("-rollback"))
-		    doCommit = false;
-		else
-		{
-		    if (args[i].equals("-help"))
-		    {
-			System.out.println("Usage: Performance1 [-rollback] [-help]");
-			System.exit(0);
-		    }
-		    else
-		    {
-			System.err.println("Unknown option: "+args[i]);
-			System.exit(0);
-		    }
-		}
-	    }
-	    
-	    TransactionFactoryImple factory = OTSImpleManager.factory();
-	    Control control = null;
-	    
-	    // Run ten interations first.
+            double iters = 1000.0;
+            boolean doCommit = true;
 
-	    for (int i = 0; i < 10; i++)
-	    {
-		control = factory.create(0);
+            TransactionFactoryImple factory = OTSImpleManager.factory();
+            Control control = null;
 
-		if (doCommit)
-		    control.get_terminator().commit(true);
-		else
-		    control.get_terminator().rollback();
-	    }
+            // Run ten interations first.
 
-	    // Record the start time.
+            for (int i = 0; i < 10; i++)
+            {
+                control = factory.create(0);
 
-	    Date startTime = new Date();
+                if (doCommit)
+                    control.get_terminator().commit(true);
+                else
+                    control.get_terminator().rollback();
+            }
 
-	    // Run 1000 interations.
-	    
-	    for (int i = 0; i < iters; i++)
-	    {
-		control = factory.create(0);
+            // Record the start time.
 
-		if (doCommit)
-		    control.get_terminator().commit(true);
-		else
-		    control.get_terminator().rollback();
-	    }
+            Date startTime = new Date();
 
-	    // Record the end time.
+            // Run 1000 interations.
 
-	    Date endTime = new Date();
-	    double txnTime = (float)((endTime.getTime()-startTime.getTime())/iters);
-	    double txnPSec = 1000.0/txnTime;
+            for (int i = 0; i < iters; i++)
+            {
+                control = factory.create(0);
 
-	    System.out.println("Average time for empty transaction = "+txnTime);
-	    System.out.println("Transactions per second = "+txnPSec);
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace();
-	}
+                if (doCommit)
+                    control.get_terminator().commit(true);
+                else
+                    control.get_terminator().rollback();
+            }
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+            // Record the end time.
 
+            Date endTime = new Date();
+            double txnTime = (float)((endTime.getTime()-startTime.getTime())/iters);
+            double txnPSec = 1000.0/txnTime;
+
+            System.out.println("Average time for empty transaction = "+txnTime);
+            System.out.println("Transactions per second = "+txnPSec);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            fail();
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance3.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/performance/Performance3.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,117 +31,88 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.local.performance;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 import com.arjuna.ats.internal.jts.orbspecific.coordinator.ArjunaTransactionImple;
 
 import org.omg.CosTransactions.*;
 
 import java.util.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class Performance3
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
+        try
+        {
+            myORB = ORB.getInstance("test");
 
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    double iters = 1000.0;
-	    boolean doCommit = true;
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    for (int i = 0; i < args.length; i++)
-	    {
-		if (args[i].equals("-rollback"))
-		    doCommit = false;
-		else
-		{
-		    if (args[i].equals("-help"))
-		    {
-			System.out.println("Usage: Performance1 [-rollback] [-help]");
-			System.exit(0);
-		    }
-		    else
-		    {
-			System.err.println("Unknown option: "+args[i]);
-			System.exit(0);
-		    }
-		}
-	    }
-	    
-	    ArjunaTransactionImple tx = null;
-	    
-	    // Run ten interations first.
+            double iters = 1000.0;
+            boolean doCommit = true;
 
-	    for (int i = 0; i < 10; i++)
-	    {
-		tx = new ArjunaTransactionImple((Control) null, (ArjunaTransactionImple) null);
+            ArjunaTransactionImple tx = null;
 
-		if (doCommit)
-		    tx.commit(true);
-		else
-		    tx.rollback();
-	    }
+            // Run ten interations first.
 
-	    // Record the start time.
+            for (int i = 0; i < 10; i++)
+            {
+                tx = new ArjunaTransactionImple((Control) null, (ArjunaTransactionImple) null);
 
-	    Date startTime = new Date();
+                if (doCommit)
+                    tx.commit(true);
+                else
+                    tx.rollback();
+            }
 
-	    // Run 1000 interations.
-	    
-	    for (int i = 0; i < iters; i++)
-	    {
-		tx = new ArjunaTransactionImple((Control) null, (ArjunaTransactionImple) null);
+            // Record the start time.
 
-		if (doCommit)
-		    tx.commit(true);
-		else
-		    tx.rollback();
-	    }
+            Date startTime = new Date();
 
-	    // Record the end time.
+            // Run 1000 interations.
 
-	    Date endTime = new Date();
-	    double txnTime = (float)((endTime.getTime()-startTime.getTime())/iters);
-	    double txnPSec = 1000.0/txnTime;
+            for (int i = 0; i < iters; i++)
+            {
+                tx = new ArjunaTransactionImple((Control) null, (ArjunaTransactionImple) null);
 
-	    System.out.println("Average time for empty transaction = "+txnTime);
-	    System.out.println("Transactions per second = "+txnPSec);
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace();
-	}
+                if (doCommit)
+                    tx.commit(true);
+                else
+                    tx.rollback();
+            }
 
-	myOA.destroy();
-	myORB.shutdown();
+            // Record the end time.
+
+            Date endTime = new Date();
+            double txnTime = (float)((endTime.getTime()-startTime.getTime())/iters);
+            double txnPSec = 1000.0/txnTime;
+
+            System.out.println("Average time for empty transaction = "+txnTime);
+            System.out.println("Transactions per second = "+txnPSec);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            fail();
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
     }
 
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/timeout/TerminationTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/timeout/TerminationTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/local/timeout/TerminationTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,15 +31,8 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.local.timeout;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.jts.common.Environment;
 import com.arjuna.ats.jts.OTSManager;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
@@ -49,186 +42,162 @@
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CosTransactions.WrongTransaction;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class TerminationTest
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	boolean commit = true;
+        boolean commit = true;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-commit") == 0)
-		commit = true;
-	    if (args[i].compareTo("-rollback") == 0)
-		commit = false;
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: TerminationTest [-commit] [-rollback] [-help]");
-		System.exit(0);
-	    }
-	}
+        Control myControl = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	Control myControl = null;
-	ORB myORB = null;
-	RootOA myOA = null;
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    TransactionFactoryImple theOTS = new TransactionFactoryImple();
+            TransactionFactoryImple theOTS = new TransactionFactoryImple();
 
-	    System.out.println("Creating transaction with 2 second timeout.");
-	    
-	    myControl = theOTS.create(2);
+            System.out.println("Creating transaction with 2 second timeout.");
 
-	    if (myControl == null)
-	    {
-		System.err.println("Could not create transaction!");
-		System.exit(-1);
-	    }
+            myControl = theOTS.create(2);
 
-	    Terminator handle = myControl.get_terminator();
-	    
-	    try
-	    {
-		System.out.println("Sleeping for 5 seconds.");
-		
-		Thread.sleep(5000);
-	    }
-	    catch (Exception e)
-	    {
-	    }
-	    
-	    if (handle != null)
-	    {
-		System.out.print("Attempting to ");
+            assertNotNull( myControl );
 
-		if (commit)
-		    System.out.println("commit transaction. Should fail!");
-		else
-		    System.out.println("rollback transaction. Should fail!.");
+            Terminator handle = myControl.get_terminator();
 
-		if (commit)
-		    handle.commit(true);
-		else
-		    handle.rollback();
+            try
+            {
+                System.out.println("Sleeping for 5 seconds.");
 
-		if (commit)
-		    System.out.println("Test did not completed successfully.");
+                Thread.sleep(5000);
+            }
+            catch (Exception e)
+            {
+            }
 
-		System.out.println("\nNow attempting to destroy transaction. Should fail!");
-		    
-		OTSManager.destroyControl(myControl);
-	    }
-	    else
-		System.err.println("No transaction terminator!");
-	}
-	catch (UserException e)
-	{
-	    System.err.println("Caught UserException: "+e);
-	}
-	catch (SystemException e)
-	{
-	    System.err.println("Caught SystemException: "+e);
+            if (handle != null)
+            {
+                System.out.print("Attempting to ");
 
-	    try
-	    {
-		Coordinator coord = myControl.get_coordinator();
-		Status s = coord.get_status();
-		
-		System.err.println("Transaction status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
+                if (commit)
+                    System.out.println("commit transaction. Should fail!");
+                else
+                    System.out.println("rollback transaction. Should fail!.");
 
-		coord = null;
-	    }
-	    catch (Exception ex)
-	    {
-	    }
-	}
+                if (commit)
+                    handle.commit(true);
+                else
+                    handle.rollback();
 
-	try
-	{
-	    CurrentImple current = OTSImpleManager.current();
+                assertFalse(commit);
 
-	    current.set_timeout(2);
-	
-	    System.out.println("\nNow creating current transaction with 2 second timeout.");
+                System.out.println("\nNow attempting to destroy transaction. Should fail!");
 
-	    current.begin();
+                OTSManager.destroyControl(myControl);
+            }
+            else
+                System.err.println("No transaction terminator!");
+        }
+        catch (UserException e)
+        {
+            System.err.println("Caught UserException: "+e);
+        }
+        catch (SystemException e)
+        {
+            System.err.println("Caught SystemException: "+e);
 
-	    myControl = current.get_control();
-	    
-	    try
-	    {
-		System.out.println("Sleeping for 5 seconds.");
-		
-		Thread.sleep(5000);
-	    }
-	    catch (Exception e)
-	    {
-	    }
-	    
-	    System.out.print("Attempting to ");
+            try
+            {
+                Coordinator coord = myControl.get_coordinator();
+                Status s = coord.get_status();
 
-	    if (commit)
-		System.out.println("commit transaction. Should fail!");
-	    else
-		System.out.println("rollback transaction. Should fail!.");
+                System.err.println("Transaction status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
 
-	    if (commit)
-		current.commit(true);
-	    else
-		current.rollback();
+                coord = null;
+            }
+            catch (Exception ex)
+            {
+            }
+        }
 
-	    if (commit)
-		System.out.println("Test did not completed successfully.");
-	}
-	catch (UserException e)
-	{
-	    System.err.println("Caught UserException: "+e);
-	    System.out.println("Test did not completed successfully.");
-	}
-	catch (SystemException e)
-	{
-	    System.err.println("Caught SystemException: "+e);
+        try
+        {
+            CurrentImple current = OTSImpleManager.current();
 
-	    try
-	    {
-		Coordinator coord = myControl.get_coordinator();
-		Status s = coord.get_status();
-		
-		System.err.println("Transaction status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
+            current.set_timeout(2);
 
-		myControl = null;
-		coord = null;
-	    }
-	    catch (Exception ex)
-	    {
-	    }
+            System.out.println("\nNow creating current transaction with 2 second timeout.");
 
-	    System.out.println("Test completed successfully.");
-	}
+            current.begin();
 
-	myOA.destroy();
-	myORB.shutdown();
+            myControl = current.get_control();
 
-	System.exit(0);
+            try
+            {
+                System.out.println("Sleeping for 5 seconds.");
+
+                Thread.sleep(5000);
+            }
+            catch (Exception e)
+            {
+            }
+
+            System.out.print("Attempting to ");
+
+            if (commit)
+                System.out.println("commit transaction. Should fail!");
+            else
+                System.out.println("rollback transaction. Should fail!.");
+
+            if (commit)
+                current.commit(true);
+            else
+                current.rollback();
+
+            assertFalse(commit);
+        }
+        catch (UserException e)
+        {
+            System.err.println("Caught UserException: "+e);
+            System.out.println("Test did not completed successfully.");
+        }
+        catch (SystemException e)
+        {
+            System.err.println("Caught SystemException: "+e);
+
+            try
+            {
+                Coordinator coord = myControl.get_coordinator();
+                Status s = coord.get_status();
+
+                System.err.println("Transaction status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
+
+                myControl = null;
+                coord = null;
+            }
+            catch (Exception ex)
+            {
+            }
+
+            System.out.println("Test completed successfully.");
+        }
+
+        myOA.destroy();
+        myORB.shutdown();
     }
-    
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicObject.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicObject.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicObject.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -36,14 +36,12 @@
 
 import com.arjuna.ats.arjuna.*;
 import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.coordinator.*;
 import com.arjuna.ats.arjuna.state.*;
 
 import com.arjuna.ats.txoj.*;
 
 import com.hp.mwtests.ts.jts.exceptions.TestException;
 
-import org.omg.CosTransactions.SubtransactionsUnavailable;
 import java.io.IOException;
 
 public class AtomicObject extends LockManager

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicResource.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicResource.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,14 +31,10 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.ORBManager;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 
 public class AtomicResource extends org.omg.CosTransactions.ResourcePOA

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker1.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker1.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,18 +31,13 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 
 import com.hp.mwtests.ts.jts.utils.Util;
 import com.hp.mwtests.ts.jts.exceptions.TestException;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
-import java.util.Random;
-
 public class AtomicWorker1
 {
     

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,19 +31,13 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 
 import com.hp.mwtests.ts.jts.utils.Util;
 import com.hp.mwtests.ts.jts.exceptions.TestException;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class AtomicWorker2
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker3.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/AtomicWorker3.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,17 +31,13 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 
 import com.hp.mwtests.ts.jts.utils.Util;
 import com.hp.mwtests.ts.jts.exceptions.TestException;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
-import java.util.Random;
 import java.lang.InterruptedException;
 
 public class AtomicWorker3

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,25 +31,17 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.arjuna.ats.jts.OTSManager;
-
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class DHThreadObject2 extends Thread
 {
 
-public DHThreadObject2 (char c)
+    public DHThreadObject2 (char c)
     {
         chr = c;
     }
 
-public void run ()
+    public void run ()
     {
         for (int i = 0; i < 100; i++)
         {
@@ -57,8 +49,8 @@
             Util.highProbYield();
         }
     }
-    
-private char chr;
-    
-};
 
+    private char chr;
+
+}
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3a.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3a.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3a.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -32,14 +32,10 @@
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class DHThreadObject3a extends Thread
 {
 
@@ -91,5 +87,5 @@
 private static int commitThreadId = 3;
 private static int abortThreadId = 3;
     
-};
+}
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3b.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3b.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DHThreadObject3b.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,16 +31,8 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.arjuna.ats.jts.OTSManager;
-
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class DHThreadObject3b extends Thread
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoArjunaResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoArjunaResource.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoArjunaResource.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -34,10 +34,7 @@
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
 import com.arjuna.ArjunaOTS.*;

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoResource.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoResource.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -34,9 +34,7 @@
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.orbportability.*;
 import com.hp.mwtests.ts.jts.utils.ResourceTrace;
 
 import org.omg.CosTransactions.*;

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoSubTranResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoSubTranResource.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DemoSubTranResource.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -34,9 +34,7 @@
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.orbportability.*;
 import com.hp.mwtests.ts.jts.utils.ResourceTrace;
 
 import org.omg.CosTransactions.*;

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker1.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker1.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,24 +31,16 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.TestModule.*;
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.remote.servers.HammerServer;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-
 import org.omg.CORBA.IntHolder;
 
+import com.hp.mwtests.ts.jts.TestModule.Hammer;
+
 public class DistributedHammerWorker1
 {
     
@@ -417,4 +409,4 @@
 
 public static Hammer hammerObject_1 = null;
 public static Hammer hammerObject_2 = null;
-};
+}

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,21 +31,14 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.TestModule.*;
 import com.hp.mwtests.ts.jts.utils.Util;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.orbportability.*;
+import com.hp.mwtests.ts.jts.TestModule.Hammer;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-
 import org.omg.CORBA.IntHolder;
 
 public class DistributedHammerWorker2

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker3.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/DistributedHammerWorker3.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,23 +31,16 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.TestModule.*;
 import com.hp.mwtests.ts.jts.utils.Util;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-
 import org.omg.CORBA.IntHolder;
 
+import com.hp.mwtests.ts.jts.TestModule.Hammer;
+
 public class DistributedHammerWorker3
 {
     

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ExplicitStackImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ExplicitStackImple.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ExplicitStackImple.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -37,25 +37,16 @@
 
 import com.arjuna.ats.txoj.*;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 
 import com.arjuna.ats.jts.ExplicitInterposition;
 import com.arjuna.ats.jts.extensions.*;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
 
 import java.io.IOException;
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/HammerObject.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/HammerObject.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/HammerObject.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -37,23 +37,15 @@
 
 import com.arjuna.ats.txoj.*;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 
 import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CORBA.IntHolder;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 
 import java.io.IOException;

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/StackImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/StackImple.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/StackImple.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,31 +31,16 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
 import com.arjuna.ats.txoj.*;
 
 import com.arjuna.ats.arjuna.*;
 import com.arjuna.ats.arjuna.common.*;
 import com.arjuna.ats.arjuna.state.*;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-
-import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.ats.jts.ExplicitInterposition;
 import com.arjuna.ats.jts.extensions.*;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.*;
-
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 
 import java.io.IOException;

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -32,15 +32,7 @@
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
-import com.arjuna.ats.jts.OTSManager;
-
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class ThreadObject2 extends Thread
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3a.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3a.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3a.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -32,14 +32,10 @@
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class ThreadObject3a extends Thread
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3b.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3b.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/ThreadObject3b.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -32,15 +32,7 @@
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
 import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
-import com.arjuna.ats.jts.OTSManager;
-
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class ThreadObject3b extends Thread
 {
 
@@ -60,4 +52,4 @@
 
 private int _id;
     
-};
+}

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/demosync.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/demosync.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/demosync.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,22 +31,12 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
 import com.arjuna.ats.jts.utils.Utility;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UNKNOWN;
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/grid_i.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/grid_i.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/grid_i.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,21 +31,10 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UserException;
 import org.omg.CORBA.UNKNOWN;

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/heuristic.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/heuristic.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/heuristic.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,22 +31,12 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.utils.Util;
 import com.hp.mwtests.ts.jts.utils.ResourceTrace;
 
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.ORBManager;
 
-import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 
 public class heuristic extends org.omg.CosTransactions.ResourcePOA

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/setget_i.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/setget_i.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/setget_i.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,27 +31,22 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.TestModule.*;
-import com.hp.mwtests.ts.jts.utils.Util;
-
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 
 import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
+import com.arjuna.ArjunaOTS.InterpositionFailed;
 
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import com.arjuna.ArjunaOTS.*;
-
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.UNKNOWN;
 
+import com.hp.mwtests.ts.jts.TestModule.SetGetHelper;
+import com.hp.mwtests.ts.jts.TestModule.SetGet;
+
+
 public class setget_i extends com.hp.mwtests.ts.jts.TestModule.SetGetPOA
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/trangrid_i.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/trangrid_i.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/trangrid_i.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,22 +31,14 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
+import com.hp.mwtests.ts.jts.TestModule.TranGridHelper;
+import com.hp.mwtests.ts.jts.TestModule.TranGrid;
 
-import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 
 public class trangrid_i extends com.hp.mwtests.ts.jts.TestModule.TranGridPOA

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/tranobject_i.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/tranobject_i.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/orbspecific/resources/tranobject_i.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,21 +31,10 @@
 
 package com.hp.mwtests.ts.jts.orbspecific.resources;
 
-import com.hp.mwtests.ts.jts.utils.Util;
-
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 
-import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.ats.jts.ExplicitInterposition;
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.orbportability.*;
-
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
 
 public class tranobject_i extends org.omg.CosTransactions.ResourcePOA

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,238 +31,181 @@
 
 package com.hp.mwtests.ts.jts.remote.arjuna;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import com.hp.mwtests.ts.jts.TestModule.ExplicitStack;
+import com.hp.mwtests.ts.jts.TestModule.ExplicitStackHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import org.omg.CosTransactions.*;
 
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class ExplicitArjunaClient extends Test
+public class ExplicitArjunaClient
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	CurrentImple current = OTSImpleManager.current();
-	String refFile = "/tmp/explicitstack.ref";
-	String serverName = "ExplicitStack";
-	int value = 1;
-	Control cont = null;
+        CurrentImple current = OTSImpleManager.current();
+        String refFile = "/tmp/explicitstack.ref";
+        String serverName = "ExplicitStack";
+        int value = 1;
+        Control cont = null;
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\explicitstack.ref";
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\explicitstack.ref";
+        }
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-value") == 0)
-	    {
-		try
-		{
-		    Integer val = new Integer(args[i+1]);
-		    value = val.intValue();
-		}
-		catch (Exception e)
-		{
-		    System.err.println(e);
-		    assertFailure();
-		}
-	    }
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ExplicitArjunaClient [-reffile <file>] [-value <number>] [-help]");
-		assertFailure();
-	    }
-	}
+        try
+        {
+            System.out.println("Starting initialising top-level transaction.");
 
-	try
-	{
-	    System.out.println("Starting initialising top-level transaction.");
+            current.begin();
 
-	    current.begin();
+            System.out.println("Initialising transaction name: "+current.get_transaction_name());
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
 
-	    System.out.println("Initialising transaction name: "+current.get_transaction_name());
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        ExplicitStack stackVar = null;   // pointer the grid object that will be used.
 
-	ExplicitStack stackVar = null;   // pointer the grid object that will be used.
+        try
+        {
+            stackVar = ExplicitStackHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(refFile)));
+        }
+        catch (Exception e)
+        {
+            System.err.println("Bind error: "+e);
+            fail();
+        }
 
-	try
-	{
-	    stackVar = ExplicitStackHelper.narrow(myORB.orb().string_to_object(getService(refFile)));
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Bind error: "+e);
-	    assertFailure();
-	}
+        try
+        {
+            System.out.println("pushing "+value+" onto stack");
 
-	try
-	{
-	    System.out.println("pushing "+value+" onto stack");
+            cont = current.get_control();
+            stackVar.push(value, cont);
 
-	    cont = current.get_control();
-	    stackVar.push(value, cont);
+            System.out.println("\npushing "+(value+1)+" onto stack");
 
-	    System.out.println("\npushing "+(value+1)+" onto stack");
+            stackVar.push(value+1, cont);
 
-	    stackVar.push(value+1, cont);
+            cont = null;
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
 
-	    cont = null;
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        try
+        {
+            current.commit(true);
 
-	try
-	{
-	    current.commit(true);
+            System.out.println("Committed top-level transaction");
+            System.out.println("\nBeginning top-level transaction");
 
-	    System.out.println("Committed top-level transaction");
-	    System.out.println("\nBeginning top-level transaction");
+            current.begin();
 
-	    current.begin();
+            System.out.println("Top-level name: "+current.get_transaction_name());
 
-	    System.out.println("Top-level name: "+current.get_transaction_name());
+            IntHolder val = new IntHolder(-1);
 
-	    IntHolder val = new IntHolder(-1);
+            cont = current.get_control();
 
-	    cont = current.get_control();
+            if (stackVar.pop(val, cont) == 0)
+            {
+                System.out.println("popped top of stack "+val.value);
+                System.out.println("\nbeginning nested transaction");
 
-	    if (stackVar.pop(val, cont) == 0)
-	    {
-		System.out.println("popped top of stack "+val.value);
-		System.out.println("\nbeginning nested transaction");
+                current.begin();
 
-		current.begin();
+                System.out.println("nested name: "+current.get_transaction_name());
 
-		System.out.println("nested name: "+current.get_transaction_name());
+                cont = null;
+                cont = current.get_control();
+                stackVar.push(value+2, cont);
 
-		cont = null;
-		cont = current.get_control();
-		stackVar.push(value+2, cont);
+                System.out.println("pushed "+(value+2)+" onto stack. Aborting nested action.");
 
-		System.out.println("pushed "+(value+2)+" onto stack. Aborting nested action.");
+                cont = null;  // current will destroy this control!
+                current.rollback();
+                cont = current.get_control();
 
-		cont = null;  // current will destroy this control!
-		current.rollback();
-		cont = current.get_control();
+                System.out.println("current transaction name: "+current.get_transaction_name());
+                System.out.println("rolledback nested transaction");
 
-		System.out.println("current transaction name: "+current.get_transaction_name());
-		System.out.println("rolledback nested transaction");
+                stackVar.pop(val, cont);
 
-		stackVar.pop(val, cont);
+                System.out.println("\npopped top of stack is "+val.value);
 
-		System.out.println("\npopped top of stack is "+val.value);
+                System.out.println("\nTrying to print stack contents - should fail.");
 
-		System.out.println("\nTrying to print stack contents - should fail.");
+                stackVar.printStack();
 
-		stackVar.printStack();
+                cont = null;
+                current.commit(true);
 
-		cont = null;
-		current.commit(true);
+                System.out.println("\nCommitted top-level transaction");
 
-		System.out.println("\nCommitted top-level transaction");
+                if (current.get_transaction_name() == null)
+                    System.out.println("current transaction name: null");
+                else
+                    System.out.println("Error - current transaction name: "
+                            +current.get_transaction_name());
 
-		if (current.get_transaction_name() == null)
-		    System.out.println("current transaction name: null");
-		else
-		    System.out.println("Error - current transaction name: "
-				       +current.get_transaction_name());
+                assertEquals(value, val.value);
 
-		if (val.value == value)
-		{
-		    System.out.println("\nThis is correct.");
-		    assertSuccess();
-		}
-		else
-		{
-		    System.out.println("\nThis is incorrect. Value should be "+value);
-		    assertFailure();
-		}
-	    }
-	    else
-	    {
-		System.out.println("Error getting stack value.");
+            }
+            else
+            {
+                System.out.println("Error getting stack value.");
 
-		current.rollback();
+                current.rollback();
 
-		System.out.println("\nRolledback top-level transaction.");
-	    }
+                System.out.println("\nRolledback top-level transaction.");
+            }
 
-	    try
-	    {
-		System.out.println("\nPrinting stack contents (should be empty).");
+            try
+            {
+                System.out.println("\nPrinting stack contents (should be empty).");
 
-		stackVar.printStack();
-	    }
-	    catch (Exception e)
-	    {
-		System.out.println("\nError - could not print.");
-		assertFailure();
-	    }
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Caught unexpected exception: "+e);
-	    assertFailure();
-	}
+                stackVar.printStack();
+            }
+            catch (Exception e)
+            {
+                fail("\nError - could not print.");
+            }
+        }
+        catch (Exception e)
+        {
+            fail("Caught unexpected exception: "+e);
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main(String[] args)
-    {
-	ExplicitArjunaClient eac = new ExplicitArjunaClient();
-	eac.initialise(null, null, args, new LocalHarness());
-	eac.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,159 +31,121 @@
 
 package com.hp.mwtests.ts.jts.remote.arjuna;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
+import com.hp.mwtests.ts.jts.TestModule.stackHelper;
+import com.hp.mwtests.ts.jts.TestModule.stack;
 
-import org.omg.CosTransactions.*;
-
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class ImplicitArjunaClient extends Test
+public class ImplicitArjunaClient
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String refFile = "/tmp/stack.ref";
-	String serverName = "Stack";
-	CurrentImple current = OTSImpleManager.current();
+        String refFile = "/tmp/stack.ref";
+        String serverName = "Stack";
+        CurrentImple current = OTSImpleManager.current();
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\stack.ref";	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\stack.ref";	}
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ImplicitArjunaClient [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        stack stackVar = null;   // pointer the grid object that will be used.
 
-	stack stackVar = null;   // pointer the grid object that will be used.
+        try
+        {
+            current.begin();
 
-	try
-	{
-	    current.begin();
+            try
+            {
+                Services serv = new Services(myORB);
 
-	    try
-	    {
-		Services serv = new Services(myORB);
+                stackVar = stackHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(refFile)));
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace(System.err);
+                fail();
+            }
 
-		stackVar = stackHelper.narrow(myORB.orb().string_to_object(getService(refFile)));
-	    }
-	    catch (Exception e)
-	    {
-		e.printStackTrace(System.err);
-		assertFailure();
-	    }
+            System.out.println("pushing 1 onto stack");
 
-	    System.out.println("pushing 1 onto stack");
+            stackVar.push(1);
 
-	    stackVar.push(1);
+            System.out.println("pushing 2 onto stack");
 
-	    System.out.println("pushing 2 onto stack");
+            stackVar.push(2);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
 
-	    stackVar.push(2);
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        try
+        {
+            current.commit(false);
 
-	try
-	{
-	    current.commit(false);
+            current.begin();
 
-	    current.begin();
+            IntHolder val = new IntHolder(-1);
 
-	    IntHolder val = new IntHolder(-1);
+            if (stackVar.pop(val) == 0)
+            {
+                System.out.println("popped top of stack "+val.value);
 
-	    if (stackVar.pop(val) == 0)
-	    {
-		System.out.println("popped top of stack "+val.value);
+                current.begin();
 
-		current.begin();
+                stackVar.push(3);
 
-		stackVar.push(3);
+                System.out.println("pushed 3 onto stack. Aborting nested action.");
 
-		System.out.println("pushed 3 onto stack. Aborting nested action.");
+                current.rollback();
 
-		current.rollback();
+                stackVar.pop(val);
 
-		stackVar.pop(val);
+                System.out.println("popped top of stack is "+val.value);
 
-		System.out.println("popped top of stack is "+val.value);
+                current.commit(false);
 
-		current.commit(false);
+                assertEquals(1, val.value);
 
-		if (val.value == 1)
-		{
-		    System.out.println("\nThis is correct.");
-		    assertSuccess();
-		}
-		else
-		{
-		    System.out.println("\nThis is incorrect.");
-		    assertFailure();
-		}
-	    }
-	    else
-	    {
-		assertFailure();
-		System.err.println("Error getting stack value.");
+            }
+            else
+            {
+                fail("Error getting stack value.");
 
-		current.rollback();
-	    }
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+                current.rollback();
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,190 +31,143 @@
 
 package com.hp.mwtests.ts.jts.remote.current;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import com.hp.mwtests.ts.jts.TestModule.grid;
+import com.hp.mwtests.ts.jts.TestModule.gridHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CORBA.IntHolder;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class CurrentTest extends Test
+public class CurrentTest
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	CurrentImple current = OTSImpleManager.current();
-	Control myControl = null;
-	String gridReference = "/tmp/grid.ref";
-	String serverName = "Grid";
-	grid gridVar = null;  // pointer the grid object that will be used.
-	int h = -1, w = -1, v = -1;
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    gridReference = "C:\\temp\\grid.ref";
-	}
+        CurrentImple current = OTSImpleManager.current();
+        Control myControl = null;
+        String gridReference = "/tmp/grid.ref";
+        String serverName = "Grid";
+        grid gridVar = null;  // pointer the grid object that will be used.
+        int h = -1, w = -1, v = -1;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: CurrentTest [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-reffile") == 0)
-		gridReference = args[i+1];
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            gridReference = "C:\\temp\\grid.ref";
+        }
 
-	System.out.println("Beginning transaction.");
+        System.out.println("Beginning transaction.");
 
-	try
-	{
-	    current.begin();
+        try
+        {
+            current.begin();
 
-	    myControl = current.get_control();
+            myControl = current.get_control();
 
-	    if (myControl == null)
-	    {
-		System.err.println("Error - control is null!");
-		assertFailure();
-	    }
-	}
-	catch (Exception sysEx)
-	{
-	    sysEx.printStackTrace(System.err);
-	    assertFailure();
-	}
+            assertNotNull(myControl);
+        }
+        catch (Exception sysEx)
+        {
+            sysEx.printStackTrace(System.err);
+            fail();
+        }
 
-	try
-	{
-	    Services serv = new Services(myORB);
+        try
+        {
+            Services serv = new Services(myORB);
 
-	    gridVar = gridHelper.narrow(myORB.orb().string_to_object(getService(gridReference)));
-	}
-	catch (Exception sysEx)
-	{
-	    System.err.println("failed to bind to grid: "+sysEx);
-	    sysEx.printStackTrace(System.err);
-	    assertFailure();
-	}
+            gridVar = gridHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(gridReference)));
+        }
+        catch (Exception sysEx)
+        {
+            fail("failed to bind to grid: "+sysEx);
+            sysEx.printStackTrace(System.err);
+        }
 
-	try
-	{
-	    h = gridVar.height();
-	    w = gridVar.width();
-	}
-	catch (Exception sysEx)
-	{
-	    System.err.println("grid height/width failed: "+sysEx);
-	    sysEx.printStackTrace(System.err);
-	    assertFailure();
-	}
+        try
+        {
+            h = gridVar.height();
+            w = gridVar.width();
+        }
+        catch (Exception sysEx)
+        {
+            fail("grid height/width failed: "+sysEx);
+            sysEx.printStackTrace(System.err);
+        }
 
-	System.out.println("height is "+h);
-	System.out.println("width  is "+w);
+        System.out.println("height is "+h);
+        System.out.println("width  is "+w);
 
-	try
-	{
-	    gridVar.set(2, 4, 123, myControl);
-	    v = gridVar.get(2, 4, myControl);
-	}
-	catch (Exception sysEx)
-	{
-	    System.err.println("grid set/get failed: "+sysEx);
-	    sysEx.printStackTrace(System.err);
-	    assertFailure();
-	}
+        try
+        {
+            gridVar.set(2, 4, 123, myControl);
+            v = gridVar.get(2, 4, myControl);
+        }
+        catch (Exception sysEx)
+        {
+            fail("grid set/get failed: "+sysEx);
+            sysEx.printStackTrace(System.err);
+        }
 
-	// no problem setting and getting the elememt:
-	System.out.println("grid[2,4] is "+v);
+        // no problem setting and getting the elememt:
+        System.out.println("grid[2,4] is "+v);
 
-	// sanity check: make sure we got the value 123 back:
-	if (v != 123)
-	{
-	    assertFailure();
-	    // oops - we didn't:
-	    System.err.println("something went seriously wrong");
+        // sanity check: make sure we got the value 123 back:
+        if (v != 123)
+        {
+            fail();
+            System.err.println("something went seriously wrong");
 
-	    try
-	    {
-		current.rollback();
-	    }
-	    catch (Exception e)
-	    {
-		System.err.println("rollback error: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	    }
+            try
+            {
+                current.rollback();
+            }
+            catch (Exception e)
+            {
+                fail("rollback error: "+e);
+                e.printStackTrace(System.err);
+            }
 
-	    assertFailure();
-	}
-	else
-	{
-	    System.out.println("Committing transaction.");
+            fail();
+        }
+        else
+        {
+            System.out.println("Committing transaction.");
 
-	    try
-	    {
-		current.commit(true);
+            try
+            {
+                current.commit(true);
+            }
+            catch (Exception e)
+            {
+                fail("commit error: "+e);
+                e.printStackTrace(System.err);
+            }
 
-		assertSuccess();
-	    }
-	    catch (Exception e)
-	    {
-		System.err.println("commit error: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	    }
+            myOA.destroy();
+            myORB.shutdown();
 
-	    myOA.destroy();
-	    myORB.shutdown();
-
-	    System.out.println("Test completed successfully.");
-	}
+            System.out.println("Test completed successfully.");
+        }
     }
-
-    public static void main(String[] args)
-    {
-	CurrentTest ct = new CurrentTest();
-	ct.initialise(null, null, args, new LocalHarness());
-	ct.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/SuspendResume.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/SuspendResume.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/SuspendResume.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,58 +31,38 @@
 
 package com.hp.mwtests.ts.jts.remote.current;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CORBA.IntHolder;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class SuspendResume extends Test
+public class SuspendResume
 {
-
-    public void run (String[] args)
+    @Test
+    public void test() throws Exception
     {
         ORB myORB = null;
         RootOA myOA = null;
 
-        try
-        {
-            myORB = ORB.getInstance("test");
-            myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-            myORB.initORB(args, null);
-            myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-            ORBManager.setORB(myORB);
-            ORBManager.setPOA(myOA);
-        }
-        catch (Exception e)
-        {
-            System.err.println("Initialisation failed: " + e);
-            assertFailure();
-        }
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
+
         CurrentImple current = OTSImpleManager.current();
         Control myControl = null;
-        
+
         System.out.println("Beginning transaction.");
 
         try
@@ -91,16 +71,12 @@
 
             myControl = current.get_control();
 
-            if (myControl == null)
-            {
-                System.err.println("Error - control is null!");
-                assertFailure();
-            }
+            assertNotNull( myControl );
         }
         catch (Exception sysEx)
         {
             sysEx.printStackTrace(System.err);
-            assertFailure();
+            fail();
         }
 
         System.out.println("Committing transaction.");
@@ -110,14 +86,11 @@
             current.commit(true);
 
             current.resume(myControl);
-            
-            assertSuccess();
         }
         catch (Exception e)
         {
-            System.err.println("commit error: " + e);
+            fail("commit error: " + e);
             e.printStackTrace(System.err);
-            assertFailure();
         }
 
         myOA.destroy();
@@ -125,11 +98,4 @@
 
         System.out.println("Test completed successfully.");
     }
-
-    public static void main (String[] args)
-    {
-        SuspendResume ct = new SuspendResume();
-        ct.initialise(null, null, args, new LocalHarness());
-        ct.runTest();
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,183 +31,140 @@
 
 package com.hp.mwtests.ts.jts.remote.explicitinterposition;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.ExplicitInterposition;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import com.hp.mwtests.ts.jts.TestModule.SetGet;
+import com.hp.mwtests.ts.jts.TestModule.SetGetHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CORBA.IntHolder;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class ExplicitInterClient extends Test
+public class ExplicitInterClient
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	CurrentImple current = OTSImpleManager.current();
-	Control theControl = null;
-	String objectReference = "/tmp/object.ref";
-	String serverName = "SetGet";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    objectReference = "C:\\temp\\object.ref";
-	}
+        CurrentImple current = OTSImpleManager.current();
+        Control theControl = null;
+        String objectReference = "/tmp/object.ref";
+        String serverName = "SetGet";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-object") == 0)
-		objectReference = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ExplicitInterClient [-object <reference>] [-help]");
-		assertFailure();
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            objectReference = "C:\\temp\\object.ref";
+        }
 
-	SetGet SetGetVar = null;
-	short h = 0;
 
-	try
-	{
-	    current.begin();
-	    current.begin();
-	    current.begin();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Caught exception during begin: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        SetGet SetGetVar = null;
+        short h = 0;
 
-	try
-	{
-	    Services serv = new Services(myORB);
+        try
+        {
+            current.begin();
+            current.begin();
+            current.begin();
+        }
+        catch (Exception e)
+        {
+            fail("Caught exception during begin: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	    SetGetVar = SetGetHelper.narrow(myORB.orb().string_to_object(getService(objectReference)));
-	}
-	catch (Exception ex)
-	{
-	    System.err.println("Failed to bind to setget server: "+ex);
-	    ex.printStackTrace(System.err);
-	    assertFailure();
-	}
+        try
+        {
+            Services serv = new Services(myORB);
 
-	try
-	{
-	    theControl = current.get_control();
+            SetGetVar = SetGetHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(objectReference)));
+        }
+        catch (Exception ex)
+        {
+            fail("Failed to bind to setget server: "+ex);
+            ex.printStackTrace(System.err);
+        }
 
-	    SetGetVar.set((short) 2, theControl);
-	    //	    SetGetVar.set((short) 2, theControl);
+        try
+        {
+            theControl = current.get_control();
 
-	    theControl = null;
+            SetGetVar.set((short) 2, theControl);
+            //	    SetGetVar.set((short) 2, theControl);
 
-	    System.out.println("Set value.");
-	}
-	catch (Exception ex1)
-	{
-	    System.err.println("Unexpected system exception during set: "+ex1);
-	    ex1.printStackTrace(System.err);
-	    assertFailure();
-	}
+            theControl = null;
 
-	try
-	{
-	    System.out.println("committing first nested action");
+            System.out.println("Set value.");
+        }
+        catch (Exception ex1)
+        {
+            fail("Unexpected system exception during set: "+ex1);
+            ex1.printStackTrace(System.err);
+        }
 
-	    current.commit(true);
+        try
+        {
+            System.out.println("committing first nested action");
 
-	    //	    SetGetVar.set((short) 4, current.get_control());
+            current.commit(true);
 
-	    System.out.println("committing second nested action");
+            //	    SetGetVar.set((short) 4, current.get_control());
 
-	    current.commit(true);
-	}
-	catch (Exception sysEx)
-	{
-	    System.err.println("Caught unexpected exception during commit: "+sysEx);
-	    sysEx.printStackTrace(System.err);
-	    assertFailure();
-	}
+            System.out.println("committing second nested action");
 
-	try
-	{
-	    theControl = current.get_control();
+            current.commit(true);
+        }
+        catch (Exception sysEx)
+        {
+            fail("Caught unexpected exception during commit: "+sysEx);
+            sysEx.printStackTrace(System.err);
+        }
 
-	    h = SetGetVar.get(theControl);
+        try
+        {
+            theControl = current.get_control();
 
-	    theControl = null;
+            h = SetGetVar.get(theControl);
 
-	    System.out.println("Got value.");
-	}
-	catch (Exception ex2)
-	{
-	    System.err.println("Unexpected system exception during get: "+ex2);
-	    ex2.printStackTrace(System.err);
-	    assertFailure();
-	}
+            theControl = null;
 
-	try
-	{
-	    current.commit(true);
+            System.out.println("Got value.");
+        }
+        catch (Exception ex2)
+        {
+            fail("Unexpected system exception during get: "+ex2);
+            ex2.printStackTrace(System.err);
+        }
 
-	    System.out.println("committed top-level action");
+        try
+        {
+            current.commit(true);
 
-	    assertSuccess();
-	}
-	catch (Exception ep)
-	{
-	    System.err.println("Caught commit exception for top-level action: "+ep);
-	    ep.printStackTrace(System.err);
-	    assertFailure();
-	}
+            System.out.println("committed top-level action");
+        }
+        catch (Exception ep)
+        {
+            fail("Caught commit exception for top-level action: "+ep);
+            ep.printStackTrace(System.err);
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main(String[] args)
-    {
-	ExplicitInterClient eic = new ExplicitInterClient();
-	eic.initialise(null, null, args, new LocalHarness());
-	eic.runTest();
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,211 +31,167 @@
 
 package com.hp.mwtests.ts.jts.remote.grid;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
 import com.arjuna.ats.jts.OTSManager;
 
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
+import com.hp.mwtests.ts.jts.TestModule.grid;
+import com.hp.mwtests.ts.jts.TestModule.gridHelper;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CORBA.IntHolder;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class GridClient extends Test
+public class GridClient
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	TransactionFactory theOTS = null;
-	Control myControl = null;
-	grid gridVar = null;
-	int h = -1, w = -1, v = -1;
-	String gridReference = "/tmp/grid.ref";
-	String serverName = "Grid";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    gridReference = "C:\\temp\\grid.ref";
-	}
+        TransactionFactory theOTS = null;
+        Control myControl = null;
+        grid gridVar = null;
+        int h = -1, w = -1, v = -1;
+        String gridReference = "/tmp/grid.ref";
+        String serverName = "Grid";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: GridClient [-server <name>] [-reffile <file>] [-help]");
-		System.exit(0);
-	    }
-	    if (args[i].compareTo("-server") == 0)
-	    {
-		System.out.println("Sorry, server name not supported by ORB.");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-reffile") == 0)
-		gridReference = args[i+1];
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            gridReference = "C:\\temp\\grid.ref";
+        }
 
-	Services serv = new Services(myORB);
+        Services serv = new Services(myORB);
 
-	try
-	{
-	    String[] params = new String[1];
+        try
+        {
+            String[] params = new String[1];
 
-	    params[0] = Services.otsKind;
+            params[0] = Services.otsKind;
 
-	    org.omg.CORBA.Object obj = serv.getService(Services.transactionService, params);
+            org.omg.CORBA.Object obj = serv.getService(Services.transactionService, params);
 
-	    params = null;
-	    theOTS =  TransactionFactoryHelper.narrow(obj);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Unexpected bind exception: "+e);
-	    System.exit(1);
-	}
+            params = null;
+            theOTS =  TransactionFactoryHelper.narrow(obj);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected bind exception: "+e);
+        }
 
-	System.out.println("Creating transaction.");
+        System.out.println("Creating transaction.");
 
-	try
-	{
-	    myControl = theOTS.create(0);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Create call failed: "+e);
-	    e.printStackTrace();
-	    System.exit(1);
-	}
+        try
+        {
+            myControl = theOTS.create(0);
+        }
+        catch (Exception e)
+        {
+            fail("Create call failed: "+e);
+            e.printStackTrace();
+        }
 
-	try
-	{
-	    gridVar = gridHelper.narrow(serv.getService(gridReference, null, Services.FILE));
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Grid bind failed: "+e);
-	    System.exit(1);
-	}
+        try
+        {
+            gridVar = gridHelper.narrow(serv.getService(gridReference, null, Services.FILE));
+        }
+        catch (Exception e)
+        {
+            fail("Grid bind failed: "+e);
+        }
 
-	try
-	{
-	    h = gridVar.height();
-	    w = gridVar.width();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Grid invocation failed: "+e);
-	    System.exit(1);
-	}
+        try
+        {
+            h = gridVar.height();
+            w = gridVar.width();
+        }
+        catch (Exception e)
+        {
+            fail("Grid invocation failed: "+e);
+        }
 
-	System.out.println("height is "+h);
-	System.out.println("width  is "+w);
+        System.out.println("height is "+h);
+        System.out.println("width  is "+w);
 
-	try
-	{
-	    System.out.println("calling set");
+        try
+        {
+            System.out.println("calling set");
 
-	    gridVar.set(2, 4, 123, myControl);
+            gridVar.set(2, 4, 123, myControl);
 
-	    System.out.println("calling get");
+            System.out.println("calling get");
 
-	    v = gridVar.get(2, 4, myControl);
-	}
-	catch (Exception sysEx)
-	{
-	    System.err.println("Grid set/get failed: "+sysEx);
-	    System.exit(1);
-	}
+            v = gridVar.get(2, 4, myControl);
+        }
+        catch (Exception sysEx)
+        {
+            fail("Grid set/get failed: "+sysEx);
+        }
 
-	// no problem setting and getting the elememt:
-	System.out.println("grid[2,4] is "+v);
+        // no problem setting and getting the elememt:
+        System.out.println("grid[2,4] is "+v);
 
-	// sanity check: make sure we got the value 123 back:
-	if (v != 123)
-	{
-	    // oops - we didn't:
-	    System.err.println("something went seriously wrong");
+        // sanity check: make sure we got the value 123 back:
+        if (v != 123)
+        {
+            // oops - we didn't:
+            fail("something went seriously wrong");
 
-	    try
-	    {
-		myControl.get_terminator().rollback();
-	    }
-	    catch (Exception e)
-	    {
-	    }
+            try
+            {
+                myControl.get_terminator().rollback();
+            }
+            catch (Exception e)
+            {
+            }
+        }
+        else
+        {
+            System.out.println("Committing transaction.");
 
-	    System.exit(1);
-	}
-	else
-	{
-	    System.out.println("Committing transaction.");
+            try
+            {
+                Terminator handle = myControl.get_terminator();
 
-	    try
-	    {
-		Terminator handle = myControl.get_terminator();
+                handle.commit(true);
+            }
+            catch (Exception sysEx)
+            {
+                fail("Transaction commit error: "+sysEx);
+            }
+        }
 
-		handle.commit(true);
-	    }
-	    catch (Exception sysEx)
-	    {
-		System.err.println("Transaction commit error: "+sysEx);
-		System.exit(1);
-	    }
-	}
+        /*
+       * OTSArjuna specific call to tell the system
+       * that we are finished with this transaction.
+       */
 
-	/*
-	 * OTSArjuna specific call to tell the system
-	 * that we are finished with this transaction.
-	 */
+        try
+        {
+            OTSManager.destroyControl(myControl);
+        }
+        catch (Exception e)
+        {
+            fail("Caught destroy exception: "+e);
+        }
 
-	try
-	{
-	    OTSManager.destroyControl(myControl);
-	}
-	catch (Exception e)
-	{
-	    System.out.println("Caught destroy exception: "+e);
-	    System.exit(0);
-	}
+        myOA.destroy();
+        myORB.shutdown();
 
-	myOA.destroy();
-	myORB.shutdown();
-
-	System.out.println("Test completed successfully.");
+        System.out.println("Test completed successfully.");
     }
-
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,137 +31,87 @@
 
 package com.hp.mwtests.ts.jts.remote.hammer;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.HammerHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.OTSManager;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
-
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class DistributedHammer1 extends Test
+public class DistributedHammer1
 {
     private final static int   START_VALUE_1 = 10;
     private final static int   START_VALUE_2 = 101;
 
     private final static int   EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
 
-    public void run (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String server1 = "/tmp/hammer1.ref";
-	String server2 = "/tmp/hammer2.ref";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    server1 = "C:\\temp\\hammer1.ref";
-	    server2 = "C:\\temp\\hammer2.ref";
-	}
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffiles") == 0)
-            {
-                server1 = args[i+1];
-                server2 = args[i+2];
-            }
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: DistributedHammer1 [-reffiles <file1> <file2>] [-help]");
-		System.exit(0);
-	    }
-	}
+        String server1 = "/tmp/hammer1.ref";
+        String server2 = "/tmp/hammer2.ref";
 
-	try
-	{
-	    Services serv = new Services(myORB);
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            server1 = "C:\\temp\\hammer1.ref";
+            server2 = "C:\\temp\\hammer2.ref";
+        }
 
-	    DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server1)));
-	    DistributedHammerWorker1.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server2)));
+        try
+        {
+            Services serv = new Services(myORB);
 
-	    if (! DistributedHammerWorker1.hammerObject_1.set(START_VALUE_1, null))
-            {
-		System.out.println("m set1 : failed");
-                assertFailure();
-            }
-	    if (! DistributedHammerWorker1.hammerObject_2.set(START_VALUE_2, null))
-            {
-		System.out.println("m set2 : failed");
-                assertFailure();
-            }
+            DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server1)));
+            DistributedHammerWorker1.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server2)));
 
-	    DistributedHammerWorker1.get12('m', 0);
-	    DistributedHammerWorker1.get21('m', 0);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("DistributedHammer1: "+e);
-            e.printStackTrace(System.err);
+            assertTrue( DistributedHammerWorker1.hammerObject_1.set(START_VALUE_1, null) );
 
-	    assertFailure();
-	}
+            assertTrue( DistributedHammerWorker1.hammerObject_2.set(START_VALUE_2, null) );
 
-	for (int i = 0; i < 100; i++)
-	    DistributedHammerWorker1.randomOperation('1', 0);
+            DistributedHammerWorker1.get12('m', 0);
+            DistributedHammerWorker1.get21('m', 0);
+        }
+        catch (Exception e)
+        {
+            fail("DistributedHammer1: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	DistributedHammerWorker1.get12('m', 0);
-	DistributedHammerWorker1.get21('m', 0);
+        for (int i = 0; i < 100; i++)
+            DistributedHammerWorker1.randomOperation('1', 0);
 
+        DistributedHammerWorker1.get12('m', 0);
+        DistributedHammerWorker1.get21('m', 0);
+
         IntHolder value1 = new IntHolder(0);
-	IntHolder value2 = new IntHolder(0);
+        IntHolder value2 = new IntHolder(0);
 
-        boolean res = DistributedHammerWorker1.get1(value1) | DistributedHammerWorker1.get2(value2);
+        assertTrue( DistributedHammerWorker1.get1(value1) | DistributedHammerWorker1.get2(value2) );
 
-        if ( (res) && ( (value1.value + value2.value) == EXPECTED_RESULT ) )
-	    assertSuccess();
-	else
-	    assertFailure();
+        assertEquals(EXPECTED_RESULT, (value1.value + value2.value) );
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-
-    public static void main(String[] args)
-    {
-        DistributedHammer1 client = new DistributedHammer1();
-        client.initialise(null, null, args, new LocalHarness());
-        client.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,150 +31,100 @@
 
 package com.hp.mwtests.ts.jts.remote.hammer;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.HammerHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.OTSManager;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
-
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class DistributedHammer2 extends Test
+public class DistributedHammer2
 {
-	private final static int   START_VALUE_1 = 10;
-	private final static int   START_VALUE_2 = 101;
+    private final static int   START_VALUE_1 = 10;
+    private final static int   START_VALUE_2 = 101;
 
-	private final static int   EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
+    private final static int   EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
 
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String server1 = "/tmp/hammer1.ref";
-	String server2 = "/tmp/hammer2.ref";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    server1 = "C:\\temp\\hammer1.ref";
-	    server2 = "C:\\temp\\hammer2.ref";
-	}
+        String server1 = "/tmp/hammer1.ref";
+        String server2 = "/tmp/hammer2.ref";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile1") == 0)
-		server1 = args[i+1];
-	    if (args[i].compareTo("-reffile2") == 0)
-		server2 = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: DistributedHammer2 [-reffile1 <file>] [-reffile2 <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            server1 = "C:\\temp\\hammer1.ref";
+            server2 = "C:\\temp\\hammer2.ref";
+        }
 
-	try
-	{
-	    Services serv = new Services(myORB);
+        try
+        {
+            Services serv = new Services(myORB);
 
-		DistributedHammerWorker2.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server1)));
-		DistributedHammerWorker2.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server2)));
+            DistributedHammerWorker2.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server1)));
+            DistributedHammerWorker2.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server2)));
 
-	    if (! DistributedHammerWorker2.hammerObject_1.set(START_VALUE_1, null))
-		{
-			System.out.println("m set1 : failed");
-			assertFailure();
-		}
-	    if (! DistributedHammerWorker2.hammerObject_2.set(START_VALUE_2, null))
-		{
-			System.out.println("m set2 : failed");
-			assertFailure();
-		}
+            assertTrue( DistributedHammerWorker2.hammerObject_1.set(START_VALUE_1, null) );
 
-	    DistributedHammerWorker2.get12('m', 0);
-	    DistributedHammerWorker2.get21('m', 0);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("DistributedHammer2: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	}
+            assertTrue( DistributedHammerWorker2.hammerObject_2.set(START_VALUE_2, null) );
 
-	DHThreadObject2 thr1 = new DHThreadObject2('1');
-	DHThreadObject2 thr2 = new DHThreadObject2('2');
+            DistributedHammerWorker2.get12('m', 0);
+            DistributedHammerWorker2.get21('m', 0);
+        }
+        catch (Exception e)
+        {
+            fail("DistributedHammer2: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	thr1.start();
-	thr2.start();
+        DHThreadObject2 thr1 = new DHThreadObject2('1');
+        DHThreadObject2 thr2 = new DHThreadObject2('2');
 
-	try
-	{
-	    thr1.join();
-	    thr2.join();
-	}
-	catch (InterruptedException e)
-	{
-		System.err.println("DistributedHammer2: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	}
+        thr1.start();
+        thr2.start();
 
-	DistributedHammerWorker2.get12('m', 0);
-	DistributedHammerWorker2.get21('m', 0);
+        try
+        {
+            thr1.join();
+            thr2.join();
+        }
+        catch (InterruptedException e)
+        {
+            fail("DistributedHammer2: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	IntHolder value1 = new IntHolder(0);
-	IntHolder value2 = new IntHolder(0);
-	boolean res = DistributedHammerWorker2.get1(value1) | DistributedHammerWorker2.get2(value2);
+        DistributedHammerWorker2.get12('m', 0);
+        DistributedHammerWorker2.get21('m', 0);
 
-	if ( (res) && ( (value1.value + value2.value) == EXPECTED_RESULT ) )
-		assertSuccess();
-	else
-		assertFailure();
+        IntHolder value1 = new IntHolder(0);
+        IntHolder value2 = new IntHolder(0);
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+        assertTrue( DistributedHammerWorker2.get1(value1) | DistributedHammerWorker2.get2(value2) );
 
-	public static void main(String[] args)
-	{
-		DistributedHammer2 test = new DistributedHammer2();
-		test.initialise(null, null, args, new LocalHarness());
-		test.runTest();
-	}
+        assertEquals(EXPECTED_RESULT, (value1.value + value2.value) );
+
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,147 +31,98 @@
 
 package com.hp.mwtests.ts.jts.remote.hammer;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.HammerHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-import com.arjuna.ats.jts.OTSManager;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
-
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class DistributedHammer3 extends Test
+public class DistributedHammer3
 {
-	private final static int   START_VALUE_1 = 10;
-	private final static int   START_VALUE_2 = 101;
+    private final static int   START_VALUE_1 = 10;
+    private final static int   START_VALUE_2 = 101;
 
-	private final static int   EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
+    private final static int   EXPECTED_RESULT = START_VALUE_1 + START_VALUE_2;
 
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String server1 = "/tmp/hammer1.ref";
-	String server2 = "/tmp/hammer2.ref";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    server1 = "C:\\temp\\hammer1.ref";
-	    server2 = "C:\\temp\\hammer2.ref";
-	}
+        String server1 = "/tmp/hammer1.ref";
+        String server2 = "/tmp/hammer2.ref";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile1") == 0)
-		server1 = args[i+1];
-	    if (args[i].compareTo("-reffile2") == 0)
-		server2 = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: DistributedHammer3 [-reffile1 <file>] [-reffile2 <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            server1 = "C:\\temp\\hammer1.ref";
+            server2 = "C:\\temp\\hammer2.ref";
+        }
 
-	try
-	{
-	    Services serv = new Services(myORB);
+        try
+        {
+            Services serv = new Services(myORB);
 
-		DistributedHammerWorker3.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server1)));
-		DistributedHammerWorker3.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server2)));
+            DistributedHammerWorker3.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server1)));
+            DistributedHammerWorker3.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(server2)));
 
-	    if (! DistributedHammerWorker3.hammerObject_1.set(START_VALUE_1, null))
-		{
-			System.out.println("m set1 : failed");
-			assertFailure();
-		}
-	    if (! DistributedHammerWorker3.hammerObject_2.set(START_VALUE_2, null))
-		{
-			System.out.println("m set2 : failed");
-			assertFailure();
-		}
+            assertTrue( DistributedHammerWorker3.hammerObject_1.set(START_VALUE_1, null) );
 
-	    DistributedHammerWorker3.get12(0, 0);
-	    DistributedHammerWorker3.get21(0, 0);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("DistributedHammer3: "+e);
-	    e.printStackTrace(System.err);
-		assertFailure();
-	}
+            assertTrue( DistributedHammerWorker3.hammerObject_2.set(START_VALUE_2, null) );
 
-	DHThreadObject3b thr1 = new DHThreadObject3b(1);
-	DHThreadObject3b thr2 = new DHThreadObject3b(2);
+            DistributedHammerWorker3.get12(0, 0);
+            DistributedHammerWorker3.get21(0, 0);
+        }
+        catch (Exception e)
+        {
+            fail("DistributedHammer3: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	thr1.start();
-	thr2.start();
+        DHThreadObject3b thr1 = new DHThreadObject3b(1);
+        DHThreadObject3b thr2 = new DHThreadObject3b(2);
 
-	try
-	{
-	    thr1.join();
-	    thr2.join();
-	}
-	catch (InterruptedException e)
-	{
-	    System.err.println(e);
-	}
+        thr1.start();
+        thr2.start();
 
-	DistributedHammerWorker3.get12(0, 0);
-	DistributedHammerWorker3.get21(0, 0);
+        try
+        {
+            thr1.join();
+            thr2.join();
+        }
+        catch (InterruptedException e)
+        {
+            System.err.println(e);
+        }
 
-	IntHolder value1 = new IntHolder(0);
-	IntHolder value2 = new IntHolder(0);
-	boolean res = DistributedHammerWorker3.get1(value1) | DistributedHammerWorker3.get2(value2);
+        DistributedHammerWorker3.get12(0, 0);
+        DistributedHammerWorker3.get21(0, 0);
 
-	if ( (res) && ( (value1.value + value2.value) == EXPECTED_RESULT ) )
-		assertSuccess();
-	else
-		assertFailure();
+        IntHolder value1 = new IntHolder(0);
+        IntHolder value2 = new IntHolder(0);
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+        assertTrue( DistributedHammerWorker3.get1(value1) | DistributedHammerWorker3.get2(value2) );
 
-	public static void main(String[] args)
-	{
-		DistributedHammer3 test = new DistributedHammer3();
-		test.initialise(null, null, args, new LocalHarness());
-		test.runTest();
-	}
+        assertEquals(EXPECTED_RESULT, (value1.value + value2.value));
+
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,166 +31,115 @@
 
 package com.hp.mwtests.ts.jts.remote.implicit;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import com.hp.mwtests.ts.jts.TestModule.TranGrid;
+import com.hp.mwtests.ts.jts.TestModule.TranGridHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CORBA.IntHolder;
-
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class ImplicitClient extends Test
+public class ImplicitClient
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String refFile = "/tmp/trangrid.ref";
-	String serverName = "ImplGrid";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\trangrid.ref";
-	}
+        String refFile = "/tmp/trangrid.ref";
+        String serverName = "ImplGrid";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ImplicitClient [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-marker") == 0)
-	    {
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\trangrid.ref";
+        }
 
-		System.err.println("Error - server name not supported.");
-		assertFailure();
+        CurrentImple current = OTSImpleManager.current();
 
-	    }
-	}
+        TranGrid TranGridVar = null;   // pointer the grid object that will be used.
+        short h = 0, w = 0, v = 0;
 
-	CurrentImple current = OTSImpleManager.current();
+        try
+        {
+            current.begin();
 
-	TranGrid TranGridVar = null;   // pointer the grid object that will be used.
-	short h = 0, w = 0, v = 0;
+            Services serv = new Services(myORB);
+            TranGridVar = TranGridHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(refFile)));
 
-	try
-	{
-	    current.begin();
+            try
+            {
+                h = TranGridVar.height();
+                w = TranGridVar.width();
+            }
+            catch (Exception e)
+            {
+                fail("Invocation failed: "+e);
 
-	    Services serv = new Services(myORB);
-	    TranGridVar = TranGridHelper.narrow(myORB.orb().string_to_object(getService(refFile)));
+                e.printStackTrace();
+            }
 
-	    try
-	    {
-		h = TranGridVar.height();
-		w = TranGridVar.width();
-	    }
-	    catch (Exception e)
-	    {
-		System.err.println("Invocation failed: "+e);
+            System.out.println("height is "+h);
+            System.out.println("width  is "+w);
 
-		e.printStackTrace();
+            try
+            {
+                System.out.println("calling set");
 
-		assertFailure();
-	    }
+                TranGridVar.set((short) 2, (short) 4, (short) 123);
 
-	    System.out.println("height is "+h);
-	    System.out.println("width  is "+w);
+                System.out.println("calling get");
 
-	    try
-	    {
-		System.out.println("calling set");
+                v = TranGridVar.get((short) 2, (short) 4);
+            }
+            catch (Exception sysEx)
+            {
+                fail("Grid set/get failed: "+sysEx);
+                sysEx.printStackTrace(System.err);
+            }
 
-		TranGridVar.set((short) 2, (short) 4, (short) 123);
+            // no problem setting and getting the element:
 
-		System.out.println("calling get");
+            System.out.println("trangrid[2,4] is "+v);
 
-		v = TranGridVar.get((short) 2, (short) 4);
-	    }
-	    catch (Exception sysEx)
-	    {
-		System.err.println("Grid set/get failed: "+sysEx);
-		sysEx.printStackTrace(System.err);
-		assertFailure();
-	    }
+            // sanity check: make sure we got the value 123 back:
 
-	    // no problem setting and getting the element:
+            if (v != 123)
+            {
+                // oops - we didn't:
 
-	    System.out.println("trangrid[2,4] is "+v);
+                current.rollback();
+                fail("Result not as expected");
+            }
+            else
+            {
+                current.commit(true);
+            }
+        }
+        catch (Exception e)
+        {
+            fail("Caught exception: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	    // sanity check: make sure we got the value 123 back:
+        myOA.destroy();
+        myORB.shutdown();
 
-	    if (v != 123)
-	    {
-		// oops - we didn't:
-
-		current.rollback();
-	        System.out.println("Result not as expected");
-		assertFailure();
-	    }
-	    else
-	    {
-		current.commit(true);
-		assertSuccess();
-	    }
-	}
-	catch (Exception e)
-	{
-	    System.out.println("Caught exception: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
-
-	myOA.destroy();
-	myORB.shutdown();
-
         System.out.println("Test completed.");
     }
-
-    public static void main(String[] args)
-    {
-	ImplicitClient ic = new ImplicitClient();
-	ic.initialise(null, null, args, new LocalHarness());
-	ic.runTest();
-    }
-
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/recovery/RCTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/recovery/RCTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/recovery/RCTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,220 +31,188 @@
 
 package com.hp.mwtests.ts.jts.remote.recovery;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CORBA.IntHolder;
-
-import org.omg.CosTransactions.Unavailable;
 import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class RCTest
 {
-    
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
-	boolean shouldCommit = true;
+        boolean shouldCommit = true;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-abort") == 0)
-		shouldCommit = false;
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: RCTest [-abort]");
-		System.exit(0);
-	    }
-	}
+        boolean passed = false;
+        Coordinator coord = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	boolean passed = false;
-	Coordinator coord = null;
-	ORB myORB = null;
-	RootOA myOA = null;
-	
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
-	    
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    CurrentImple current = OTSImpleManager.current();
-	    AtomicResource aImpl = new AtomicResource(shouldCommit);
-	    Resource atomicObject = aImpl.getReference();
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    System.out.println("beginning top-level transaction.");
-	    
-	    current.begin();
+            CurrentImple current = OTSImpleManager.current();
+            AtomicResource aImpl = new AtomicResource(shouldCommit);
+            Resource atomicObject = aImpl.getReference();
 
-	    Control myControl = current.get_control();
+            System.out.println("beginning top-level transaction.");
 
-	    if (myControl == null)
-	    {
-		System.err.println("Error - myControl is nil");
-		System.exit(0);
-	    }
-	    
-	    System.out.println("getting coordinator");
-	    
-	    coord = myControl.get_coordinator();
+            current.begin();
 
-	    myControl = null;
-	    
-	    System.out.println("registering resources.");
+            Control myControl = current.get_control();
 
-	    RecoveryCoordinator rc = null;
-	    
-	    try
-	    {
-		rc = coord.register_resource(atomicObject);
-	    }
-	    catch (Exception ex)
-	    {
-		System.out.println("Failed to register resources: "+ex);
-		ex.printStackTrace();
-		
-		System.exit(0);
-	    }
+            assertNotNull( myControl );
 
-	    if (rc == null)
-		System.out.println("No recovery coordinator reference.");
-	    else
-	    {
-		Status s = Status.StatusUnknown;
-		
-		try
-		{
-		    System.out.println("Attempting to use recovery coordinator.");
-		    
-		    s = rc.replay_completion(atomicObject);
-		}
-		catch (NotPrepared e)
-		{
-		    s = Status.StatusActive;
-		}
-		catch (Exception ex)
-		{
-		    System.err.println("Caught: "+ex);
-		    
-		    ex.printStackTrace();
-		    
-		    System.exit(0);
-		}
+            System.out.println("getting coordinator");
 
-		System.out.println("Got: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
+            coord = myControl.get_coordinator();
 
-		if (s == Status.StatusActive)
-		    passed = true;
-	    }
-	    
-	    System.out.println("committing top-level transaction.");
+            myControl = null;
 
-	    if (shouldCommit)
-		current.commit(true);
-	    else
-		current.rollback();
+            System.out.println("registering resources.");
 
-	    if (rc == null)
-		System.out.println("No recovery coordinator reference.");
-	    else
-	    {
-		Status s = Status.StatusUnknown;
-		
-		try
-		{
-		    System.out.println("Attempting to use recovery coordinator.");
-		
-		    s = rc.replay_completion(atomicObject);
-		}
-		catch (NotPrepared e)
-		{
-		    s = Status.StatusActive;
-		}
-		catch (Exception ex)
-		{
-		    System.err.println("Caught: "+ex);
-		    
-		    System.exit(0);
-		}
+            RecoveryCoordinator rc = null;
 
-		System.out.println("Got: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
+            try
+            {
+                rc = coord.register_resource(atomicObject);
+            }
+            catch (Exception ex)
+            {
+                fail("Failed to register resources: "+ex);
+                ex.printStackTrace();
+            }
 
-		if (passed && (s == Status.StatusRolledBack))
-		    passed = true;
-		else
-		    passed = false;
-	    }
-	}
-	catch (TRANSACTION_ROLLEDBACK  e1)
-	{
-	    System.out.println("\nTransaction RolledBack exception");
-	}
-	catch (HeuristicMixed e2)
-	{
-	    System.out.println("\nTransaction HeuristicMixed exception");
-	}
-	catch (HeuristicHazard e3)
-	{
-	    System.out.println("\nTransaction HeuristicHazard exception");
-	}	
-	catch (Exception e4)
-	{
-	    System.out.println("Caught unexpected exception: "+e4);
-	}
+            if (rc == null)
+                System.out.println("No recovery coordinator reference.");
+            else
+            {
+                Status s = Status.StatusUnknown;
 
-	System.out.println("Trying to determing final transaction outcome.");
+                try
+                {
+                    System.out.println("Attempting to use recovery coordinator.");
 
-	org.omg.CosTransactions.Status status = Status.StatusUnknown;
+                    s = rc.replay_completion(atomicObject);
+                }
+                catch (NotPrepared e)
+                {
+                    s = Status.StatusActive;
+                }
+                catch (Exception ex)
+                {
+                    fail("Caught: "+ex);
 
-	try
-	{
-	    if (coord != null)
-	    {
-		status = coord.get_status();
+                    ex.printStackTrace();
+                }
 
-		coord = null;
-	    }
-	    else
-		System.out.println("\nCould not determine action status.");
-	}
-	catch (SystemException ex1)
-	{
-	    // assume invalid reference - tx may have been garbage collected
-	}
-	catch (Exception e5)
-	{
-	    System.out.println("Caught unexpected exception:" +e5);
-	}
+                System.out.println("Got: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
 
-	System.out.println("\nFinal action status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(status));
+                if (s == Status.StatusActive)
+                    passed = true;
+            }
 
-	if (passed)
-	    System.out.println("Passed");
-	else
-	    System.out.println("Failed");
+            System.out.println("committing top-level transaction.");
 
-	myOA.destroy();
-	myORB.shutdown();
-    }
+            if (shouldCommit)
+                current.commit(true);
+            else
+                current.rollback();
 
+            if (rc == null)
+                System.out.println("No recovery coordinator reference.");
+            else
+            {
+                Status s = Status.StatusUnknown;
+
+                try
+                {
+                    System.out.println("Attempting to use recovery coordinator.");
+
+                    s = rc.replay_completion(atomicObject);
+                }
+                catch (NotPrepared e)
+                {
+                    s = Status.StatusActive;
+                }
+                catch (Exception ex)
+                {
+                    fail("Caught: "+ex);
+                }
+
+                System.out.println("Got: "+com.arjuna.ats.jts.utils.Utility.stringStatus(s));
+
+                if (passed && (s == Status.StatusRolledBack))
+                    passed = true;
+                else
+                    passed = false;
+            }
+        }
+        catch (TRANSACTION_ROLLEDBACK  e1)
+        {
+            System.out.println("\nTransaction RolledBack exception");
+        }
+        catch (HeuristicMixed e2)
+        {
+            System.out.println("\nTransaction HeuristicMixed exception");
+        }
+        catch (HeuristicHazard e3)
+        {
+            System.out.println("\nTransaction HeuristicHazard exception");
+        }
+        catch (Exception e4)
+        {
+            System.out.println("Caught unexpected exception: "+e4);
+        }
+
+        System.out.println("Trying to determing final transaction outcome.");
+
+        org.omg.CosTransactions.Status status = Status.StatusUnknown;
+
+        try
+        {
+            if (coord != null)
+            {
+                status = coord.get_status();
+
+                coord = null;
+            }
+            else
+                System.out.println("\nCould not determine action status.");
+        }
+        catch (SystemException ex1)
+        {
+            // assume invalid reference - tx may have been garbage collected
+        }
+        catch (Exception e5)
+        {
+            System.out.println("Caught unexpected exception:" +e5);
+        }
+
+        System.out.println("\nFinal action status: "+com.arjuna.ats.jts.utils.Utility.stringStatus(status));
+
+        assertTrue(passed);
+
+        myOA.destroy();
+        myORB.shutdown();
+    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,103 +31,65 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.ExplicitStackPOATie;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class ExplicitStackServer extends Test
+public class ExplicitStackServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String refFile = "/tmp/explicitstack.ref";
-	String serverName = "ExplicitStack";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\explicitstack.ref";
-	}
+        String refFile = "/tmp/explicitstack.ref";
+        String serverName = "ExplicitStack";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ExplicitStackServer [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\explicitstack.ref";
+        }
 
-	ExplicitStackPOATie theObject = new ExplicitStackPOATie (new ExplicitStackImple());
+        ExplicitStackPOATie theObject = new ExplicitStackPOATie (new ExplicitStackImple());
 
-	myOA.objectIsReady(theObject);
+        myOA.objectIsReady(theObject);
 
-	Services serv = new Services(myORB);
+        Services serv = new Services(myORB);
 
-	try
-	{
-	    registerService(refFile, myORB.orb().object_to_string(myOA.corbaReference(theObject)));
+        try
+        {
+            TestUtility.registerService(refFile, myORB.orb().object_to_string(myOA.corbaReference(theObject)));
 
-	    System.out.println("**ExplicitStackServer started**");
-	    assertReady();
-	    assertSuccess();
+            System.out.println("**ExplicitStackServer started**");
+            //assertReady();
 
-	    myOA.run();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("ExplicitStackServer caught exception: "+e);
-	    assertFailure();
-	}
+            myOA.run();
+        }
+        catch (Exception e)
+        {
+            fail("ExplicitStackServer caught exception: "+e);
+        }
 
-	myOA.shutdownObject(theObject);
+        myOA.shutdownObject(theObject);
 
-	System.out.println("**ExplicitStackServer exiting**");
+        System.out.println("**ExplicitStackServer exiting**");
     }
-
-    public static void main(String[] args)
-    {
-	ExplicitStackServer server = new ExplicitStackServer();
-	server.initialise( null, null, args, new LocalHarness() );
-	server.runTest();
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,100 +31,61 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class GridServer extends Test
+public class GridServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String gridReference = "/tmp/grid.ref";
-	String serverName = "Grid";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    gridReference = "C:\\temp\\grid.ref";
-	}
+        String gridReference = "/tmp/grid.ref";
+        String serverName = "Grid";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: GridServer [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-reffile") == 0)
-		gridReference = args[i+1];
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            gridReference = "C:\\temp\\grid.ref";
+        }
 
-	grid_i myGrid = new grid_i(100, 100);
-	Services serv = new Services(myORB);
+        grid_i myGrid = new grid_i(100, 100);
+        Services serv = new Services(myORB);
 
-	try
-	{
-	    registerService(gridReference, myORB.orb().object_to_string(myGrid.getReference()));
+        try
+        {
+            TestUtility.registerService(gridReference, myORB.orb().object_to_string(myGrid.getReference()));
 
-	    System.out.println("**Grid server started**");
-	    assertReady();
-	    assertSuccess();
+            System.out.println("**Grid server started**");
+            //assertReady();
 
-	    myOA.run();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("**GridServer caught exception: "+e);
-	    assertFailure();
-	}
+            myOA.run();
+        }
+        catch (Exception e)
+        {
+            fail("**GridServer caught exception: "+e);
+        }
 
-	myOA.shutdownObject(myGrid);
+        myOA.shutdownObject(myGrid);
 
-	System.out.println("**Grid server exiting**");
+        System.out.println("**Grid server exiting**");
     }
-
-    public static void main(String[] args)
-    {
-	GridServer gs = new GridServer();
-	gs.initialise(null, null, args, new LocalHarness());
-	gs.runTest();
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,133 +31,84 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.HammerPOATie;
+import com.hp.mwtests.ts.jts.TestModule.HammerHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class HammerServer extends Test
+public class HammerServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-            e.printStackTrace(System.err);
-            assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String refFile1 = "/tmp/hammer1.ref";
-	String refFile2 = "/tmp/hammer2.ref";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile1 = "C:\\temp\\hammer1.ref";
-	    refFile2 = "C:\\temp\\hammer2.ref";
-	}
+        String refFile1 = "/tmp/hammer1.ref";
+        String refFile2 = "/tmp/hammer2.ref";
 
-	String refFile = null;
-	int number = 0;
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile1 = "C:\\temp\\hammer1.ref";
+            refFile2 = "C:\\temp\\hammer2.ref";
+        }
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-server") == 0)
-	    {
-		if (args[i+1].compareTo("1") == 0)
-		    number = 1;
-		else
-		    number = 2;
-	    }
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: HammerServer -server <1 | 2> [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        String refFile = null;
+        int number = 0;
 
-	if ((number != 1) && (number != 2))
-	{
-	    System.out.println("Usage: HammerServer -server <1 | 2> [-reffile <file>] [-help]");
-	    assertFailure();
-	}
+        assertFalse( (number != 1) && (number != 2) );
 
-	if ( refFile == null )
-	{
-		if (number == 1)
-			refFile = refFile1;
-		else
-			refFile = refFile2;
-	}
+        if ( refFile == null )
+        {
+            if (number == 1)
+                refFile = refFile1;
+            else
+                refFile = refFile2;
+        }
 
-	HammerPOATie theObject = new HammerPOATie(new HammerObject());
+        HammerPOATie theObject = new HammerPOATie(new HammerObject());
 
-	myOA.objectIsReady(theObject);
+        myOA.objectIsReady(theObject);
 
-	Services serv = new Services(myORB);
+        Services serv = new Services(myORB);
 
-	try
-	{
-            registerService( refFile, myORB.orb().object_to_string(HammerHelper.narrow(myOA.corbaReference(theObject))) );
+        try
+        {
+            TestUtility.registerService( refFile, myORB.orb().object_to_string(HammerHelper.narrow(myOA.corbaReference(theObject))) );
 
-	    System.out.println("**HammerServer started**");
+            System.out.println("**HammerServer started**");
 
-	    System.out.println("\nIOR file: "+refFile);
+            System.out.println("\nIOR file: "+refFile);
 
-            assertSuccess();
-            assertReady();
-	    myOA.run();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("HammerServer caught exception: "+e);
+            //assertReady();
+            myOA.run();
+        }
+        catch (Exception e)
+        {
+            fail("HammerServer caught exception: "+e);
             e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        }
 
-	myOA.shutdownObject(theObject);
+        myOA.shutdownObject(theObject);
 
-	System.out.println("**HammerServer exiting**");
+        System.out.println("**HammerServer exiting**");
     }
-
-    public static void main(String[] args)
-    {
-        HammerServer server = new HammerServer();
-        server.initialise(null, null, args, new LocalHarness());
-        server.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,53 +31,34 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class ImplGridServer extends Test
+public class ImplGridServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
 	ORB myORB = null;
 	RootOA myOA = null;
 
-	try
-	{
 	    myORB = ORB.getInstance("test");
 	    myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
+	    myORB.initORB(new String[] {}, null);
 	    myOA.initOA();
 
 	    ORBManager.setORB(myORB);
 	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
 
+
 	String refFile = "/tmp/trangrid.ref";
 	String serverName = "ImplGrid";
 
@@ -86,47 +67,26 @@
 	    refFile = "C:\\temp\\trangrid.ref";
 	}
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ImplGridServer [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	}
-
 	trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
 	Services serv = new Services(myORB);
 
 	try
 	{
-	    registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
+	    TestUtility.registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
 
 	    System.out.println("**ImplGrid server started**");
 
-	    assertReady();
-	    assertSuccess();
-
+	    //assertReady();
 	    myOA.run();
 	}
 	catch (Exception e)
 	{
-	    System.err.println("ImplGrid server caught exception: "+e);
-	    assertFailure();
+	    fail("ImplGrid server caught exception: "+e);
 	}
 
 	myOA.shutdownObject(gridI);
 
 	System.out.println("**ImplGrid server exiting**");
     }
-
-    public static void main(String[] args)
-    {
-	ImplGridServer igs = new ImplGridServer();
-	igs.initialise(null, null, args, new LocalHarness());
-	igs.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,101 +31,61 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class SetGetServer extends Test
+public class SetGetServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String serverName = "SetGet";
-	String refFile = "/tmp/object.ref";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\object.ref";
-	}
+        String serverName = "SetGet";
+        String refFile = "/tmp/object.ref";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: SetGetServer [-server <name>] [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\object.ref";
+        }
 
-	setget_i impl = new setget_i();
-	Services serv = new Services(myORB);
+        setget_i impl = new setget_i();
+        Services serv = new Services(myORB);
 
-	try
-	{
-	    registerService(refFile, myORB.orb().object_to_string(impl.getReference()));
+        try
+        {
+            TestUtility.registerService(refFile, myORB.orb().object_to_string(impl.getReference()));
 
-	    System.out.println("**SetGet server started**");
+            System.out.println("**SetGet server started**");
 
-	    assertReady();
-	    assertSuccess();
+            //assertReady();
+            myOA.run();
+        }
+        catch (Exception e)
+        {
+            fail("SetGetServer caught exception: "+e);
+        }
 
-	    myOA.run();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("SetGetServer caught exception: "+e);
-	    assertFailure();
-	}
+        myOA.shutdownObject(impl);
 
-	myOA.shutdownObject(impl);
-
-	System.out.println("**Object server exiting**");
+        System.out.println("**Object server exiting**");
     }
-
-    public static void main(String[] args)
-    {
-	SetGetServer sgs = new SetGetServer();
-	sgs.initialise(null, null, args, new LocalHarness());
-	sgs.runTest();
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,104 +31,66 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.stackPOATie;
+import com.hp.mwtests.ts.jts.TestModule.stackHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class StackServer extends Test
+public class StackServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String refFile = "/tmp/stack.ref";
-	String serverName = "Stack";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\stack.ref";
-	}
+        String refFile = "/tmp/stack.ref";
+        String serverName = "Stack";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: ExplicitStackServer [-reffile <file>] [-help]");
-		System.exit(0);
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\stack.ref";
+        }
 
-	stackPOATie theStack = new stackPOATie (new StackImple());
+        stackPOATie theStack = new stackPOATie (new StackImple());
 
-	myOA.objectIsReady(theStack);
+        myOA.objectIsReady(theStack);
 
-	Services serv = new Services(myORB);
+        Services serv = new Services(myORB);
 
-	try
-	{
-	    registerService(refFile, myORB.orb().object_to_string(stackHelper.narrow(myOA.corbaReference(theStack))));
+        try
+        {
+            TestUtility.registerService(refFile, myORB.orb().object_to_string(stackHelper.narrow(myOA.corbaReference(theStack))));
 
-	    System.out.println("**StackServer started**");
-            assertReady();
-	    assertSuccess();
+            System.out.println("**StackServer started**");
+            //assertReady();
+            myOA.run();
+        }
+        catch (Exception e)
+        {
+            fail("StackServer caught exception: "+e);
+        }
 
-	    myOA.run();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("StackServer caught exception: "+e);
-	    System.exit(1);
-	}
+        myOA.shutdownObject(theStack);
 
-	myOA.shutdownObject(theStack);
-
-	System.out.println("**StackServer exiting**");
+        System.out.println("**StackServer exiting**");
     }
-
-    public static void main(String[] args)
-    {
-	StackServer ss = new StackServer();
-	ss.initialise(null, null, args, new LocalHarness());
-	ss.runTest();
-    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,107 +31,62 @@
 
 package com.hp.mwtests.ts.jts.remote.servers;
 
-import com.hp.mwtests.ts.jts.resources.*;
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
-import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
-import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
 
-import org.omg.CosTransactions.*;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
-import org.omg.CORBA.INVALID_TRANSACTION;
-
-public class TranGridServer extends Test
+public class TranGridServer
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	String serverName = "TranGrid";
-	String refFile = "/tmp/trangrid.ref";
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    refFile = "C:\\temp\\trangrid.ref";
-	}
+        String serverName = "TranGrid";
+        String refFile = "/tmp/trangrid.ref";
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-marker") == 0)
-	    {
-		System.err.println("Error - marker name not supported.");
-		System.exit(0);
-	    }
-	    if (args[i].compareTo("-reffile") == 0)
-		refFile = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: TranGridServer [-reffile <file>] [-help]");
-		assertFailure();
-	    }
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            refFile = "C:\\temp\\trangrid.ref";
+        }
 
-	trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
-	Services serv = new Services(myORB);
+        trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
+        Services serv = new Services(myORB);
 
-	try
-	{
-	    registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
+        try
+        {
+            TestUtility.registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
 
-	    System.out.println("**TranGrid server started**");
-            assertReady();
-	    assertSuccess();
+            System.out.println("**TranGrid server started**");
+            //assertReady();
 
-	    myOA.run();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("TranGrid server caught exception: "+e);
-	    assertFailure();
-	}
+            myOA.run();
+        }
+        catch (Exception e)
+        {
+            fail("TranGrid server caught exception: "+e);
+        }
 
-	myOA.shutdownObject(gridI);
+        myOA.shutdownObject(gridI);
 
-	System.out.println("**TranGrid server exiting**");
+        System.out.println("**TranGrid server exiting**");
     }
-
-    public static void main(String[] args)
-    {
-	TranGridServer tgs = new TranGridServer();
-	tgs.initialise(null, null, args, new LocalHarness());
-	tgs.runTest();
-    }
-
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,172 +31,141 @@
 
 package com.hp.mwtests.ts.jts.remote.timeout;
 
-import com.hp.mwtests.ts.jts.resources.*;
-import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
-import com.arjuna.ats.jts.extensions.*;
-
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import org.jboss.dtf.testframework.unittest.Test;
-import org.jboss.dtf.testframework.unittest.LocalHarness;
+import com.hp.mwtests.ts.jts.TestModule.SetGet;
+import com.hp.mwtests.ts.jts.TestModule.SetGetHelper;
+import com.hp.mwtests.ts.jts.resources.TestUtility;
 
 import org.omg.CosTransactions.*;
-
-import org.omg.CORBA.IntHolder;
-
-import org.omg.CosTransactions.Unavailable;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.UserException;
 import org.omg.CORBA.INVALID_TRANSACTION;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
-public class TimeoutClient extends Test
-{
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-    public void run(String[] args)
+public class TimeoutClient
+{
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        try
+        {
+            myORB = ORB.getInstance("test");
+            myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+            myORB.initORB(new String[] {}, null);
+            myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
+            ORBManager.setORB(myORB);
+            ORBManager.setPOA(myOA);
 
-	    CurrentImple current = OTSImpleManager.current();
-	    Control theControl = null;
-	    String objectReference = "/tmp/object.ref";
-	    String serverName = "SetGet";
+            CurrentImple current = OTSImpleManager.current();
+            Control theControl = null;
+            String objectReference = "/tmp/object.ref";
+            String serverName = "SetGet";
 
-	    if (System.getProperty("os.name").startsWith("Windows"))
-		objectReference = "C:\\temp\\object.ref";
+            if (System.getProperty("os.name").startsWith("Windows"))
+                objectReference = "C:\\temp\\object.ref";
 
-	    for (int i = 0; i < args.length; i++)
-	    {
-		if (args[i].compareTo("-reffile") == 0)
-		    objectReference = args[i+1];
-		if (args[i].compareTo("-help") == 0)
-		{
-		    System.out.println("Usage: TimeoutClient [-reffile <file>] [-help]");
-		    assertFailure();
-		}
-	    }
+            SetGet SetGetVar = null;
 
-	    SetGet SetGetVar = null;
+            System.out.println("Setting transaction timeout to 2 seconds.");
 
-	    System.out.println("Setting transaction timeout to 2 seconds.");
+            current.set_timeout(2);
 
-	    current.set_timeout(2);
+            current.begin();
+            current.begin();
 
-	    current.begin();
-	    current.begin();
+            try
+            {
+                Services serv = new Services(myORB);
 
-	    try
-	    {
-		Services serv = new Services(myORB);
+                SetGetVar = SetGetHelper.narrow(myORB.orb().string_to_object(TestUtility.getService(objectReference)));
+            }
+            catch (Exception e)
+            {
+                fail("Bind to object failed: "+e);
+                e.printStackTrace(System.err);
+            }
 
-		SetGetVar = SetGetHelper.narrow(myORB.orb().string_to_object(getService(objectReference)));
-	    }
-	    catch (Exception e)
-	    {
-		System.err.println("Bind to object failed: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	    }
+            try
+            {
+                theControl = current.get_control();
 
-	    try
-	    {
-		theControl = current.get_control();
+                SetGetVar.set((short) 2, theControl);
 
-		SetGetVar.set((short) 2, theControl);
+                theControl = null;
 
-		theControl = null;
+                System.out.println("Set value.");
+            }
+            catch (Exception e)
+            {
+                fail("Call to set or get failed: "+e);
+                e.printStackTrace(System.err);
+            }
 
-		System.out.println("Set value.");
-	    }
-	    catch (Exception e)
-	    {
-		System.err.println("Call to set or get failed: "+e);
-		e.printStackTrace(System.err);
-		assertFailure();
-	    }
+            try
+            {
+                System.out.println("Now sleeping for 5 seconds.");
 
-	    try
-	    {
-		System.out.println("Now sleeping for 5 seconds.");
+                Thread.sleep(5000);
+            }
+            catch (Exception e)
+            {
+            }
 
-		Thread.sleep(5000);
-	    }
-	    catch (Exception e)
-	    {
-	    }
+            System.out.println("\ncommitting nested action.");
 
-	    System.out.println("\ncommitting nested action.");
+            try
+            {
+                current.commit(true);
+                fail();
+            }
+            catch (TRANSACTION_ROLLEDBACK  e1)
+            {
+                System.out.println("Caught TransactionRolledBack");
+            }
+            catch (INVALID_TRANSACTION  e1)	/* For JacORB */
+            {
+                System.out.println("Caught InvalidTransaction");
+            }
 
-	    try
-	    {
-		current.commit(true);
-		assertFailure();
-	    }
-	    catch (TRANSACTION_ROLLEDBACK  e1)
-	    {
-		System.out.println("Caught TransactionRolledBack");
-	    }
-	    catch (INVALID_TRANSACTION  e1)	/* For JacORB */
-	    {
-		System.out.println("Caught InvalidTransaction");
-	    }
+            System.out.println("\ncommitting top-level action");
 
-	    System.out.println("\ncommitting top-level action");
+            try
+            {
+                current.commit(true);
+                fail();
+            }
+            catch (TRANSACTION_ROLLEDBACK  e2)
+            {
+                System.out.println("Caught TransactionRolledBack");
+            }
+            catch (INVALID_TRANSACTION  e3)
+            {
+                System.out.println("Caught InvalidTransaction");
+            }
+            catch (Exception e)
+            {
+                fail("Caught other exception: "+e);
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
 
-	    try
-	    {
-		current.commit(true);
-		assertFailure();
-	    }
-	    catch (TRANSACTION_ROLLEDBACK  e2)
-	    {
-		System.out.println("Caught TransactionRolledBack");
-	    }
-	    catch (INVALID_TRANSACTION  e3)
-	    {
-		System.out.println("Caught InvalidTransaction");
-	    }
-	    catch (Exception e)
-	    {
-		System.out.println("Caught other exception: "+e);
-		assertFailure();
-	    }
-	}
-	catch (Exception e)
-	{
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        System.out.println("\nTest completed successfully.");
 
-	System.out.println("\nTest completed successfully.");
-
-	myOA.destroy();
-	myORB.shutdown();
-	assertSuccess();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main(String[] args)
-    {
-	TimeoutClient tc = new TimeoutClient();
-	tc.initialise(null, null, args, new LocalHarness());
-	tc.runTest();
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -32,205 +32,164 @@
 package com.hp.mwtests.ts.jts.remote.transactionserver;
 
 import com.hp.mwtests.ts.jts.orbspecific.resources.*;
-import com.hp.mwtests.ts.jts.TestModule.*;
+import com.hp.mwtests.ts.jts.TestModule.HammerHelper;
 
 import com.arjuna.ats.jts.common.jtsPropertyManager;
 
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
 import org.omg.CosTransactions.*;
 
 import org.omg.CORBA.IntHolder;
 
-import org.omg.CosTransactions.Unavailable;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class TMClient extends Test
+public class TMClient
 {
-
-    public void run(String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	TransactionFactory theOTS = null;
-	Control topLevelControl = null;
-	Control nestedControl = null;
-	String server = "/tmp/hammer1.ref";
-	boolean slave = false;
 
-	if (System.getProperty("os.name").startsWith("Windows"))
-	{
-	    server = "C:\\temp\\hammer1.ref";
-	}
+        TransactionFactory theOTS = null;
+        Control topLevelControl = null;
+        Control nestedControl = null;
+        String server = "/tmp/hammer1.ref";
+        boolean slave = false;
 
-	for (int i = 0; i < args.length; i++)
-	{
-	    if (args[i].compareTo("-reffile") == 0)
-		server = args[i+1];
-	    if (args[i].compareTo("-help") == 0)
-	    {
-		System.out.println("Usage: TMClient [-reffile <file>] [-slave] [-help]");
-		assertFailure();
-	    }
-	    if (args[i].compareTo("-slave") == 0)
-		slave = true;
-	}
+        if (System.getProperty("os.name").startsWith("Windows"))
+        {
+            server = "C:\\temp\\hammer1.ref";
+        }
 
-	Services serv = new Services(myORB);
+        Services serv = new Services(myORB);
 
-	int resolver = com.arjuna.orbportability.common.Configuration.bindDefault();
-	String resolveService = jtsPropertyManager.getPropertyManager().getProperty(com.arjuna.orbportability.common.Environment.RESOLVE_SERVICE);
+        int resolver = com.arjuna.orbportability.common.Configuration.bindDefault();
+        String resolveService = jtsPropertyManager.getPropertyManager().getProperty(com.arjuna.orbportability.common.Environment.RESOLVE_SERVICE);
 
-	if (resolveService != null)
-	{
-	    if (resolveService.compareTo("NAME_SERVICE") == 0)
-		resolver = com.arjuna.orbportability.Services.NAME_SERVICE;
-	    else
-	    {
-		if (resolveService.compareTo("BIND_CONNECT") == 0)
-		    resolver = com.arjuna.orbportability.Services.BIND_CONNECT;
-		else
-		{
-		    if (resolveService.compareTo("FILE") == 0)
-			resolver = com.arjuna.orbportability.Services.FILE;
-		    else
-		    {
-			if (resolveService.compareTo("RESOLVE_INITIAL_REFERENCES") == 0)
-			    resolver = com.arjuna.orbportability.Services.RESOLVE_INITIAL_REFERENCES;
-		    }
-		}
-	    }
-	}
+        if (resolveService != null)
+        {
+            if (resolveService.compareTo("NAME_SERVICE") == 0)
+                resolver = com.arjuna.orbportability.Services.NAME_SERVICE;
+            else
+            {
+                if (resolveService.compareTo("BIND_CONNECT") == 0)
+                    resolver = com.arjuna.orbportability.Services.BIND_CONNECT;
+                else
+                {
+                    if (resolveService.compareTo("FILE") == 0)
+                        resolver = com.arjuna.orbportability.Services.FILE;
+                    else
+                    {
+                        if (resolveService.compareTo("RESOLVE_INITIAL_REFERENCES") == 0)
+                            resolver = com.arjuna.orbportability.Services.RESOLVE_INITIAL_REFERENCES;
+                    }
+                }
+            }
+        }
 
-	try
-	{
-	    String[] params = new String[1];
+        try
+        {
+            String[] params = new String[1];
 
-	    params[0] = Services.otsKind;
+            params[0] = Services.otsKind;
 
-	    org.omg.CORBA.Object obj = serv.getService(Services.transactionService, params, resolver);
+            org.omg.CORBA.Object obj = serv.getService(Services.transactionService, params, resolver);
 
-	    params = null;
-	    theOTS = TransactionFactoryHelper.narrow(obj);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Unexpected bind exception: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+            params = null;
+            theOTS = TransactionFactoryHelper.narrow(obj);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected bind exception: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	System.out.println("Creating transaction.");
+        System.out.println("Creating transaction.");
 
-	try
-	{
-	    topLevelControl = theOTS.create(0);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Create call failed: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        try
+        {
+            topLevelControl = theOTS.create(0);
+        }
+        catch (Exception e)
+        {
+            fail("Create call failed: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	System.out.println("Creating subtransaction.");
+        System.out.println("Creating subtransaction.");
 
-	try
-	{
-	    nestedControl = topLevelControl.get_coordinator().create_subtransaction();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Subtransaction create call failed: "+e);
+        try
+        {
+            nestedControl = topLevelControl.get_coordinator().create_subtransaction();
+        }
+        catch (Exception e)
+        {
+            System.err.println("Subtransaction create call failed: "+e);
 
-	    try
-	    {
-		topLevelControl.get_terminator().rollback();
-	    }
-	    catch (Exception ex)
-	    {
-	    }
+            try
+            {
+                topLevelControl.get_terminator().rollback();
+            }
+            catch (Exception ex)
+            {
+            }
 
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+            e.printStackTrace(System.err);
+            fail();
+        }
 
-	try
-	{
-	    DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(serv.getService(server, null, Services.FILE));
+        try
+        {
+            DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(serv.getService(server, null, Services.FILE));
 
-	    if (!DistributedHammerWorker1.hammerObject_1.incr(1, nestedControl))
-		System.out.println("Could not increment!");
-	    else
-		System.out.println("incremented.");
+            if (!DistributedHammerWorker1.hammerObject_1.incr(1, nestedControl))
+                System.out.println("Could not increment!");
+            else
+                System.out.println("incremented.");
 
-	    System.out.println("sleeping.");
+            System.out.println("sleeping.");
 
-	    Thread.sleep(20000);
+            Thread.sleep(20000);
 
-	    nestedControl.get_terminator().rollback();
+            nestedControl.get_terminator().rollback();
 
-	    if (!slave)
-	    {
-		System.out.println("master sleeping again.");
+            if (!slave)
+            {
+                System.out.println("master sleeping again.");
 
-		Thread.sleep(20000);
-	    }
+                Thread.sleep(20000);
+            }
 
-	    IntHolder value = new IntHolder(0);
+            IntHolder value = new IntHolder(0);
 
-	    org.omg.CosTransactions.PropagationContext ctx = topLevelControl.get_coordinator().get_txcontext();
+            org.omg.CosTransactions.PropagationContext ctx = topLevelControl.get_coordinator().get_txcontext();
 
-	    if (!DistributedHammerWorker1.hammerObject_1.get(value, topLevelControl))
-	    {
-		System.out.println("Could not get!");
-		assertFailure();
-	    }
-	    else
-	    {
-		System.out.println("got.");
-		assertSuccess();
-	    }
+            assertTrue( DistributedHammerWorker1.hammerObject_1.get(value, topLevelControl) );
 
-	    topLevelControl.get_terminator().rollback();
-	}
-	catch (Exception e)
-	{
-	    System.err.println("TMClient: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+            topLevelControl.get_terminator().rollback();
+        }
+        catch (Exception e)
+        {
+            fail("TMClient: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main (String[] args)
-    {
-	TMClient test = new TMClient();
-
-	test.run(args);
-    }
-
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -31,114 +31,92 @@
 
 package com.hp.mwtests.ts.jts.remote.transactionserver;
 
-import com.hp.mwtests.ts.jts.TestModule.*;
-
 import com.arjuna.orbportability.*;
 
 import com.arjuna.ats.jts.common.jtsPropertyManager;
 
 import com.arjuna.ats.internal.jts.ORBManager;
-import org.jboss.dtf.testframework.unittest.Test;
 
 import org.omg.CosTransactions.*;
 
-import org.omg.CosTransactions.Unavailable;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public class TMTest extends Test
+public class TMTest
 {
-
-    public void run (String[] args)
+    @Test
+    public void test() throws Exception
     {
-	ORB myORB = null;
-	RootOA myOA = null;
+        ORB myORB = null;
+        RootOA myOA = null;
 
-	try
-	{
-	    myORB = ORB.getInstance("test");
-	    myOA = OA.getRootOA(myORB);
+        myORB = ORB.getInstance("test");
+        myOA = OA.getRootOA(myORB);
 
-	    myORB.initORB(args, null);
-	    myOA.initOA();
+        myORB.initORB(new String[] {}, null);
+        myOA.initOA();
 
-	    ORBManager.setORB(myORB);
-	    ORBManager.setPOA(myOA);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Initialisation failed: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        ORBManager.setORB(myORB);
+        ORBManager.setPOA(myOA);
 
-	TransactionFactory theOTS = null;
-	Control topLevelControl = null;
-	Services serv = new Services(myORB);
-	int resolver = com.arjuna.orbportability.common.Configuration.bindDefault();
-	String resolveService = jtsPropertyManager.getPropertyManager().getProperty(com.arjuna.orbportability.common.Environment.RESOLVE_SERVICE);
 
-	if (resolveService != null)
-	{
-	    if (resolveService.compareTo("NAME_SERVICE") == 0)
-		resolver = com.arjuna.orbportability.Services.NAME_SERVICE;
-	    else
-	    {
-		if (resolveService.compareTo("BIND_CONNECT") == 0)
-		    resolver = com.arjuna.orbportability.Services.BIND_CONNECT;
-		else
-		{
-		    if (resolveService.compareTo("FILE") == 0)
-			resolver = com.arjuna.orbportability.Services.FILE;
-		    else
-		    {
-			if (resolveService.compareTo("RESOLVE_INITIAL_REFERENCES") == 0)
-			    resolver = com.arjuna.orbportability.Services.RESOLVE_INITIAL_REFERENCES;
-		    }
-		}
-	    }
-	}
+        TransactionFactory theOTS = null;
+        Control topLevelControl = null;
+        Services serv = new Services(myORB);
+        int resolver = com.arjuna.orbportability.common.Configuration.bindDefault();
+        String resolveService = jtsPropertyManager.getPropertyManager().getProperty(com.arjuna.orbportability.common.Environment.RESOLVE_SERVICE);
 
-	try
-	{
-	    String[] params = new String[1];
+        if (resolveService != null)
+        {
+            if (resolveService.compareTo("NAME_SERVICE") == 0)
+                resolver = com.arjuna.orbportability.Services.NAME_SERVICE;
+            else
+            {
+                if (resolveService.compareTo("BIND_CONNECT") == 0)
+                    resolver = com.arjuna.orbportability.Services.BIND_CONNECT;
+                else
+                {
+                    if (resolveService.compareTo("FILE") == 0)
+                        resolver = com.arjuna.orbportability.Services.FILE;
+                    else
+                    {
+                        if (resolveService.compareTo("RESOLVE_INITIAL_REFERENCES") == 0)
+                            resolver = com.arjuna.orbportability.Services.RESOLVE_INITIAL_REFERENCES;
+                    }
+                }
+            }
+        }
 
-	    params[0] = Services.otsKind;
+        try
+        {
+            String[] params = new String[1];
 
-	    org.omg.CORBA.Object obj = serv.getService(Services.transactionService, params, resolver);
+            params[0] = Services.otsKind;
 
-	    params = null;
-	    theOTS = TransactionFactoryHelper.narrow(obj);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Unexpected bind exception: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+            org.omg.CORBA.Object obj = serv.getService(Services.transactionService, params, resolver);
 
-	System.out.println("Creating transaction.");
+            params = null;
+            theOTS = TransactionFactoryHelper.narrow(obj);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected bind exception: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	try
-	{
-	    topLevelControl = theOTS.create(0);
-	}
-	catch (Exception e)
-	{
-	    System.err.println("Create call failed: "+e);
-	    e.printStackTrace(System.err);
-	    assertFailure();
-	}
+        System.out.println("Creating transaction.");
 
-	assertSuccess();
+        try
+        {
+            topLevelControl = theOTS.create(0);
+        }
+        catch (Exception e)
+        {
+            fail("Create call failed: "+e);
+            e.printStackTrace(System.err);
+        }
 
-	myOA.destroy();
-	myORB.shutdown();
+        myOA.destroy();
+        myORB.shutdown();
     }
-
-    public static void main (String[] args)
-    {
-	TMTest test = new TMTest();
-
-	test.run(args);
-    }
-
 }

Added: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestUtility.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2008,
+ * @author JBoss, a division of Red Hat.
+ */
+package com.hp.mwtests.ts.jts.resources;
+
+import java.io.*;
+
+/**
+ * Useful util functions for JTS tests.
+ */
+public class TestUtility
+{
+    public static String getService(String name) throws IOException
+    {
+        String returnValue = null;
+
+        BufferedReader fin = new BufferedReader(new InputStreamReader(new FileInputStream(name)));
+        returnValue = fin.readLine();
+        fin.close();
+
+        return returnValue;
+    }
+
+    public static void registerService(String name, String ior) throws IOException
+    {
+        FileOutputStream fout = new FileOutputStream(name);
+        fout.write(ior.getBytes());
+        fout.close();
+    }
+}

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TransactionalThread.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TransactionalThread.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TransactionalThread.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -36,9 +36,6 @@
 
 import org.omg.CosTransactions.*;
 
-import java.util.Random;
-import java.lang.InterruptedException;
-
 public class TransactionalThread extends Thread
 {
 

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/UtilityTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/UtilityTest.java	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/UtilityTest.java	2009-07-08 10:21:16 UTC (rev 27731)
@@ -36,17 +36,18 @@
 
 import org.omg.CosTransactions.*;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+
 public class UtilityTest
 {
-    public static void main (String[] args)
+    @Test
+    public void test()
     {
         Uid txId = new Uid();
         otid_t tid = Utility.uidToOtid(txId);
         Uid u = Utility.otidToUid(tid);
-        
-        if (txId.equals(u))
-            System.err.println("Passed.");
-        else
-            System.err.println("Failed.");
+
+        assertTrue(txId.equals(u));
     }
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -22,8 +22,6 @@
 
     <property name="modulename" value="orbportability"/>
 
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
-
     <import file="../sharedbuild.xml"/>
 
     <target name="init" depends="sharedbuild.init">

Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/common/build.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -22,8 +22,6 @@
 
     <property name="modulename" value="common"/>
 
-    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
-
     <import file="../sharedbuild.xml"/>
 
     <target name="run.tests">

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2009-07-08 10:10:15 UTC (rev 27730)
+++ labs/jbosstm/trunk/sharedbuild.xml	2009-07-08 10:21:16 UTC (rev 27731)
@@ -37,7 +37,7 @@
     <property name="global.ext.lib.dir" value="${sharedbuild.base.dir}/ext"/>
 
     <property name="global.ext.libs" value="none"/>
-    <property name="global.ext.test.libs" value="junit.jar"/>
+    <property name="global.ext.test.libs" value="junit-4.6.jar"/>
 
     <property name="excluded.classes" value=""/>
     <property name="excluded.test.classes" value=""/>

More information about the jboss-svn-commits mailing list