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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Feb 22 08:19:18 EST 2011


Author: jhalliday
Date: 2011-02-22 08:19:17 -0500 (Tue, 22 Feb 2011)
New Revision: 36649

Added:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java
Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/OAInterface.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_1.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_2.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_1.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_2.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery09.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery10.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery12.java
Log:
Modify qa test harness and tests to support optional in-process recovery model. JBTM-825


Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/OAInterface.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/OAInterface.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/OAInterface.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -21,6 +21,8 @@
 package org.jboss.jbossts.qa.Utils;
 
 import com.arjuna.orbportability.OA;
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CORBA.SystemException;
 import org.omg.PortableServer.Servant;
 
 /*
@@ -38,6 +40,12 @@
 {
 	private static OA _oa;
 
+    public static void initializeOA() throws InvalidName, SystemException
+    {
+        _oa = OA.getRootOA(ORBInterface.getORB());
+        _oa.initPOA();
+    }
+
 	public static void initOA()
 	{
 		_oa = OA.getRootOA(ORBInterface.getORB());

Added: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java	                        (rev 0)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates,
+ * and individual contributors as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2010,
+ * @author JBoss, by Red Hat.
+ */
+package org.jboss.jbossts.qa.junit;
+
+import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
+import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
+import com.arjuna.ats.arjuna.objectstore.StoreManager;
+import com.arjuna.ats.arjuna.recovery.RecoveryManager;
+import com.arjuna.ats.internal.jts.ORBManager;
+import com.arjuna.ats.jts.common.jtsPropertyManager;
+import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
+import org.jboss.jbossts.qa.Utils.OAInterface;
+import org.jboss.jbossts.qa.Utils.ORBInterface;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+/**
+ * Wrapper which alters crash recovery configuration of the tests, such that they use a
+ * uniq objectstore dir and in-process cr per process, rather than the previous behaviour
+ * of having a shared dir and single cr mgr process per test.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at redhat.com), 2010-04
+ */
+public class ExecutionWrapper
+{
+    private static final File recMgrFile = new File(System.getProperty("java.io.tmpdir"), "recMgrLockFile");
+
+    public static void main(String[] args) throws Exception
+    {
+        String className = args[0];
+        String[] subArgs = new String[args.length-1];
+        System.arraycopy(args, 1, subArgs, 0, args.length-1);
+
+        if(className.equals("com.arjuna.ats.arjuna.recovery.RecoveryManager"))
+        {
+            if(!recMgrFile.createNewFile()) {
+                System.err.println("Recovery manager already running?");
+                System.exit(-1);
+            }
+
+            recMgrFile.deleteOnExit();
+            System.out.println("Ready");
+            Thread.sleep(Long.MAX_VALUE);
+        }
+        else
+        {
+            int portOffset = Integer.valueOf(System.getProperty("portOffsetId"))*20;
+
+            int recoveryOrbPortBase = jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerPort();
+            int recoveryOrbPort = recoveryOrbPortBase+portOffset;
+            jtsPropertyManager.getJTSEnvironmentBean().setRecoveryManagerPort(recoveryOrbPort);
+
+            int recoveryManagerPortBase = recoveryPropertyManager.getRecoveryEnvironmentBean().getRecoveryPort();
+            int recoveryManagerPort = recoveryManagerPortBase+portOffset;
+            recoveryPropertyManager.getRecoveryEnvironmentBean().setRecoveryPort(recoveryManagerPort);
+
+            System.out.println("using ports "+recoveryOrbPort+" and "+recoveryManagerPort);
+
+            String objectStoreBaseDirBaseName = System.getProperty("ObjectStoreBaseDir");
+            File directory = new File(objectStoreBaseDirBaseName); // full path incl taskName, see TestGroupBase
+
+            File hornetqStoreDir = new File(directory, "HornetQStore");
+            //additionalCommandLineElements.add("-DHornetqJournalEnvironmentBean.storeDir="+hornetqStoreDir);
+
+
+            File ostoreDir = new File(directory, "ObjectStore");
+            BeanPopulator.getDefaultInstance(ObjectStoreEnvironmentBean.class)
+                    .setObjectStoreDir(ostoreDir.getCanonicalPath());
+            BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "communicationStore")
+                    .setObjectStoreDir(ostoreDir.getCanonicalPath());
+            BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "stateStore")
+                    .setObjectStoreDir(ostoreDir.getCanonicalPath());
+
+
+            final Properties p = new Properties();
+            p.setProperty("OAPort", ""+recoveryOrbPort);
+
+            try {
+                ORBInterface.initORB(args, p);
+                // use correct call - OAInterface.initOA swallows exception!
+                OAInterface.initializeOA();
+            } catch(Exception e) {
+                // probably recycling port allocation too fast. wait a bit and retry.
+                ORBManager.getORB().shutdown();
+                ORBManager.reset();
+                Thread.sleep(2000);
+                ORBInterface.initORB(args, p);
+                OAInterface.initializeOA();
+            }
+
+            RecoveryManager manager = RecoveryManager.manager();
+
+            Class clazz = Class.forName(className);
+
+            Method mainMethod = clazz.getMethod("main", new Class[] {subArgs.getClass()});
+
+            before();
+
+            mainMethod.invoke(null, new Object[] {subArgs});
+
+            after();
+
+            manager.terminate();
+
+            System.exit(0);
+        }
+    }
+
+    private static void before()
+    {
+        //System.out.println("before");
+    }
+
+    private static void after()
+    {
+        //System.out.println("after");
+        StoreManager.shutdown();
+    }
+}

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -44,7 +44,7 @@
 
     private final static String PROPERTIES_FILE = "TaskImpl.properties";
 
-    private final static List<String> additionalCommandLineElements = new LinkedList<String>();
+    private final static List<String> additionalGlobalCommandLineElements = new LinkedList<String>();
 
     private static Properties properties = new Properties();
     static {
@@ -136,9 +136,9 @@
     private PrintStream out;
 
     /**
-     * Name of a file to which emma code coverage should be written
+     * Elements to add to the command line.
      */
-    private String emmaCoverageFile;
+    private final List<String> additionalLocalCommandLineElements = new LinkedList<String>();
 
     /**
      * a thread which reads the task's merged stdout/stderr stream and identifies whether or not a Passed/Failed
@@ -158,9 +158,9 @@
      * @param type the type of the test either PASS_FAIL or READY
      * @param out the output stream to which output from the task's process shoudl be redirected.
      * @param timeout the timeout for the task in seconds
-     * @param emmaCoverageFile name of a file to which emma code coverage should be written
+     * @param additionalLocalCommandLineElements elements to add to the command line.
      */
-    TaskImpl(String taskName, Class clazz, TaskType type, PrintStream out, int timeout, String emmaCoverageFile)
+    TaskImpl(String taskName, Class clazz, TaskType type, PrintStream out, int timeout, List<String> additionalLocalCommandLineElements)
     {
         if(clazz == null || type == null) {
             throw new ExceptionInInitializerError("TaskImpl()<ctor> params may not be null");
@@ -171,7 +171,7 @@
         this.type = type;
         this.timeout = timeout;
         this.out = out;
-        this.emmaCoverageFile = emmaCoverageFile;
+        this.additionalLocalCommandLineElements.addAll(additionalLocalCommandLineElements);
         this.started = false;
         this.isDone = false;
         this.isTimedOut = false;
@@ -550,12 +550,9 @@
             }
         }
 
-        list.addAll(additionalCommandLineElements);
+        list.addAll(additionalLocalCommandLineElements);
 
-        if(emmaCoverageFile != null) {
-            list.add("-Demma.coverage.out.file="+emmaCoverageFile);
-            //list.add("-Demma.verbosity.level=silent");
-        }
+        list.addAll(additionalGlobalCommandLineElements);
 
         list.add(classname);
 
@@ -570,7 +567,7 @@
 
     public static void addCommandLineElement(String additionalCommandLineElement)
     {
-        additionalCommandLineElements.add(additionalCommandLineElement);
+        additionalGlobalCommandLineElements.add(additionalCommandLineElement);
     }
 
     /**

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -24,8 +24,10 @@
 import org.jboss.jbossts.qa.Utils.FileServerIORStore;
 
 import java.io.*;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Base class from which all autogenerated test suites inherit common behaviour.
@@ -41,10 +43,15 @@
     private Task recoveryManager;
 
     private final List<Task> servers = new LinkedList<Task>();
+    private final Map<String,Integer> objectStoreNamesToTaskIds = new HashMap<String,Integer>();
     private int clientCount = 0;
+    private int taskCount = 0;
 
     @Before public void setUp()
 	{
+        clientCount = 0;
+        taskCount = 0;
+
         // no need to do this here as it gets done in tearDown
         // TaskImpl.cleanupTasks();
 
@@ -68,6 +75,11 @@
         TaskImpl.cleanupTasks();
 
         servers.clear();
+        objectStoreNamesToTaskIds.clear();
+
+        try {
+            Thread.sleep(3000);
+        } catch(InterruptedException e) {}
     }
 
     /**
@@ -113,7 +125,14 @@
     }
 
     protected Task createTask(String taskName, Class clazz, Task.TaskType taskType, int timeout) {
+        return createTask(taskName, clazz, taskType, timeout, taskName);
+    }
+
+    protected Task createTask(String taskName, Class clazz, Task.TaskType taskType, int timeout, String objectStoreDirBaseName) {
+
         OutputStream out;
+        int portOffsetId = taskCount;
+        taskCount += 1;
 
         String filename = "./testoutput/"+getTestGroupName()+"/"+(testName.getMethodName() == null ? "" : testName.getMethodName())+
                 (testName.getParameterSetNumber() == null ? "" : "_paramSet"+testName.getParameterSetNumber())+"/"+taskName+"_output.txt";
@@ -128,9 +147,24 @@
             }
             out = new FileOutputStream(outFile);
 
-            File emmaCoverageFile = new File(outFile.getParentFile(), taskName+"-coverage.ec");
+            File emmaCoverageFile = new File(directory, taskName+"-coverage.ec");
 
-            return new TaskImpl(taskName, clazz, taskType, new PrintStream(out, true), timeout, emmaCoverageFile.getCanonicalPath());
+            List<String> additionalCommandLineElements = new LinkedList<String>();
+
+            additionalCommandLineElements.add("-Demma.coverage.out.file="+emmaCoverageFile);
+
+            File objectStoreBaseDir = new File(directory, objectStoreDirBaseName);
+
+            if(objectStoreNamesToTaskIds.containsKey(objectStoreDirBaseName)) {
+                portOffsetId = objectStoreNamesToTaskIds.get(objectStoreDirBaseName);
+            } else {
+                objectStoreNamesToTaskIds.put(objectStoreDirBaseName, portOffsetId);
+            }
+
+            additionalCommandLineElements.add("-DportOffsetId="+portOffsetId);
+            additionalCommandLineElements.add("-DObjectStoreBaseDir="+objectStoreBaseDir.getCanonicalPath());
+
+            return new TaskImpl(taskName, clazz, taskType, new PrintStream(out, true), timeout, additionalCommandLineElements);
         } catch (Exception e) {
             e.printStackTrace();
             Assert.fail("createTask : could not open output stream for file " + filename);

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_1.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_1.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_1.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -54,15 +54,15 @@
 	@Test public void CrashRecovery02_1_Test01()
 	{
 		setTestName("Test01");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -71,66 +71,66 @@
 	@Test public void CrashRecovery02_1_Test02()
 	{
 		setTestName("Test02");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
 	}
 
-	@Test public void CrashRecovery02_1_Test03()
+    @Test public void CrashRecovery02_1_Test03()
 	{
 		setTestName("Test03");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
 	}
 
-	@Test public void CrashRecovery02_1_Test04()
+    @Test public void CrashRecovery02_1_Test04()
 	{
 		setTestName("Test04");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
 	}
 
-	@Test public void CrashRecovery02_1_Test05()
+    @Test public void CrashRecovery02_1_Test05()
 	{
 		setTestName("Test05");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients1.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_2.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_2.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery02_2.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -54,15 +54,15 @@
 	@Test public void CrashRecovery02_2_Test01()
 	{
 		setTestName("Test01");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -71,15 +71,15 @@
 	@Test public void CrashRecovery02_2_Test02()
 	{
 		setTestName("Test02");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -88,15 +88,15 @@
 	@Test public void CrashRecovery02_2_Test03()
 	{
 		setTestName("Test03");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -105,15 +105,15 @@
 	@Test public void CrashRecovery02_2_Test04()
 	{
 		setTestName("Test04");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -122,15 +122,15 @@
 	@Test public void CrashRecovery02_2_Test05()
 	{
 		setTestName("Test05");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -139,15 +139,15 @@
 	@Test public void CrashRecovery02_2_Test06()
 	{
 		setTestName("Test06");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -156,15 +156,15 @@
 	@Test public void CrashRecovery02_2_Test07()
 	{
 		setTestName("Test07");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -173,15 +173,15 @@
 	@Test public void CrashRecovery02_2_Test08()
 	{
 		setTestName("Test08");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -190,15 +190,15 @@
 	@Test public void CrashRecovery02_2_Test09()
 	{
 		setTestName("Test09");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -207,15 +207,15 @@
 	@Test public void CrashRecovery02_2_Test10()
 	{
 		setTestName("Test10");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -224,15 +224,15 @@
 	@Test public void CrashRecovery02_2_Test11()
 	{
 		setTestName("Test11");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -241,15 +241,15 @@
 	@Test public void CrashRecovery02_2_Test12()
 	{
 		setTestName("Test12");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -258,15 +258,15 @@
 	@Test public void CrashRecovery02_2_Test13()
 	{
 		setTestName("Test13");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -275,15 +275,15 @@
 	@Test public void CrashRecovery02_2_Test14()
 	{
 		setTestName("Test14");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -292,15 +292,15 @@
 	@Test public void CrashRecovery02_2_Test15()
 	{
 		setTestName("Test15");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -309,15 +309,15 @@
 	@Test public void CrashRecovery02_2_Test16()
 	{
 		setTestName("Test16");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -326,15 +326,15 @@
 	@Test public void CrashRecovery02_2_Test17()
 	{
 		setTestName("Test17");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -343,15 +343,15 @@
 	@Test public void CrashRecovery02_2_Test18()
 	{
 		setTestName("Test18");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -360,15 +360,15 @@
 	@Test public void CrashRecovery02_2_Test19()
 	{
 		setTestName("Test19");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -377,15 +377,15 @@
 	@Test public void CrashRecovery02_2_Test20()
 	{
 		setTestName("Test20");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -394,15 +394,15 @@
 	@Test public void CrashRecovery02_2_Test21()
 	{
 		setTestName("Test21");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -411,15 +411,15 @@
 	@Test public void CrashRecovery02_2_Test22()
 	{
 		setTestName("Test22");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -428,15 +428,15 @@
 	@Test public void CrashRecovery02_2_Test23()
 	{
 		setTestName("Test23");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -445,15 +445,15 @@
 	@Test public void CrashRecovery02_2_Test24()
 	{
 		setTestName("Test24");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -462,37 +462,38 @@
 	@Test public void CrashRecovery02_2_Test25()
 	{
 		setTestName("Test25");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
 	}
 
+
 	@Test public void CrashRecovery02_2_Test26()
 	{
 		setTestName("Test26");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -502,20 +503,20 @@
 	@Test public void CrashRecovery02_2_Test27()
 	{
 		setTestName("Test27");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -525,20 +526,20 @@
 	@Test public void CrashRecovery02_2_Test28()
 	{
 		setTestName("Test28");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -548,20 +549,20 @@
 	@Test public void CrashRecovery02_2_Test29()
 	{
 		setTestName("Test29");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -571,20 +572,20 @@
 	@Test public void CrashRecovery02_2_Test30()
 	{
 		setTestName("Test30");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -594,20 +595,20 @@
 	@Test public void CrashRecovery02_2_Test31()
 	{
 		setTestName("Test31");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -617,20 +618,20 @@
 	@Test public void CrashRecovery02_2_Test32()
 	{
 		setTestName("Test32");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -640,20 +641,20 @@
 	@Test public void CrashRecovery02_2_Test33()
 	{
 		setTestName("Test33");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -663,20 +664,20 @@
 	@Test public void CrashRecovery02_2_Test34()
 	{
 		setTestName("Test34");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -686,20 +687,20 @@
 	@Test public void CrashRecovery02_2_Test35()
 	{
 		setTestName("Test35");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -709,20 +710,20 @@
 	@Test public void CrashRecovery02_2_Test36()
 	{
 		setTestName("Test36");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -732,20 +733,20 @@
 	@Test public void CrashRecovery02_2_Test37()
 	{
 		setTestName("Test37");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -755,20 +756,20 @@
 	@Test public void CrashRecovery02_2_Test38()
 	{
 		setTestName("Test38");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -778,20 +779,20 @@
 	@Test public void CrashRecovery02_2_Test39()
 	{
 		setTestName("Test39");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -801,20 +802,20 @@
 	@Test public void CrashRecovery02_2_Test40()
 	{
 		setTestName("Test40");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -824,20 +825,20 @@
 	@Test public void CrashRecovery02_2_Test41()
 	{
 		setTestName("Test41");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -847,20 +848,20 @@
 	@Test public void CrashRecovery02_2_Test42()
 	{
 		setTestName("Test42");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -870,20 +871,20 @@
 	@Test public void CrashRecovery02_2_Test43()
 	{
 		setTestName("Test43");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -893,20 +894,20 @@
 	@Test public void CrashRecovery02_2_Test44()
 	{
 		setTestName("Test44");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -916,20 +917,20 @@
 	@Test public void CrashRecovery02_2_Test45()
 	{
 		setTestName("Test45");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -939,20 +940,20 @@
 	@Test public void CrashRecovery02_2_Test46()
 	{
 		setTestName("Test46");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -962,20 +963,20 @@
 	@Test public void CrashRecovery02_2_Test47()
 	{
 		setTestName("Test47");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -985,20 +986,20 @@
 	@Test public void CrashRecovery02_2_Test48()
 	{
 		setTestName("Test48");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1008,20 +1009,20 @@
 	@Test public void CrashRecovery02_2_Test49()
 	{
 		setTestName("Test49");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1031,20 +1032,20 @@
 	@Test public void CrashRecovery02_2_Test50()
 	{
 		setTestName("Test50");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery02Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_1.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_1.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_1.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -54,15 +54,15 @@
 	@Test public void CrashRecovery05_1_Test01()
 	{
 		setTestName("Test01");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -71,15 +71,15 @@
 	@Test public void CrashRecovery05_1_Test02()
 	{
 		setTestName("Test02");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -88,15 +88,15 @@
 	@Test public void CrashRecovery05_1_Test03()
 	{
 		setTestName("Test03");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -105,15 +105,15 @@
 	@Test public void CrashRecovery05_1_Test04()
 	{
 		setTestName("Test04");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -122,15 +122,15 @@
 	@Test public void CrashRecovery05_1_Test05()
 	{
 		setTestName("Test05");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -139,15 +139,15 @@
 	@Test public void CrashRecovery05_1_Test06()
 	{
 		setTestName("Test06");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -156,15 +156,15 @@
 	@Test public void CrashRecovery05_1_Test07()
 	{
 		setTestName("Test07");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -173,15 +173,15 @@
 	@Test public void CrashRecovery05_1_Test08()
 	{
 		setTestName("Test08");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -190,15 +190,15 @@
 	@Test public void CrashRecovery05_1_Test09()
 	{
 		setTestName("Test09");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
@@ -207,18 +207,17 @@
 	@Test public void CrashRecovery05_1_Test10()
 	{
 		setTestName("Test10");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(3)", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(3)", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients1.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
 	}
-
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_2.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_2.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery05_2.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -54,15 +54,15 @@
 	@Test public void CrashRecovery05_2_Test001()
 	{
 		setTestName("Test001");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -71,15 +71,15 @@
 	@Test public void CrashRecovery05_2_Test002()
 	{
 		setTestName("Test002");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -88,15 +88,15 @@
 	@Test public void CrashRecovery05_2_Test003()
 	{
 		setTestName("Test003");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -105,15 +105,15 @@
 	@Test public void CrashRecovery05_2_Test004()
 	{
 		setTestName("Test004");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -122,15 +122,15 @@
 	@Test public void CrashRecovery05_2_Test005()
 	{
 		setTestName("Test005");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -139,15 +139,15 @@
 	@Test public void CrashRecovery05_2_Test006()
 	{
 		setTestName("Test006");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -156,15 +156,15 @@
 	@Test public void CrashRecovery05_2_Test007()
 	{
 		setTestName("Test007");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -173,15 +173,15 @@
 	@Test public void CrashRecovery05_2_Test008()
 	{
 		setTestName("Test008");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -190,15 +190,15 @@
 	@Test public void CrashRecovery05_2_Test009()
 	{
 		setTestName("Test009");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -207,15 +207,15 @@
 	@Test public void CrashRecovery05_2_Test010()
 	{
 		setTestName("Test010");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -224,15 +224,15 @@
 	@Test public void CrashRecovery05_2_Test011()
 	{
 		setTestName("Test011");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -241,15 +241,15 @@
 	@Test public void CrashRecovery05_2_Test012()
 	{
 		setTestName("Test012");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -258,15 +258,15 @@
 	@Test public void CrashRecovery05_2_Test013()
 	{
 		setTestName("Test013");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -275,15 +275,15 @@
 	@Test public void CrashRecovery05_2_Test014()
 	{
 		setTestName("Test014");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -292,15 +292,15 @@
 	@Test public void CrashRecovery05_2_Test015()
 	{
 		setTestName("Test015");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -309,15 +309,15 @@
 	@Test public void CrashRecovery05_2_Test016()
 	{
 		setTestName("Test016");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -326,15 +326,15 @@
 	@Test public void CrashRecovery05_2_Test017()
 	{
 		setTestName("Test017");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -343,15 +343,15 @@
 	@Test public void CrashRecovery05_2_Test018()
 	{
 		setTestName("Test018");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -360,15 +360,15 @@
 	@Test public void CrashRecovery05_2_Test019()
 	{
 		setTestName("Test019");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -377,15 +377,15 @@
 	@Test public void CrashRecovery05_2_Test020()
 	{
 		setTestName("Test020");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -394,15 +394,15 @@
 	@Test public void CrashRecovery05_2_Test021()
 	{
 		setTestName("Test021");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -411,15 +411,15 @@
 	@Test public void CrashRecovery05_2_Test022()
 	{
 		setTestName("Test022");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -428,15 +428,15 @@
 	@Test public void CrashRecovery05_2_Test023()
 	{
 		setTestName("Test023");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -445,15 +445,15 @@
 	@Test public void CrashRecovery05_2_Test024()
 	{
 		setTestName("Test024");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -462,37 +462,38 @@
 	@Test public void CrashRecovery05_2_Test025()
 	{
 		setTestName("Test025");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
 	}
 
+
 	@Test public void CrashRecovery05_2_Test026()
 	{
 		setTestName("Test026");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -502,20 +503,20 @@
 	@Test public void CrashRecovery05_2_Test027()
 	{
 		setTestName("Test027");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -525,20 +526,20 @@
 	@Test public void CrashRecovery05_2_Test028()
 	{
 		setTestName("Test028");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -548,20 +549,20 @@
 	@Test public void CrashRecovery05_2_Test029()
 	{
 		setTestName("Test029");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -571,20 +572,20 @@
 	@Test public void CrashRecovery05_2_Test030()
 	{
 		setTestName("Test030");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -594,20 +595,20 @@
 	@Test public void CrashRecovery05_2_Test031()
 	{
 		setTestName("Test031");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -617,20 +618,20 @@
 	@Test public void CrashRecovery05_2_Test032()
 	{
 		setTestName("Test032");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -640,20 +641,20 @@
 	@Test public void CrashRecovery05_2_Test033()
 	{
 		setTestName("Test033");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -663,20 +664,20 @@
 	@Test public void CrashRecovery05_2_Test034()
 	{
 		setTestName("Test034");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -686,20 +687,20 @@
 	@Test public void CrashRecovery05_2_Test035()
 	{
 		setTestName("Test035");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -709,20 +710,20 @@
 	@Test public void CrashRecovery05_2_Test036()
 	{
 		setTestName("Test036");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -732,20 +733,20 @@
 	@Test public void CrashRecovery05_2_Test037()
 	{
 		setTestName("Test037");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -755,20 +756,20 @@
 	@Test public void CrashRecovery05_2_Test038()
 	{
 		setTestName("Test038");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -778,20 +779,20 @@
 	@Test public void CrashRecovery05_2_Test039()
 	{
 		setTestName("Test039");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -801,20 +802,20 @@
 	@Test public void CrashRecovery05_2_Test040()
 	{
 		setTestName("Test040");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -824,20 +825,20 @@
 	@Test public void CrashRecovery05_2_Test041()
 	{
 		setTestName("Test041");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -847,20 +848,20 @@
 	@Test public void CrashRecovery05_2_Test042()
 	{
 		setTestName("Test042");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -870,20 +871,20 @@
 	@Test public void CrashRecovery05_2_Test043()
 	{
 		setTestName("Test043");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -893,20 +894,20 @@
 	@Test public void CrashRecovery05_2_Test044()
 	{
 		setTestName("Test044");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -916,20 +917,20 @@
 	@Test public void CrashRecovery05_2_Test045()
 	{
 		setTestName("Test045");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -939,20 +940,20 @@
 	@Test public void CrashRecovery05_2_Test046()
 	{
 		setTestName("Test046");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -962,20 +963,20 @@
 	@Test public void CrashRecovery05_2_Test047()
 	{
 		setTestName("Test047");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -985,20 +986,20 @@
 	@Test public void CrashRecovery05_2_Test048()
 	{
 		setTestName("Test048");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1008,20 +1009,20 @@
 	@Test public void CrashRecovery05_2_Test049()
 	{
 		setTestName("Test049");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1031,38 +1032,39 @@
 	@Test public void CrashRecovery05_2_Test050()
 	{
 		setTestName("Test050");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
 		server3.terminate();
 	}
 
+
 	@Test public void CrashRecovery05_2_Test051()
 	{
 		setTestName("Test051");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1071,15 +1073,15 @@
 	@Test public void CrashRecovery05_2_Test052()
 	{
 		setTestName("Test052");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1088,15 +1090,15 @@
 	@Test public void CrashRecovery05_2_Test053()
 	{
 		setTestName("Test053");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1105,15 +1107,15 @@
 	@Test public void CrashRecovery05_2_Test054()
 	{
 		setTestName("Test054");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1122,15 +1124,15 @@
 	@Test public void CrashRecovery05_2_Test055()
 	{
 		setTestName("Test055");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1139,15 +1141,15 @@
 	@Test public void CrashRecovery05_2_Test056()
 	{
 		setTestName("Test056");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1156,15 +1158,15 @@
 	@Test public void CrashRecovery05_2_Test057()
 	{
 		setTestName("Test057");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1173,15 +1175,15 @@
 	@Test public void CrashRecovery05_2_Test058()
 	{
 		setTestName("Test058");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1190,15 +1192,15 @@
 	@Test public void CrashRecovery05_2_Test059()
 	{
 		setTestName("Test059");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1207,15 +1209,15 @@
 	@Test public void CrashRecovery05_2_Test060()
 	{
 		setTestName("Test060");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1224,15 +1226,15 @@
 	@Test public void CrashRecovery05_2_Test061()
 	{
 		setTestName("Test061");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1241,15 +1243,15 @@
 	@Test public void CrashRecovery05_2_Test062()
 	{
 		setTestName("Test062");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1258,15 +1260,15 @@
 	@Test public void CrashRecovery05_2_Test063()
 	{
 		setTestName("Test063");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1275,15 +1277,15 @@
 	@Test public void CrashRecovery05_2_Test064()
 	{
 		setTestName("Test064");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1292,15 +1294,15 @@
 	@Test public void CrashRecovery05_2_Test065()
 	{
 		setTestName("Test065");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1309,15 +1311,15 @@
 	@Test public void CrashRecovery05_2_Test066()
 	{
 		setTestName("Test066");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1326,15 +1328,15 @@
 	@Test public void CrashRecovery05_2_Test067()
 	{
 		setTestName("Test067");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1343,15 +1345,15 @@
 	@Test public void CrashRecovery05_2_Test068()
 	{
 		setTestName("Test068");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1360,15 +1362,15 @@
 	@Test public void CrashRecovery05_2_Test069()
 	{
 		setTestName("Test069");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1377,15 +1379,15 @@
 	@Test public void CrashRecovery05_2_Test070()
 	{
 		setTestName("Test070");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1394,15 +1396,15 @@
 	@Test public void CrashRecovery05_2_Test071()
 	{
 		setTestName("Test071");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1411,15 +1413,15 @@
 	@Test public void CrashRecovery05_2_Test072()
 	{
 		setTestName("Test072");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1428,15 +1430,15 @@
 	@Test public void CrashRecovery05_2_Test073()
 	{
 		setTestName("Test073");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1445,15 +1447,15 @@
 	@Test public void CrashRecovery05_2_Test074()
 	{
 		setTestName("Test074");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
@@ -1462,37 +1464,38 @@
 	@Test public void CrashRecovery05_2_Test075()
 	{
 		setTestName("Test075");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server07.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("$(5)", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server1.terminate();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server08.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("$(5)", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
 	}
 
+
 	@Test public void CrashRecovery05_2_Test076()
 	{
 		setTestName("Test076");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1502,20 +1505,20 @@
 	@Test public void CrashRecovery05_2_Test077()
 	{
 		setTestName("Test077");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1525,20 +1528,20 @@
 	@Test public void CrashRecovery05_2_Test078()
 	{
 		setTestName("Test078");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1548,20 +1551,20 @@
 	@Test public void CrashRecovery05_2_Test079()
 	{
 		setTestName("Test079");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1571,20 +1574,20 @@
 	@Test public void CrashRecovery05_2_Test080()
 	{
 		setTestName("Test080");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client05a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1594,20 +1597,20 @@
 	@Test public void CrashRecovery05_2_Test081()
 	{
 		setTestName("Test081");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client06a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1617,20 +1620,20 @@
 	@Test public void CrashRecovery05_2_Test082()
 	{
 		setTestName("Test082");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client07a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1640,20 +1643,20 @@
 	@Test public void CrashRecovery05_2_Test083()
 	{
 		setTestName("Test083");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client08a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1663,20 +1666,20 @@
 	@Test public void CrashRecovery05_2_Test084()
 	{
 		setTestName("Test084");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client09a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1686,20 +1689,20 @@
 	@Test public void CrashRecovery05_2_Test085()
 	{
 		setTestName("Test085");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client10a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1709,20 +1712,20 @@
 	@Test public void CrashRecovery05_2_Test086()
 	{
 		setTestName("Test086");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client11a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1732,20 +1735,20 @@
 	@Test public void CrashRecovery05_2_Test087()
 	{
 		setTestName("Test087");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client12a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1755,20 +1758,20 @@
 	@Test public void CrashRecovery05_2_Test088()
 	{
 		setTestName("Test088");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client13a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1778,20 +1781,20 @@
 	@Test public void CrashRecovery05_2_Test089()
 	{
 		setTestName("Test089");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client14a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1801,20 +1804,20 @@
 	@Test public void CrashRecovery05_2_Test090()
 	{
 		setTestName("Test090");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client15a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1824,20 +1827,20 @@
 	@Test public void CrashRecovery05_2_Test091()
 	{
 		setTestName("Test091");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client16a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1847,20 +1850,20 @@
 	@Test public void CrashRecovery05_2_Test092()
 	{
 		setTestName("Test092");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client17a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1870,20 +1873,20 @@
 	@Test public void CrashRecovery05_2_Test093()
 	{
 		setTestName("Test093");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client18a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1893,20 +1896,20 @@
 	@Test public void CrashRecovery05_2_Test094()
 	{
 		setTestName("Test094");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client19a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1916,20 +1919,20 @@
 	@Test public void CrashRecovery05_2_Test095()
 	{
 		setTestName("Test095");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client20a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1939,20 +1942,20 @@
 	@Test public void CrashRecovery05_2_Test096()
 	{
 		setTestName("Test096");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client21a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1962,20 +1965,20 @@
 	@Test public void CrashRecovery05_2_Test097()
 	{
 		setTestName("Test097");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client22a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -1985,20 +1988,20 @@
 	@Test public void CrashRecovery05_2_Test098()
 	{
 		setTestName("Test098");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client23a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -2008,20 +2011,20 @@
 	@Test public void CrashRecovery05_2_Test099()
 	{
 		setTestName("Test099");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client24a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
@@ -2031,20 +2034,20 @@
 	@Test public void CrashRecovery05_2_Test100()
 	{
 		setTestName("Test100");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("$(5)", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery05Servers.Server05.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("$(6)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
 		server2.terminate();
 		server1.terminate();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("$(5)", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery05Servers.Server06.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("$(6)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery05Clients2.Client25a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery09.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery09.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery09.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -23,6 +23,8 @@
 import org.jboss.jbossts.qa.junit.*;
 import org.junit.*;
 
+import java.text.MessageFormat;
+
 // Automatically generated by XML2JUnit
 public class TestGroup_crashrecovery09 extends TestGroupBase
 {
@@ -56,115 +58,114 @@
 	@Test public void CrashRecovery09_Test01()
 	{
 		setTestName("Test01");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery09_Test02()
 	{
 		setTestName("Test02");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery09_Test03()
 	{
 		setTestName("Test03");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "Object2", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "Object2", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery09_Test04()
 	{
 		setTestName("Test04");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "Object2", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "Object2", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery09_Test05()
 	{
 		setTestName("Test05");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("Object1", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("Object2", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server2.terminate();
+        server1.terminate();
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("Object1", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("Object2", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
 		server3.terminate();
-		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery09_Test06()
 	{
 		setTestName("Test06");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("Object1", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("Object2", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server2.terminate();
+        server1.terminate();
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("Object1", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery09Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("Object2", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery09Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
 		server3.terminate();
-		server2.terminate();
-		server1.terminate();
 	}
-
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery10.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery10.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery10.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -56,115 +56,115 @@
 	@Test public void CrashRecovery10_Test01()
 	{
 		setTestName("Test01");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client01b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client01a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery10_Test02()
 	{
 		setTestName("Test02");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "$(1)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client02b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "$(2)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client02a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(2)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery10_Test03()
 	{
 		setTestName("Test03");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "Object2", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "Object2", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery10_Test04()
 	{
 		setTestName("Test04");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer03.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server1.start("Object1", "Object2", "$(1)", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480);
+        server1.terminate();
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer04.class, Task.TaskType.EXPECT_READY, 480, "server");
 		server2.start("Object1", "Object2", "$(3)", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery10_Test05()
 	{
 		setTestName("Test05");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("Object1", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("Object2", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server2.terminate();
+        server1.terminate();
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("Object1", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("Object2", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client03a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
 		server3.terminate();
-		server2.terminate();
-		server1.terminate();
 	}
 
 	@Test public void CrashRecovery10_Test06()
 	{
 		setTestName("Test06");
-		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server1 = createTask("server1", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server1.start("Object1", "$(1)");
-		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480);
+		Task server2 = createTask("server2", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer01.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server2.start("Object2", "$(2)");
-		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04b.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client0.start("$(1)", "$(2)");
 		client0.waitFor();
-		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+        server2.terminate();
+        server1.terminate();
+		Task server3 = createTask("server3", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_1");
 		server3.start("Object1", "$(3)");
-		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480);
+		Task server4 = createTask("server4", org.jboss.jbossts.qa.CrashRecovery10Servers.AITServer02.class, Task.TaskType.EXPECT_READY, 480, "server_2");
 		server4.start("Object2", "$(4)");
-		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+		Task client1 = createTask("client1", org.jboss.jbossts.qa.CrashRecovery10Clients.Client04a.class, Task.TaskType.EXPECT_PASS_FAIL, 480, "client");
 		client1.start("$(3)", "$(4)");
 		client1.waitFor();
 		server4.terminate();
 		server3.terminate();
-		server2.terminate();
-		server1.terminate();
 	}
 
 }
\ No newline at end of file

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery12.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery12.java	2011-02-22 11:51:24 UTC (rev 36648)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_crashrecovery12.java	2011-02-22 13:19:17 UTC (rev 36649)
@@ -98,12 +98,9 @@
 		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery12Clients.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 240);
 		client0.start("prepare", "CR12_05.log");
 		client0.waitFor();
-//		Task server1 = createTask("server1", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 240);
-//		server1.start("-test");
 		Task outcome0 = createTask("outcome0", org.jboss.jbossts.qa.CrashRecovery12Outcomes.Outcome01.class, Task.TaskType.EXPECT_PASS_FAIL, 240);
 		outcome0.start("CR12_05.log", "no");
 		outcome0.waitFor();
-//		server1.terminate();
 	}
 
 	@Test public void CrashRecovery12_Test06()
@@ -112,12 +109,9 @@
 		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery12Clients.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 240);
 		client0.start("commit", "CR12_06.log");
 		client0.waitFor();
-//		Task server1 = createTask("server1", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 240);
-//		server1.start("-test");
 		Task outcome0 = createTask("outcome0", org.jboss.jbossts.qa.CrashRecovery12Outcomes.Outcome01.class, Task.TaskType.EXPECT_PASS_FAIL, 240);
 		outcome0.start("CR12_06.log", "yes");
 		outcome0.waitFor();
-//		server1.terminate();
 	}
 
 	@Test public void CrashRecovery12_Test07()
@@ -126,12 +120,8 @@
 		Task client0 = createTask("client0", org.jboss.jbossts.qa.CrashRecovery12Clients.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 240);
 		client0.start("rollback", "CR12_07.log");
 		client0.waitFor();
-//		Task server1 = createTask("server1", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 240);
-//		server1.start("-test");
 		Task outcome0 = createTask("outcome0", org.jboss.jbossts.qa.CrashRecovery12Outcomes.Outcome01.class, Task.TaskType.EXPECT_PASS_FAIL, 240);
 		outcome0.start("CR12_07.log", "no");
 		outcome0.waitFor();
-//		server1.terminate();
 	}
-
 }
\ No newline at end of file



More information about the jboss-svn-commits mailing list