From 9321cc2cb9537a88381fa3f1c7042bd137947e81 Mon Sep 17 00:00:00 2001 From: Michael Musgrove Date: Tue, 29 Sep 2015 18:07:17 +0100 Subject: [PATCH] JBTM-1854 Don't initialise two orbs --- .../mwtests/ts/jts/local/async/AsyncTest.java | 19 ++----- .../jts/local/synchronizations/SynchTest.java | 16 ++---- .../remote/arjuna/ExplicitArjunaClient.java | 17 ++---- .../remote/arjuna/ImplicitArjunaClient.java | 17 ++---- .../ts/jts/remote/current/CurrentTest.java | 18 ++---- .../ExplicitInterClient.java | 18 ++---- .../jts/remote/hammer/DistributedHammer1.java | 17 ++---- .../jts/remote/hammer/DistributedHammer2.java | 17 ++---- .../jts/remote/hammer/DistributedHammer3.java | 17 ++---- .../ts/jts/remote/hammer/PerfHammer.java | 14 ++--- .../jts/remote/implicit/ImplicitClient.java | 17 ++---- .../remote/servers/ExplicitStackServer.java | 18 ++---- .../ts/jts/remote/servers/GridServer.java | 18 ++---- .../ts/jts/remote/servers/HammerServer.java | 18 ++---- .../ts/jts/remote/servers/ImplGridServer.java | 18 ++---- .../ts/jts/remote/servers/SetGetServer.java | 18 ++---- .../ts/jts/remote/servers/StackServer.java | 18 ++---- .../ts/jts/remote/servers/TranGridServer.java | 19 ++----- .../ts/jts/remote/timeout/TimeoutClient.java | 14 ++--- .../jts/remote/transactionserver/TMTest.java | 17 ++---- .../hp/mwtests/ts/jts/utils/ServerORB.java | 57 +++++++++++++++++++ scripts/hudson/narayana.sh | 4 +- 22 files changed, 141 insertions(+), 265 deletions(-) create mode 100644 ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/ServerORB.java 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 index 6fb9ca0190..4e20725e7a 100644 --- 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(); } } -} \ No newline at end of file +} 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 index 9f9b2fa8ff..f499b3138a 100644 --- 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(); } -} \ No newline at end of file +} 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 index 8b209a7c16..cddd9ad1a7 100644 --- 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 index 1276dfde2d..1f1d5d834b 100644 --- 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 index 9c0bbbdde7..4aaa1d1004 100644 --- 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/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java index 5fc4ea0885..c3889e44e7 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java +++ b/ArjunaJTS/jts/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 index 2b4ca6454e..9cfd4f4d82 100644 --- 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 index 0cb37e5596..c0e179de3f 100644 --- 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 index c5dd94bfb5..6cf331854c 100644 --- 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 index 12e05e9196..cf19c58597 100644 --- 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 index 433016ad8f..92553b28dc 100644 --- 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]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java index c1c24acf7d..527d34e110 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java @@ -28,33 +28,23 @@ * * $Id: ExplicitStackServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; import com.hp.mwtests.ts.jts.TestModule.ExplicitStackPOATie; import com.hp.mwtests.ts.jts.orbspecific.resources.ExplicitStackImple; import com.hp.mwtests.ts.jts.resources.TestUtility; +import com.hp.mwtests.ts.jts.utils.ServerORB; public class ExplicitStackServer { 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]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java index e697830172..e33cfe02aa 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java @@ -28,32 +28,22 @@ * * $Id: GridServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; import com.hp.mwtests.ts.jts.orbspecific.resources.grid_i; import com.hp.mwtests.ts.jts.resources.TestUtility; +import com.hp.mwtests.ts.jts.utils.ServerORB; public class GridServer { 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 gridReference = args[0]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java index 202b5f858f..05a924cf50 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java @@ -28,11 +28,8 @@ * * $Id: HammerServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; @@ -40,23 +37,16 @@ import com.hp.mwtests.ts.jts.TestModule.HammerPOATie; import com.hp.mwtests.ts.jts.orbspecific.resources.HammerObject; import com.hp.mwtests.ts.jts.resources.TestUtility; +import com.hp.mwtests.ts.jts.utils.ServerORB; public class HammerServer { 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]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java index 05ef129512..8d8c66ad75 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java @@ -28,32 +28,22 @@ * * $Id: ImplGridServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; import com.hp.mwtests.ts.jts.orbspecific.resources.trangrid_i; import com.hp.mwtests.ts.jts.resources.TestUtility; +import com.hp.mwtests.ts.jts.utils.ServerORB; public class ImplGridServer { 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]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java index 569846646a..3e3b1643dc 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java @@ -28,32 +28,22 @@ * * $Id: SetGetServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; import com.hp.mwtests.ts.jts.orbspecific.resources.setget_i; import com.hp.mwtests.ts.jts.resources.TestUtility; +import com.hp.mwtests.ts.jts.utils.ServerORB; public class SetGetServer { 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]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java index 96da341ce5..a3dc05a6ed 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java @@ -28,11 +28,8 @@ * * $Id: StackServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; @@ -40,22 +37,15 @@ import com.hp.mwtests.ts.jts.TestModule.stackPOATie; import com.hp.mwtests.ts.jts.orbspecific.resources.StackImple; import com.hp.mwtests.ts.jts.resources.TestUtility; +import com.hp.mwtests.ts.jts.utils.ServerORB; public class StackServer { 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]; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java index 8212e3ad91..7114b82bfd 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java @@ -28,15 +28,13 @@ * * $Id: TranGridServer.java 2342 2006-03-30 13:06:17Z $ */ - package com.hp.mwtests.ts.jts.remote.servers; import static org.junit.Assert.fail; +import com.hp.mwtests.ts.jts.utils.ServerORB; import org.junit.Test; -import com.arjuna.ats.internal.jts.ORBManager; -import com.arjuna.orbportability.OA; import com.arjuna.orbportability.ORB; import com.arjuna.orbportability.RootOA; import com.arjuna.orbportability.Services; @@ -48,18 +46,9 @@ public class TranGridServer @Test public void test() 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 serverName = "TranGrid"; String refFile = "/tmp/trangrid.ref"; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java index d9ec2be2ad..2f7b362390 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java @@ -38,10 +38,9 @@ import org.omg.CosTransactions.Control; import com.arjuna.ats.arjuna.common.arjPropertyManager; -import com.arjuna.ats.internal.jts.ORBManager; import com.arjuna.ats.internal.jts.OTSImpleManager; import com.arjuna.ats.internal.jts.orbspecific.CurrentImple; -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; @@ -61,14 +60,9 @@ public static void main(String[] args) throws Exception try { - 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(); + myORB = orb.getORB(); + myOA = orb.getOA(); CurrentImple current = OTSImpleManager.current(); Control theControl = null; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java index b388e8fd2d..09799b2d98 100644 --- a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java @@ -38,8 +38,7 @@ import org.omg.CosTransactions.TransactionFactory; import org.omg.CosTransactions.TransactionFactoryHelper; -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; @@ -56,17 +55,9 @@ public static void main (String[] args) throws Exception @Test public void test() 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(); TransactionFactory theOTS = null; Control topLevelControl = null; diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/ServerORB.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/ServerORB.java new file mode 100644 index 0000000000..cffc4fa694 --- /dev/null +++ b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/ServerORB.java @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2015, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY 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 along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package com.hp.mwtests.ts.jts.utils; + +import com.arjuna.ats.internal.jts.ORBManager; +import com.arjuna.orbportability.OA; +import com.arjuna.orbportability.ORB; +import com.arjuna.orbportability.RootOA; +import org.omg.CORBA.ORBPackage.InvalidName; + +public class ServerORB { + private ORB myORB = null; + private RootOA myOA = null; + + public ServerORB() throws InvalidName { + if (!ORBManager.isInitialised()) { + myORB = ORB.getInstance("test"); + myOA = OA.getRootOA(myORB); + + myORB.initORB(new String[]{}, null); + myOA.initOA(); + + ORBManager.setORB(myORB); + ORBManager.setPOA(myOA); + } else { + myORB = ORBManager.getORB(); + myOA = OA.getRootOA(myORB); + } + } + + public ORB getORB() { + return myORB; + } + + public RootOA getOA() { + return myOA; + } +} diff --git a/scripts/hudson/narayana.sh b/scripts/hudson/narayana.sh index 485c28b9b2..cbdbb85b94 100755 --- a/scripts/hudson/narayana.sh +++ b/scripts/hudson/narayana.sh @@ -590,13 +590,13 @@ function qa_tests_once { ok=0 for i in `seq 1 $QA_STRESS`; do echo run $i; - ant -f run-tests.xml -Dtest.name=$QA_TESTGROUP -Dtest.methods="$QA_TESTMETHODS" onetest -Dcode.coverage=$codeCoverage; + ant -f run-tests.xml $QA_PROFILE -Dtest.name=$QA_TESTGROUP -Dtest.methods="$QA_TESTMETHODS" onetest -Dcode.coverage=$codeCoverage; if [ $? -ne 0 ]; then ok=1; break; fi done else - ant -f run-tests.xml -Dtest.name=$QA_TESTGROUP -Dtest.methods="$QA_TESTMETHODS" onetest -Dcode.coverage=$codeCoverage; + ant -f run-tests.xml $QA_PROFILE -Dtest.name=$QA_TESTGROUP -Dtest.methods="$QA_TESTMETHODS" onetest -Dcode.coverage=$codeCoverage; ok=$? fi else