[jboss-svn-commits] JBL Code SVN: r37785 - in labs/jbosstm/branches/JBOSSTS_4_16: atsintegration/tests/classes/com/arjuna/ats/jta/distributed and 1 other directory.

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

Author: tomjenkinson
Date: 2011-12-08 05:58:17 -0500 (Thu, 08 Dec 2011)
New Revision: 37785

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/.classpath
   labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
Log:
JBTM-895 updated to provide a boot utility

Modified: labs/jbosstm/branches/JBOSSTS_4_16/.classpath
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/.classpath	2011-12-08 03:49:01 UTC (rev 37784)
+++ labs/jbosstm/branches/JBOSSTS_4_16/.classpath	2011-12-08 10:58:17 UTC (rev 37785)
@@ -40,7 +40,13 @@
 	<classpathentry kind="src" path="qa/tests/build/idl"/>
 	<classpathentry excluding="com/arjuna/ats/internal/arjuna/objectstore/jdbc/|com/arjuna/ats/tools/perftest/product/AtomikosProduct.java|com/arjuna/ats/tools/perftest/product/BitronixProduct.java|com/arjuna/ats/tools/perftest/product/JBossTSProduct.java|com/arjuna/ats/tools/perftest/product/JOTMProduct.java|com/arjuna/ats/tools/perftest/product/SimpleJTAProduct.java" kind="src" path="qa/tests/product/src"/>
 	<classpathentry kind="src" path="qa/tests/src"/>
+	<classpathentry kind="src" path="XTS/WS-T/dev/src"/>
+	<classpathentry kind="src" path="XTS/recovery/src"/>
+	<classpathentry kind="src" path="XTS/WS-C/dev/src"/>
+	<classpathentry kind="src" path="XTS/WSCF/classes"/>
+	<classpathentry kind="src" path="XTS/WSAS/classes"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-transaction-spi/7.0.0-SNAPSHOT/jboss-transaction-spi-7.0.0-SNAPSHOT.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/resource/jboss-connector-api_1.6_spec/1.0.0.Final/jboss-connector-api_1.6_spec-1.0.0.Final.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar"/>
@@ -65,6 +71,5 @@
 	<classpathentry kind="lib" path="ArjunaJTS/jacorb/lib/jacorb.jar"/>
 	<classpathentry kind="lib" path="ArjunaJTS/jacorb/lib/wrapper-3.1.0.jar"/>
 	<classpathentry kind="lib" path="qa/ext/jboss-profiler-jvmti.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/aaa-jboss-transaction-spi"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-12-08 03:49:01 UTC (rev 37784)
+++ labs/jbosstm/branches/JBOSSTS_4_16/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-12-08 10:58:17 UTC (rev 37785)
@@ -25,6 +25,7 @@
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -71,13 +72,7 @@
 		completionCounter.reset();
 		lookupProvider.clear();
 		for (int i = 0; i < serverNodeNames.length; i++) {
-			ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-			IsolatableServersClassLoader classLoader = new IsolatableServersClassLoader("com.arjuna.ats.jta.distributed.server", contextClassLoader);
-			localServers[i] = (LocalServer) classLoader.loadClass("com.arjuna.ats.jta.distributed.server.impl.ServerImpl").newInstance();
-			Thread.currentThread().setContextClassLoader(localServers[i].getClass().getClassLoader());
-			localServers[i].initialise(lookupProvider, serverNodeNames[i], serverPortOffsets[i], clusterBuddies[i]);
-			lookupProvider.bind(i, localServers[i].connectTo());
-			Thread.currentThread().setContextClassLoader(contextClassLoader);
+			boot(i);
 		}
 	}
 
@@ -93,18 +88,22 @@
 
 	private static void reboot(String serverName) throws Exception {
 		// int index = (Integer.valueOf(serverName) / 1000) - 1;
-		int index = -1;
 		for (int i = 0; i < localServers.length; i++) {
 			if (localServers[i].getNodeName().equals(serverName)) {
-				index = i;
+				ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+				Thread.currentThread().setContextClassLoader(localServers[i].getClass().getClassLoader());
+				localServers[i].shutdown();
+				Thread.currentThread().setContextClassLoader(contextClassLoader);
+
+				boot(i);
 				break;
 			}
 		}
-		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-		Thread.currentThread().setContextClassLoader(localServers[index].getClass().getClassLoader());
-		localServers[index].shutdown();
-		Thread.currentThread().setContextClassLoader(contextClassLoader);
 
+	}
+
+	private static void boot(int index) throws SecurityException, NoSuchMethodException, InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, CoreEnvironmentBeanException, IOException, NoSuchFieldException {
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		IsolatableServersClassLoader classLoader = new IsolatableServersClassLoader("com.arjuna.ats.jta.distributed.server", contextClassLoader);
 		localServers[index] = (LocalServer) classLoader.loadClass("com.arjuna.ats.jta.distributed.server.impl.ServerImpl").newInstance();
 		Thread.currentThread().setContextClassLoader(localServers[index].getClass().getClassLoader());