[jboss-svn-commits] JBL Code SVN: r29420 - in labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa: CrashRecovery02Clients1 and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Sep 21 11:16:08 EDT 2009


Author: jhalliday
Date: 2009-09-21 11:16:05 -0400 (Mon, 21 Sep 2009)
New Revision: 29420

Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client01a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client02a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client03a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client04a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client05a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client01a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client02a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client03a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client07a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client08a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client09a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client10a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client11a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client17a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client18a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client19a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client20a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client21a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client22a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client23a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client24a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client25a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client01a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client02a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client03a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client04a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client05a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client01a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client02a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client03a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client04a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client05a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client06a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client07a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client08a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client09a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client10a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client11a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client12a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client13a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client14a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client15a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client16a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client17a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client18a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client19a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client20a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client21a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client22a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client23a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client24a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client25a.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
Log:
Tuned crash recovery delays. JBTM-390


Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client02
 {
@@ -95,7 +92,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR01();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client03
 {
@@ -94,8 +91,9 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
 
+
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on
 //	it changeing the ResourceTrace to ResourceTrace.ResourceTraceUnknown

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client04
 {
@@ -94,8 +91,9 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
 
+
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on
 //	it again, changing the ResourceTrace to ResourceTrace.ResourceTraceUnknown

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client05
@@ -105,8 +102,9 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
 
+
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on
 //	it again, changing the ResourceTrace to ResourceTrace.ResourceTraceUnknown

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client06
@@ -105,8 +102,9 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
 
+
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on
 //	it again, changing the ResourceTrace to ResourceTrace.ResourceTraceUnknown

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client08
 {
@@ -97,8 +94,9 @@
 			correct = service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
 
+
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on
 //	it changeing the ResourceTrace to ResourceTrace.ResourceTraceUnknown

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client09
 {
@@ -97,7 +94,8 @@
 			correct = service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client10
 {
@@ -97,7 +94,8 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client11
@@ -107,7 +104,8 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client12
@@ -107,7 +104,8 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client14
 {
@@ -102,7 +99,8 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client15
 {
@@ -102,7 +99,8 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client16
 {
@@ -102,7 +99,8 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client17
@@ -111,7 +108,8 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery01.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client18
@@ -112,7 +109,8 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+            CrashRecoveryDelays.awaitReplayCompletionCR01();
+			
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client01a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client01a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client01a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client01a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 			correct = correct && (resourceTrace == ResourceTrace.ResourceTraceRollback);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client02a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client02a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client02a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client02a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client03a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client03a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client03a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client03a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client04a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client04a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client04a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client04a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client05a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client05a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients1/Client05a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client05a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client01a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client01a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client01a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client01a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client02a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client02a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client02a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client02a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client03a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client03a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client03a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client03a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client04a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client04a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client05a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client05a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client06a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client06a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client07a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client07a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client07a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client07a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client08a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client08a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client08a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client08a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client09a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client09a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client09a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client09a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client10a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client10a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client10a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client10a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client11a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client11a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client11a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client11a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client12a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client12a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client13a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client13a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client14a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client14a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client15a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client15a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client16a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client16a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client17a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client17a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client17a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client17a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client18a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client18a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client18a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client18a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client19a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client19a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client19a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client19a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client20a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client20a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client20a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client20a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client21a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client21a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client21a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client21a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client22a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client22a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client22a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client22a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client23a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client23a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client23a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client23a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client24a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client24a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client24a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client24a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client25a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client25a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Clients2/Client25a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery02.*;
-import org.jboss.jbossts.qa.CrashRecovery02Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client25a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR02();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client02
 {
@@ -95,7 +92,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client03
 {
@@ -94,7 +91,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client04
 {
@@ -94,7 +91,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client05
@@ -105,7 +102,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client06
@@ -105,7 +102,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client08
 {
@@ -97,7 +94,7 @@
 			correct = service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client09
 {
@@ -97,7 +94,7 @@
 			correct = service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client10
 {
@@ -97,7 +94,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client11
@@ -107,7 +104,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client12
@@ -107,7 +104,7 @@
 			correct = correct && service.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service.is_correct();
 //  after reply_completion is called the resource will have rollback called on

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client14
 {
@@ -102,7 +99,7 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client15
 {
@@ -102,7 +99,7 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 
 public class Client16
 {
@@ -102,7 +99,7 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client17
@@ -112,7 +109,7 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,7 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery04.*;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-import org.jboss.jbossts.qa.Utils.ORBInterface;
-import org.jboss.jbossts.qa.Utils.OTS;
-import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.*;
 import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Client18
@@ -112,7 +109,7 @@
 			correct = correct && service2.check_oper();
 
 // now sleep to let reply completion do its job 1 second should be more than enough
-			Thread.sleep(10 * 1000);
+			CrashRecoveryDelays.awaitReplayCompletionCR04();
 
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client01a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client01a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client01a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client01a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client02a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client02a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client02a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client02a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client03a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client03a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client03a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client03a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client04a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client04a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client04a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client04a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client05a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client05a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients1/Client05a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client05a
 {
@@ -90,7 +90,7 @@
 
 			correct = service.check_oper(checkBehaviors) && service.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace = service.get_resource_trace(0);
 

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client01a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client01a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client01a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client01a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client02a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client02a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client02a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client02a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client03a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client03a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client03a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client03a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client04a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client04a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client04a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client04a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client05a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client05a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client05a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client05a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client06a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client06a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client06a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client06a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client07a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client07a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client07a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client07a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client08a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client08a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client08a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client08a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client09a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client09a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client09a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client09a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client10a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client10a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client10a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client10a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client11a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client11a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client11a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client11a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client12a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client12a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client12a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client12a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client13a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client13a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client13a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client13a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client14a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client14a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client14a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client14a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client15a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client15a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client15a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client15a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client16a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client16a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client16a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client16a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client17a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client17a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client17a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client17a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client18a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client18a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client18a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client18a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client19a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client19a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client19a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client19a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client20a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client20a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client20a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client20a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client21a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client21a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client21a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client21a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client22a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client22a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client22a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client22a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client23a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client23a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client23a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client23a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client24a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client24a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client24a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client24a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client25a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client25a.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Clients2/Client25a.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -58,10 +58,10 @@
 
 
 import org.jboss.jbossts.qa.CrashRecovery05.*;
-import org.jboss.jbossts.qa.CrashRecovery05Utils.Delays;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
 
 public class Client25a
 {
@@ -106,7 +106,7 @@
 			correct = correct && service1.is_correct();
 			correct = correct && service2.is_correct();
 
-			Thread.sleep(Delays.replyCompletionDelay());
+			CrashRecoveryDelays.awaitReplayCompletionCR05();
 
 			ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
 			ResourceTrace resourceTrace2 = service2.get_resource_trace(0);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java	2009-09-21 13:43:11 UTC (rev 29419)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java	2009-09-21 15:16:05 UTC (rev 29420)
@@ -39,7 +39,7 @@
         awaitRecovery(2, num_clients);
     }
 
-    public static void awaitRecovery(int num_cycles, int num_clients) throws InterruptedException
+    private static void awaitRecovery(int num_cycles, int num_clients) throws InterruptedException
     {
         // Note: this assumes the client is running with the same config as the rec mgr process.
         RecoveryEnvironmentBean recoveryEnvironmentBean = recoveryPropertyManager.getRecoveryEnvironmentBean();
@@ -50,4 +50,27 @@
         System.out.println("Sleeping for " + delay + " ms.");
         Thread.sleep(delay);
     }
+
+    /////////////////
+
+    public static void awaitReplayCompletionCR01() throws InterruptedException {
+        awaitReplayCompletion(5); // was 10
+    }
+
+    public static void awaitReplayCompletionCR04() throws InterruptedException {
+        awaitReplayCompletion(5); // was 10
+    }
+
+    public static void awaitReplayCompletionCR02() throws InterruptedException {
+        awaitReplayCompletion(5); // was 60
+    }
+
+    public static void awaitReplayCompletionCR05() throws InterruptedException {
+        awaitReplayCompletion(5); // was 60
+    }
+
+    private static void awaitReplayCompletion(int seconds) throws InterruptedException
+    {
+        Thread.sleep(seconds * 1000);
+    }
 }



More information about the jboss-svn-commits mailing list