JBTM-1854 Don't initialise two orbs

jbosstm · Sep 30, 2015 · 9321cc2 · 9321cc2
1 parent 4551ce6
commit 9321cc2
Show file tree

Hide file tree

Showing 22 changed files with 141 additions and 265 deletions.
diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java
@@ -36,9 +36,8 @@
 import org.junit.Test;
 import org.omg.CosTransactions.Current;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.hp.mwtests.ts.jts.orbspecific.resources.DemoResource;
@@ -52,17 +51,9 @@ public void test() throws Exception
         boolean errorp = false;
         boolean errorc = false;
 
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         try {
 
@@ -121,4 +112,4 @@ public static void main (String[] args)
             ex.printStackTrace();
         }
     }
-}
+}
diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/SynchTest.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/synchronizations/SynchTest.java
@@ -41,9 +41,8 @@
 import org.omg.CosTransactions.Coordinator;
 import org.omg.CosTransactions.Status;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.jts.OTSManager;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.hp.mwtests.ts.jts.orbspecific.resources.demosync;
@@ -62,15 +61,10 @@ public void test()
 
         try
         {
-            myORB = ORB.getInstance("test");
+            ServerORB orb = new ServerORB();
 
-            myOA = OA.getRootOA(myORB);
-
-            myORB.initORB(new String[] {}, null);
-            myOA.initOA();
-
-            ORBManager.setORB(myORB);
-            ORBManager.setPOA(myOA);
+            myORB = orb.getORB();
+            myOA = orb.getOA();
 
             Control myControl = null;
             org.omg.CosTransactions.Current current = OTSManager.get_current();
@@ -135,4 +129,4 @@ public static void main (String[] args)
 
         obj.test();
     }
-}
+}
diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
@@ -34,10 +34,9 @@
 import org.omg.CORBA.IntHolder;
 import org.omg.CosTransactions.Control;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.hp.mwtests.ts.jts.TestModule.ExplicitStack;
@@ -48,17 +47,9 @@ public class ExplicitArjunaClient
 {
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         CurrentImple current = OTSImpleManager.current();
         String refFile = args[0];

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
@@ -33,10 +33,9 @@
 
 import org.omg.CORBA.IntHolder;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -48,17 +47,9 @@ public class ImplicitArjunaClient
 {
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         String refFile = args[0];
         CurrentImple current = OTSImpleManager.current();

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
@@ -33,10 +33,9 @@
 
 import org.omg.CosTransactions.Control;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -48,18 +47,9 @@ public class CurrentTest
 {
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
-
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         CurrentImple current = OTSImpleManager.current();
         Control myControl = null;

diff --git a/...tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java b/...tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
@@ -33,10 +33,9 @@
 
 import org.omg.CosTransactions.Control;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -48,18 +47,9 @@ public class ExplicitInterClient
 {
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
-
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         CurrentImple current = OTSImpleManager.current();
         Control theControl = null;

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
@@ -33,8 +33,7 @@
 
 import org.omg.CORBA.IntHolder;
 
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.orbportability.OA;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -51,17 +50,9 @@ public class DistributedHammer1
 
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         String server1 = args[0];
         String server2 = args[1];

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
@@ -35,8 +35,7 @@
 import com.hp.mwtests.ts.jts.utils.TaskProgress;
 import org.omg.CORBA.IntHolder;
 
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.orbportability.OA;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -54,17 +53,9 @@ public class DistributedHammer2
 
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         String server1 = args[0];
         String server2 = args[1];

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
@@ -33,8 +33,7 @@
 
 import org.omg.CORBA.IntHolder;
 
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.orbportability.OA;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -52,17 +51,9 @@ public class DistributedHammer3
 
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         String server1 = args[0];
         String server2 = args[1];

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/PerfHammer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/PerfHammer.java
@@ -31,8 +31,7 @@
 
 package com.hp.mwtests.ts.jts.remote.hammer;
 
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.orbportability.OA;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import io.narayana.perf.Measurement;
@@ -59,14 +58,9 @@ public static void main(String[] args) throws Exception
         int batchSize = 100;
         int warmUpCount = 0;
 
-        ORB myORB = ORB.getInstance("test");
-        RootOA myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         String metricName = "JTSRemote_PerfTest_PerfHammer_" + System.getProperty("org.omg.CORBA.ORBClass",
                 myORB.orb().getClass().getName());

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
@@ -31,10 +31,9 @@
 
 package com.hp.mwtests.ts.jts.remote.implicit;
 
-import com.arjuna.ats.internal.jts.ORBManager;
+import com.hp.mwtests.ts.jts.utils.ServerORB;
 import com.arjuna.ats.internal.jts.OTSImpleManager;
 import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.orbportability.OA;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 import com.arjuna.orbportability.Services;
@@ -46,17 +45,9 @@ public class ImplicitClient
 {
     public static void main(String[] args) throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
+        ServerORB orb = new ServerORB();
+        ORB myORB = orb.getORB();
+        RootOA myOA = orb.getOA();
 
         String refFile = args[0];