[jboss-svn-commits] JBL Code SVN: r20765 - in labs/jbosstm/trunk: ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/destroy and 42 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 25 09:05:40 EDT 2008
Author: jhalliday
Date: 2008-06-25 09:05:39 -0400 (Wed, 25 Jun 2008)
New Revision: 20765
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/ActionScope.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/BadAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/LastResource.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/destroy/DestroyTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/file/FileLocking.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/AllObjUidsTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/CachedTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/PersistenceTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/RemoveCachedTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/WriteCachedTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance1.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance2.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance3.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionStatusServiceTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestServer.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/CallbackRecoveryTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/EmbeddedRecoveryTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ListenerTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/statemanager/BasicTest.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/testframework/Wrapper.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest1.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest2.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest3.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/AtomicTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/BasicActionTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/PersistenceTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/RecoverableTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/concurrencycontrol/ConcurrencyTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/destroy/DestroyTest.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/hammer/Hammer.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/performance/PerformanceTest1.java
labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/recovery/RecoveryTest.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java
labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java
labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/ORBInitialisationTest.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PostSetTest.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest2.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest3.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest4.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinfo/ORBInfoTest.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinstance/MultipleORBInstances.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbspecific/orbinstance/SimpleServer.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/services/ServiceTestSetup.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/OAPrePostShutdownTest.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/ORBPrePostShutdownTest.java
labs/jbosstm/trunk/ext/Readme
labs/jbosstm/trunk/ext/TestingFramework.jar
Log:
Update unit tests to use JBossDTF version of TestingFramework.jar JBTM-379
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/ActionScope.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/ActionScope.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/ActionScope.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -34,7 +34,7 @@
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class ActionScope extends Test
{
@@ -74,7 +74,7 @@
public static void main(String[] args)
{
ActionScope test = new ActionScope();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
};
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/BadAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/BadAction.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/BadAction.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -34,7 +34,7 @@
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class BadAction extends Test
{
@@ -83,7 +83,7 @@
public static void main(String[] args)
{
BadAction test = new BadAction();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/LastResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/LastResource.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/atomicaction/LastResource.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.arjuna.ats.arjuna.LastResourceRecord;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class LastResource extends Test
{
@@ -49,14 +49,14 @@
boolean success = false;
AtomicAction A = new AtomicAction();
OnePhase opRes = new OnePhase();
-
+
System.err.println("Starting top-level action.");
A.begin();
A.add(new LastResourceRecord(opRes));
A.add(new ShutdownRecord(ShutdownRecord.FAIL_IN_PREPARE));
-
+
A.commit();
if (opRes.status() != OnePhase.COMMITTED)
@@ -67,34 +67,34 @@
opRes = new OnePhase();
A.begin();
-
+
System.err.println("\nStarting new top-level action.");
A.add(new LastResourceRecord(opRes));
A.add(new ShutdownRecord(ShutdownRecord.FAIL_IN_COMMIT));
A.commit();
-
+
if (opRes.status() == OnePhase.COMMITTED)
{
System.err.println("Confirmed that one-phase record is first in commit.");
A = new AtomicAction();
-
+
A.begin();
-
+
A.add(new LastResourceRecord(new OnePhase()));
-
+
if (A.add(new LastResourceRecord(new OnePhase())) == AddOutcome.AR_DUPLICATE)
{
System.err.println("\nConfirmed that only one such resource can be added.");
-
+
assertSuccess();
}
else
{
System.err.println("\nMultiple such resources can be added!");
-
+
assertFailure();
}
}
@@ -123,7 +123,7 @@
public static void main(String[] args)
{
LastResource test = new LastResource();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/destroy/DestroyTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/destroy/DestroyTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/destroy/DestroyTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.hp.mwtests.ts.arjuna.resources.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class DestroyTest extends Test
{
@@ -67,29 +67,29 @@
for (int i = 0; i < 100; i++)
{
AtomicAction A = new AtomicAction();
-
+
A.begin();
BasicObject bo = new BasicObject();
bo.set(2);
-
+
A.commit();
AtomicAction B = new AtomicAction();
-
+
B.begin();
-
+
bo.destroy();
-
+
B.abort();
-
+
AtomicAction C = new AtomicAction();
-
+
C.begin();
-
+
bo.destroy();
-
+
C.commit();
}
}
@@ -97,7 +97,7 @@
public static void main(String[] args)
{
DestroyTest test = new DestroyTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/file/FileLocking.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/file/FileLocking.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/file/FileLocking.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -33,7 +33,7 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.utils.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import java.io.*;
@@ -157,7 +157,7 @@
{
FileLocking fileTest = new FileLocking();
- fileTest.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ fileTest.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
fileTest.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/AllObjUidsTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/AllObjUidsTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/AllObjUidsTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -39,7 +39,7 @@
import com.arjuna.ats.arjuna.coordinator.TxControl;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class AllObjUidsTest extends Test
{
@@ -50,16 +50,16 @@
boolean passed = false;
InputObjectState ios = new InputObjectState();
String type = "/StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction/ArjunaMSXAAtomicAction";
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].equals("-help"))
{
System.err.println("Usage: [-help] [-type <type name>]");
-
+
System.exit(0);
}
-
+
if (args[i].equals("-type"))
{
type = args[i+1];
@@ -73,7 +73,7 @@
if (objStore.allObjUids(type, ios, ObjectStore.OS_UNKNOWN))
{
Uid id = new Uid(Uid.nullUid());
-
+
do
{
try
@@ -84,21 +84,21 @@
{
id = Uid.nullUid();
}
-
+
if (id.notEquals(Uid.nullUid()))
System.err.println("Got UNKNOWN "+id);
passed = true;
-
+
} while (id.notEquals(Uid.nullUid()));
}
System.err.println("\n");
-
+
if (objStore.allObjUids(type, ios, ObjectStore.OS_COMMITTED))
{
Uid id = new Uid(Uid.nullUid());
-
+
do
{
try
@@ -109,12 +109,12 @@
{
id = Uid.nullUid();
}
-
+
if (id.notEquals(Uid.nullUid()))
System.err.println("Got COMMITTED "+id);
passed = true;
-
+
} while (id.notEquals(Uid.nullUid()));
}
@@ -123,7 +123,7 @@
if (objStore.allObjUids(type, ios, ObjectStore.OS_UNCOMMITTED))
{
Uid id = new Uid(Uid.nullUid());
-
+
do
{
try
@@ -134,12 +134,12 @@
{
id = Uid.nullUid();
}
-
+
if (id.notEquals(Uid.nullUid()))
System.err.println("Got UNCOMMITTED "+id);
passed = true;
-
+
} while (id.notEquals(Uid.nullUid()));
}
}
@@ -147,7 +147,7 @@
{
ex.printStackTrace();
}
-
+
if (passed)
assertSuccess();
else
@@ -157,7 +157,7 @@
public static void main(String[] args)
{
AllObjUidsTest test = new AllObjUidsTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/CachedTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/CachedTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/CachedTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,18 +43,18 @@
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
class ThreadWriter extends Thread
{
private static final String TYPE = "test";
-
+
public ThreadWriter (ObjectStore theStore)
{
store = theStore;
}
-
+
public void run ()
{
byte[] data = new byte[1024];
@@ -68,11 +68,11 @@
if (store.write_committed(u, TYPE, state))
{
Thread.yield();
-
+
InputObjectState s = store.read_committed(u, TYPE);
Thread.yield();
-
+
if (s != null)
{
if (store.remove_committed(u, TYPE))
@@ -95,7 +95,7 @@
public boolean passed = false;
private ObjectStore store = null;
-
+
}
@@ -106,7 +106,7 @@
boolean passed = true;
String cacheSize = "2048";
int threads = 100;
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].equals("-size"))
@@ -136,19 +136,19 @@
ObjectStore store = new ObjectStore(ArjunaNames.Implementation_ObjectStore_CacheStore());
long stime = Calendar.getInstance().getTime().getTime();
-
+
for (int i = 0; (i < threads) && passed; i++)
{
try
{
t[i] = new ThreadWriter(store);
-
+
t[i].start();
}
catch (Exception ex)
{
ex.printStackTrace();
-
+
passed = false;
}
}
@@ -165,7 +165,7 @@
{
}
}
-
+
long ftime = Calendar.getInstance().getTime().getTime();
long timeTaken = ftime - stime;
@@ -178,7 +178,7 @@
}
System.out.println("time for "+threads+" users is "+timeTaken);
-
+
if (passed)
System.out.println("Passed.");
else
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/JDBCInventory.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -36,7 +36,7 @@
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreImple;
import com.arjuna.ats.arjuna.gandiva.inventory.Inventory;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class JDBCInventory extends Test
{
@@ -65,7 +65,7 @@
public static void main(String[] args)
{
JDBCInventory test = new JDBCInventory();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/ObjectStoreTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -36,7 +36,7 @@
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.gandiva.ObjectName;
import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class ObjectStoreTest extends Test
{
@@ -117,7 +117,7 @@
public static void main(String[] args)
{
ObjectStoreTest test = new ObjectStoreTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/PersistenceTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/PersistenceTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/PersistenceTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,12 +43,12 @@
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class PersistenceTest extends Test
{
-
+
public void run(String[] args)
{
boolean passed = false;
@@ -60,24 +60,24 @@
if (args[j].equals("-cached"))
threaded = true;
}
-
+
for (int i = 0; i < 1000; i++)
{
try
{
ObjectStore store = null;
-
+
if (!threaded)
store = new ObjectStore(ArjunaNames.Implementation_ObjectStore_ShadowingStore());
else
store = new ObjectStore(ArjunaNames.Implementation_ObjectStore_CacheStore());
-
+
byte[] data = new byte[10240];
OutputObjectState state = new OutputObjectState();
Uid u = new Uid();
state.packBytes(data);
-
+
if (store.write_committed(u, "/StateManager/LockManager/foo", state))
{
passed = true;
@@ -94,7 +94,7 @@
catch (IOException ex)
{
ex.printStackTrace();
-
+
passed = false;
}
}
@@ -106,12 +106,12 @@
catch (Exception ex)
{
}
-
+
long ftime = Calendar.getInstance().getTime().getTime();
long timeTaken = ftime - stime;
System.out.println("time for 1000 write transactions is "+timeTaken);
-
+
try
{
Thread.currentThread().sleep(1000);
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/RemoveCachedTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/RemoveCachedTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/RemoveCachedTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class RemoveCachedTest
{
@@ -54,13 +54,13 @@
ObjectStore store = new ObjectStore(ArjunaNames.Implementation_ObjectStore_CacheStore());
String type = "ArjunaMS/Destinations/a3d6227_dc656_3b77ce7e_2/Messages";
InputObjectState buff = new InputObjectState();
-
+
try
{
if (store.allObjUids(type, buff, ObjectStore.OS_COMMITTED))
{
Uid toRemove = new Uid(Uid.nullUid());
-
+
do
{
toRemove.unpack(buff);
@@ -68,7 +68,7 @@
if (toRemove.notEquals(Uid.nullUid()))
{
System.err.println("Removing "+toRemove+"\n");
-
+
if (store.remove_committed(toRemove, type))
passed = true;
else
@@ -85,7 +85,7 @@
{
ex.printStackTrace();
}
-
+
if (passed)
System.out.println("Passed.");
else
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/WriteCachedTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/WriteCachedTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/objectstore/WriteCachedTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,18 +43,18 @@
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
class WriterThread extends Thread
{
private static final String TYPE = "test";
-
+
public WriterThread (ObjectStore theStore)
{
store = theStore;
}
-
+
public void run ()
{
byte[] data = new byte[1024];
@@ -68,7 +68,7 @@
if (store.write_committed(u, TYPE, state))
{
InputObjectState s = store.read_committed(u, TYPE);
-
+
if (s != null)
passed = true;
else
@@ -86,7 +86,7 @@
public boolean passed = false;
private ObjectStore store = null;
-
+
}
@@ -97,7 +97,7 @@
boolean passed = true;
String cacheSize = "20480";
int threads = 10;
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].equals("-size"))
@@ -127,19 +127,19 @@
ObjectStore store = new ObjectStore(ArjunaNames.Implementation_ObjectStore_CacheStore());
long stime = Calendar.getInstance().getTime().getTime();
-
+
for (int i = 0; (i < threads) && passed; i++)
{
try
{
t[i] = new WriterThread(store);
-
+
t[i].start();
}
catch (Exception ex)
{
ex.printStackTrace();
-
+
passed = false;
}
}
@@ -169,7 +169,7 @@
catch (Exception ex)
{
}
-
+
if (passed)
System.out.println("Passed.");
else
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance1.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance1.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -34,7 +34,7 @@
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import java.util.*;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance2.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance2.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import java.util.*;
@@ -48,7 +48,7 @@
{
_iters = iters;
}
-
+
public void run ()
{
for (int i = 0; i < _iters; i++)
@@ -56,9 +56,9 @@
try
{
AtomicAction A = new AtomicAction();
-
+
A.begin();
-
+
A.add(new BasicRecord());
A.commit();
@@ -71,12 +71,12 @@
Performance2.doSignal();
}
-
+
private int _iters;
}
-
+
public class Performance2
{
@@ -86,7 +86,7 @@
int work = 100;
System.setProperty(Environment.COMMIT_ONE_PHASE, "NO");
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-threads") == 0)
@@ -94,7 +94,7 @@
try
{
Integer v = new Integer(args[i+1]);
-
+
threads = v.intValue();
}
catch (Exception e)
@@ -107,7 +107,7 @@
try
{
Integer v = new Integer(args[i+1]);
-
+
work = v.intValue();
}
catch (Exception e)
@@ -127,19 +127,19 @@
int numberOfTransactions = threads * work;
long stime = Calendar.getInstance().getTime().getTime();
Worker[] workers = new Worker[threads];
-
+
for (int i = 0; i < threads; i++)
{
workers[i] = new Worker(work);
-
+
workers[i].start();
}
Performance2.doWait();
-
+
long ftime = Calendar.getInstance().getTime().getTime();
long timeTaken = ftime - stime;
-
+
System.out.println("time for "+numberOfTransactions+" write transactions is "+timeTaken);
System.out.println("number of transactions: "+numberOfTransactions);
System.out.println("throughput: "+(float) (numberOfTransactions/(timeTaken / 1000.0)));
@@ -168,8 +168,8 @@
sync.notify();
}
}
-
+
private static Object sync = new Object();
private static int number = 0;
-
+
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance3.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/performance/Performance3.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import java.util.*;
@@ -51,19 +51,19 @@
for (int i = 0; i < 1000; i++)
{
TwoPhaseCoordinator tx = new TwoPhaseCoordinator();
-
+
tx.start();
-
+
tx.addSynchronization(new SyncRecord());
tx.end(true);
}
-
+
long ftime = System.currentTimeMillis();
double elapsedTime = (ftime - stime)/1000.0;
double tps = 1000.0/elapsedTime;
-
+
System.err.println("TPS: "+tps);
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionStatusServiceTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionStatusServiceTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionStatusServiceTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -48,7 +48,7 @@
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector;
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem;
import com.arjuna.ats.internal.arjuna.Implementations;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class ActionStatusServiceTest extends Test
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -45,7 +45,7 @@
import com.arjuna.ats.internal.arjuna.recovery.Listener ;
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector ;
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem ;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.hp.mwtests.ts.arjuna.objectstore.ObjectStoreTest;
class ActionTestClientTestService implements Service
@@ -325,7 +325,7 @@
public static void main(String[] args)
{
ActionTestClient test = new ActionTestClient();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ActionTestServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -48,8 +48,8 @@
import com.arjuna.ats.internal.arjuna.recovery.Listener ;
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusConnector ;
import com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem ;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.ats.arjuna.objectstore.ObjectStore ;
public class ActionTestServer extends Test
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/CallbackRecoveryTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/CallbackRecoveryTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/CallbackRecoveryTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -38,7 +38,7 @@
import com.hp.mwtests.ts.arjuna.resources.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
class RecoveryScanImple implements RecoveryScan
{
@@ -48,7 +48,7 @@
}
public boolean passed = false;
-
+
}
public class CallbackRecoveryTest
@@ -59,11 +59,11 @@
RecoveryManager manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
DummyRecoveryModule module = new DummyRecoveryModule();
RecoveryScanImple rs = new RecoveryScanImple();
-
+
manager.addModule(module);
-
+
manager.scan(rs);
-
+
try
{
Thread.currentThread().sleep(120000);
@@ -71,11 +71,11 @@
catch (Exception ex)
{
}
-
+
if (module.finished() && rs.passed)
System.err.println("Passed.");
else
- System.err.println("Failed.");
+ System.err.println("Failed.");
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/DestroyRecoverTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.hp.mwtests.ts.arjuna.resources.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class DestroyRecoverTest
{
@@ -51,7 +51,7 @@
boolean passed = true;
com.arjuna.ats.arjuna.common.Configuration.setAlternativeOrdering(true);
-
+
try
{
A.begin();
@@ -60,34 +60,34 @@
objId = bo.get_uid();
A.removeThread();
-
+
A.commit();
}
catch (Exception ex)
{
ex.printStackTrace();
-
+
passed = false;
- }
+ }
if (passed)
{
try
{
A = new AtomicAction();
-
+
txId = A.get_uid();
-
+
A.begin();
bo.activate();
-
+
bo.destroy();
-
+
A.add(new BasicCrashRecord());
A.removeThread();
-
+
A.commit();
}
catch (com.arjuna.ats.arjuna.exceptions.FatalError ex)
@@ -97,23 +97,23 @@
catch (Exception ex)
{
ex.printStackTrace();
-
+
passed = false;
}
}
-
+
if (passed)
{
try
{
passed = false;
-
+
RecoveryTransaction tx = new RecoveryTransaction(txId);
-
+
tx.doCommit();
BasicObject recoveredObject = new BasicObject(objId);
-
+
if (recoveredObject.get() == -1)
passed = true;
}
@@ -122,7 +122,7 @@
ex.printStackTrace();
}
}
-
+
if (passed)
System.out.println("Passed.");
else
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/EmbeddedRecoveryTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/EmbeddedRecoveryTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/EmbeddedRecoveryTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -38,7 +38,7 @@
import com.hp.mwtests.ts.arjuna.resources.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class EmbeddedRecoveryTest extends Test
{
@@ -47,11 +47,11 @@
{
RecoveryManager manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
DummyRecoveryModule module = new DummyRecoveryModule();
-
+
manager.addModule(module);
-
+
manager.scan();
-
+
if (module.finished())
assertSuccess();
else
@@ -62,7 +62,7 @@
{
EmbeddedRecoveryTest test = new EmbeddedRecoveryTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ListenerTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ListenerTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/ListenerTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.arjuna.ats.arjuna.recovery.Service;
import com.arjuna.ats.internal.arjuna.recovery.Listener;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
class ListenerTestService implements Service
{
@@ -178,7 +178,7 @@
public static void main(String[] args)
{
ListenerTest test = new ListenerTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/statemanager/BasicTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/statemanager/BasicTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/statemanager/BasicTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,7 +37,7 @@
import com.hp.mwtests.ts.arjuna.resources.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class BasicTest extends Test
{
@@ -66,18 +66,18 @@
{
AtomicAction A = new AtomicAction();
BasicObject bo = new BasicObject();
-
+
A.begin();
bo.set(2);
-
+
A.commit();
}
public static void main(String[] args)
{
BasicTest test = new BasicTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.run(args);
}
};
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/testframework/Wrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/testframework/Wrapper.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/testframework/Wrapper.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,27 +1,27 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2008
* @author JBoss Inc.
*/
package com.hp.mwtests.ts.arjuna.testframework;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import java.lang.reflect.Method;
@@ -53,7 +53,7 @@
Test theTest = (Test) c.newInstance();
- theTest.initialise(null, null, params, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ theTest.initialise(null, null, params, new org.jboss.dtf.testframework.unittest.LocalHarness());
theTest.run(params);
}
catch (ClassCastException ex)
@@ -65,7 +65,7 @@
if (mainMethod == null)
{
System.err.println("No main found for non-Test class.");
-
+
return;
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest1.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest1.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -41,8 +41,8 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class AtomicObjectTest1 extends Test
{
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest2.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest2.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -41,8 +41,8 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import java.lang.InterruptedException;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest3.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/atomicobject/AtomicObjectTest3.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -41,8 +41,8 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import java.lang.InterruptedException;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/AtomicTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/AtomicTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/AtomicTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,26 +37,26 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class AtomicTest extends Test
{
-
+
public void run(String[] args)
{
AtomicObject foo = new AtomicObject();
Uid u = foo.get_uid();
int v;
-
+
AtomicAction A = new AtomicAction();
try
{
A.begin();
-
+
logInformation("current object value is "+foo.get());
-
+
foo.set(2);
logInformation("object value is now "+foo.get());
@@ -64,7 +64,7 @@
A.commit();
int finalVal = foo.get();
-
+
logInformation("final object value is now "+finalVal);
if (finalVal == 2)
@@ -76,21 +76,21 @@
}
logInformation("\nStarting new action.");
-
+
foo = new AtomicObject(u);
-
+
A = new AtomicAction();
-
+
A.begin();
logInformation("current object value is "+foo.get());
-
+
foo.set(4);
A.commit();
finalVal = foo.get();
-
+
logInformation("final object value is "+finalVal);
if (finalVal == 4)
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/BasicActionTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/BasicActionTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/BasicActionTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,17 +37,17 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class BasicActionTest extends Test
{
-
+
public void run(String[] args)
{
AtomicObject foo = null;
Uid u = null;
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-uid") == 0)
@@ -77,7 +77,7 @@
try
{
A.begin();
-
+
try
{
logInformation("current object value is "+foo.get());
@@ -89,7 +89,7 @@
try
{
logInformation("setting value");
-
+
foo.set(foo.get()+2);
}
catch (Exception e)
@@ -125,10 +125,10 @@
try
{
AtomicAction B = new AtomicAction();
-
+
u = new Uid();
foo = new AtomicObject(u);
-
+
B.begin();
try
@@ -138,7 +138,7 @@
catch (Exception e)
{
}
-
+
logInformation("trying to set value to 5");
try
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/PersistenceTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/PersistenceTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/PersistenceTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -41,12 +41,12 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class PersistenceTest extends Test
{
-
+
public void run(String[] args)
{
boolean passed = false;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/RecoverableTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/RecoverableTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/basic/RecoverableTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -36,12 +36,12 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.RecoverableObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class RecoverableTest extends Test
{
-
+
public void run(String[] args)
{
boolean passed = false;
@@ -51,7 +51,7 @@
AtomicAction A = new AtomicAction();
A.begin();
-
+
logInformation("value is "+foo.get());
foo.set(2);
@@ -67,9 +67,9 @@
if (value == 0)
{
AtomicAction B = new AtomicAction();
-
+
B.begin();
-
+
logInformation("value is "+foo.get());
foo.set(4);
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/concurrencycontrol/ConcurrencyTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/concurrencycontrol/ConcurrencyTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/concurrencycontrol/ConcurrencyTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -38,17 +38,17 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class ConcurrencyTest extends Test
{
-
+
public void run(String[] args)
{
AtomicObject foo = null;
Uid u = null;
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-uid") == 0)
@@ -82,7 +82,7 @@
A.begin();
logInformation("Current atomic object state: " + foo.get());
-
+
foo.set(7);
if (u == null)
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/destroy/DestroyTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/destroy/DestroyTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/destroy/DestroyTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -38,8 +38,8 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
public class DestroyTest extends Test
{
@@ -49,9 +49,9 @@
AtomicObject atomicObject = new AtomicObject();
Uid u = atomicObject.get_uid();
AtomicAction a = new AtomicAction();
-
+
a.begin();
-
+
try
{
atomicObject.set(10);
@@ -63,7 +63,7 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
logInformation("set : ok");
if (!atomicObject.destroy())
@@ -71,20 +71,20 @@
logInformation("destroy : failed");
a.abort();
-
+
assertFailure();
}
a.commit();
-
+
atomicObject = new AtomicObject(u);
-
+
boolean passed = false;
try
{
int val = atomicObject.get();
-
+
if (val != -1)
{
logInformation("got : "+val);
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/hammer/Hammer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/hammer/Hammer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/hammer/Hammer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -39,8 +39,8 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
import com.hp.mwtests.ts.txoj.common.resources.HammerThreadedObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import java.lang.InterruptedException;
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/performance/PerformanceTest1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/performance/PerformanceTest1.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/performance/PerformanceTest1.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,14 +37,14 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
import com.hp.mwtests.ts.txoj.common.resources.RecoverableObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.utils.PerformanceLogger;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.utils.PerformanceLogger;
import java.lang.NumberFormatException;
public class PerformanceTest1 extends Test
{
-
+
public void run(String[] args)
{
boolean persistent = true;
@@ -134,13 +134,13 @@
long t1 = System.currentTimeMillis();
A.begin();
-
+
for (int c = 0; c < iters; c++)
{
foo.set(2);
}
- A.commit();
+ A.commit();
return System.currentTimeMillis() - t1;
}
@@ -152,7 +152,7 @@
long t1 = System.currentTimeMillis();
A.begin();
-
+
try
{
for (int c = 0; c < iters; c++)
@@ -166,8 +166,8 @@
}
A.commit();
-
+
return System.currentTimeMillis() - t1;
- }
-
+ }
+
};
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/recovery/RecoveryTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/recovery/RecoveryTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/tests/classes/com/hp/mwtests/ts/txoj/recovery/RecoveryTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -42,7 +42,7 @@
import com.hp.mwtests.ts.txoj.common.exceptions.TestException;
import com.hp.mwtests.ts.txoj.common.resources.AtomicObject;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
public class RecoveryTest extends Test
{
@@ -53,21 +53,21 @@
{
AtomicObject obj = new AtomicObject();
Uid objRef = obj.get_uid();
-
+
AtomicAction A = new AtomicAction();
-
+
A.begin();
-
+
obj.set(1234);
-
+
A.commit();
-
+
AtomicObject recObj = new AtomicObject(objRef);
-
+
AtomicAction B = new AtomicAction();
B.begin();
-
+
if (recObj.get() == 1234)
{
System.out.print("Passed.");
@@ -91,9 +91,9 @@
{
RecoveryTest rt = new RecoveryTest();
- rt.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
-
+ rt.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
+
rt.run(args);
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -36,7 +36,7 @@
import java.util.Properties;
import java.sql.*;
-import com.arjuna.mwlabs.testframework.unittest.*;
+import org.jboss.dtf.testframework.unittest.*;
public class JDBC2Test extends Test
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC3Test.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -23,8 +23,8 @@
package com.hp.mwtests.ts.jdbc.basic;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
import java.sql.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/utils/JNDISetup.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
* $Id: JNDISetup.java 2342 2006-03-30 13:06:17Z $
*/
-import com.arjuna.mwlabs.testframework.unittest.*;
+import org.jboss.dtf.testframework.unittest.*;
import javax.sql.*;
import javax.naming.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTAAbort.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,8 +37,8 @@
import com.arjuna.ats.jta.utils.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import javax.transaction.*;
import javax.transaction.xa.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -36,8 +36,8 @@
import com.arjuna.ats.jta.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import javax.transaction.*;
import javax.transaction.xa.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,27 +1,27 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
package com.hp.mwtests.ts.jta.basic;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import javax.transaction.TransactionManager;
import javax.transaction.Transaction;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/JTATransactionCommitTest2.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,27 +1,27 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
package com.hp.mwtests.ts.jta.basic;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.ats.jta.utils.JTAHelper;
import javax.transaction.TransactionManager;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/basic/NullResource.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -37,8 +37,8 @@
import com.arjuna.ats.jta.utils.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import javax.transaction.*;
import javax.transaction.xa.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/CrashRecovery.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
+ * 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,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -36,8 +36,8 @@
import com.arjuna.ats.jta.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import javax.transaction.*;
import javax.transaction.xa.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/client/ImplicitClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
* $Id: ImplicitClient.java 2342 2006-03-30 13:06:17Z $
*/
-import com.arjuna.mwlabs.testframework.unittest.*;
+import org.jboss.dtf.testframework.unittest.*;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.ats.jta.common.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/arjuna/ats/jtax/tests/implicit/server/ImplicitServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
* $Id: ImplicitServer.java 2342 2006-03-30 13:06:17Z $
*/
-import com.arjuna.mwlabs.testframework.unittest.*;
+import org.jboss.dtf.testframework.unittest.*;
import com.arjuna.orbportability.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/JTATransactionCommitTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,27 +1,27 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
package com.hp.mwtests.ts.jta.jts.basic;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.ats.jta.common.jtaPropertyManager;
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/tests/classes/com/hp/mwtests/ts/jta/jts/basic/NullResource.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -42,7 +42,7 @@
import com.arjuna.orbportability.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import javax.transaction.*;
import javax.transaction.xa.*;
@@ -61,7 +61,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -79,7 +79,7 @@
jtaPropertyManager.propertyManager.setProperty(com.arjuna.ats.jta.common.Environment.JTA_UT_IMPLEMENTATION, "com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple");
boolean passed = false;
-
+
try
{
for (int i = 0; i < 1000; i++)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/arjuna/ArjunaNestingTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -41,8 +41,8 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -63,7 +63,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -81,7 +81,7 @@
boolean registerSubtran = false;
org.omg.CosTransactions.Current current = OTSManager.get_current();
DemoArjunaResource sr = new DemoArjunaResource();
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-help") == 0)
@@ -94,7 +94,7 @@
if (args[i].compareTo("-subtran") == 0)
registerSubtran = true;
}
-
+
try
{
current.begin();
@@ -113,7 +113,7 @@
se.printStackTrace(System.err);
assertFailure();
}
-
+
try
{
sr.registerResource(registerSubtran);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/async/AsyncTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -40,7 +40,7 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -55,12 +55,12 @@
public class AsyncTest extends Test
{
-
+
public void run(String[] args)
{
boolean errorp = false;
boolean errorc = false;
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-help") == 0)
@@ -81,7 +81,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -93,7 +93,7 @@
DemoResource.printThread = true;
current.begin();
-
+
for (int j = 0; j < 100; j++)
{
if ((j == 10) && (errorp || errorc))
@@ -105,9 +105,9 @@
h = null;
}
-
+
DemoResource r = new DemoResource();
-
+
r.registerResource();
r = null;
@@ -141,6 +141,6 @@
myOA.destroy();
myORB.shutdown();
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject1.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -40,8 +40,8 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -81,13 +81,13 @@
}
AtomicWorker1.init();
-
+
AtomicWorker1.atomicObject_1 = new AtomicObject();
AtomicWorker1.atomicObject_2 = new AtomicObject();
-
+
System.out.println(AtomicWorker1.atomicObject_1.get_uid());
System.out.println(AtomicWorker1.atomicObject_2.get_uid());
-
+
if (!AtomicWorker1.atomicObject_1.set(START_VALUE_1))
{
System.out.println("m set1 : failed");
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject2.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -38,7 +38,7 @@
import com.arjuna.orbportability.*;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -64,7 +64,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,7 +77,7 @@
}
AtomicWorker2.init();
-
+
AtomicWorker2.atomicObject_1 = new AtomicObject();
AtomicWorker2.atomicObject_2 = new AtomicObject();
@@ -98,7 +98,7 @@
ThreadObject2 thr1 = new ThreadObject2('1');
ThreadObject2 thr2 = new ThreadObject2('2');
-
+
thr1.start();
thr2.start();
@@ -144,7 +144,7 @@
public static void main(String[] args)
{
AtomicObject3 oa = new AtomicObject3();
-
+
oa.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/hammer/AtomicObject3.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -38,7 +38,7 @@
import com.arjuna.orbportability.*;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -64,7 +64,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,9 +77,9 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
AtomicWorker3.init();
-
+
AtomicWorker3.atomicObject_1 = new AtomicObject();
AtomicWorker3.atomicObject_2 = new AtomicObject();
@@ -147,9 +147,9 @@
public static void main(String[] args)
{
AtomicObject3 oa = new AtomicObject3();
-
+
oa.run(args);
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/heuristics/HeuristicTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -41,7 +41,7 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.ats.jts.utils.Utility;
@@ -76,7 +76,7 @@
}
Coordinator coord = null;
-
+
ORB myORB = null;
RootOA myOA = null;
heuristic hImpl = null;
@@ -85,7 +85,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -99,7 +99,7 @@
Resource atomicObject = aImpl.getReference();
System.out.println("beginning top-level transaction.");
-
+
current.begin();
Control myControl = current.get_control();
@@ -109,13 +109,13 @@
System.err.println("Error - myControl is nil");
assertFailure();
}
-
+
System.out.println("getting coordinator");
-
+
coord = myControl.get_coordinator();
myControl = null;
-
+
System.out.println("registering resources.");
try
@@ -127,12 +127,12 @@
{
System.out.println("Failed to register resources: "+ex);
ex.printStackTrace(System.err);
-
+
assertFailure();
}
System.out.println("committing top-level transaction.");
-
+
current.commit(true);
}
catch (TRANSACTION_ROLLEDBACK e1)
@@ -146,7 +146,7 @@
catch (HeuristicHazard e3)
{
System.out.println("\nTransaction HeuristicHazard exception");
- }
+ }
catch (Exception e4)
{
System.out.println("Caught unexpected exception: "+e4);
@@ -159,7 +159,7 @@
org.omg.CosTransactions.Status status = Status.StatusUnknown;
-
+
try
{
if (coord != null)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/nested/NestedTester.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,7 +43,7 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -61,7 +61,7 @@
public class NestedTester extends Test
{
-
+
public void run(String[] args)
{
boolean registerSubtran = false;
@@ -84,13 +84,13 @@
DemoSubTranResource sr = null;
ORB myORB = null;
RootOA myOA = null;
-
+
try
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -98,7 +98,7 @@
ORBManager.setPOA(myOA);
org.omg.CosTransactions.Current current = OTSManager.get_current();
-
+
r = new DemoResource();
sr = new DemoSubTranResource();
@@ -191,6 +191,6 @@
myOA.destroy();
myORB.shutdown();
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/local/orbsetup/ORBSetupTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -30,8 +30,8 @@
*/
package com.hp.mwtests.ts.jts.local.orbsetup;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.orbportability.internal.utils.PostInitLoader;
import com.arjuna.orbportability.ORB;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ExplicitArjunaClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -67,7 +67,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -79,7 +79,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
CurrentImple current = OTSImpleManager.current();
String refFile = "/tmp/explicitstack.ref";
String serverName = "ExplicitStack";
@@ -90,7 +90,7 @@
{
refFile = "C:\\temp\\explicitstack.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -118,7 +118,7 @@
try
{
System.out.println("Starting initialising top-level transaction.");
-
+
current.begin();
System.out.println("Initialising transaction name: "+current.get_transaction_name());
@@ -130,7 +130,7 @@
}
ExplicitStack stackVar = null; // pointer the grid object that will be used.
-
+
try
{
stackVar = ExplicitStackHelper.narrow(myORB.orb().string_to_object(getService(refFile)));
@@ -166,15 +166,15 @@
System.out.println("Committed top-level transaction");
System.out.println("\nBeginning top-level transaction");
-
+
current.begin();
System.out.println("Top-level name: "+current.get_transaction_name());
-
+
IntHolder val = new IntHolder(-1);
-
+
cont = current.get_control();
-
+
if (stackVar.pop(val, cont) == 0)
{
System.out.println("popped top of stack "+val.value);
@@ -185,7 +185,7 @@
System.out.println("nested name: "+current.get_transaction_name());
cont = null;
- cont = current.get_control();
+ cont = current.get_control();
stackVar.push(value+2, cont);
System.out.println("pushed "+(value+2)+" onto stack. Aborting nested action.");
@@ -193,7 +193,7 @@
cont = null; // current will destroy this control!
current.rollback();
cont = current.get_control();
-
+
System.out.println("current transaction name: "+current.get_transaction_name());
System.out.println("rolledback nested transaction");
@@ -202,20 +202,20 @@
System.out.println("\npopped top of stack is "+val.value);
System.out.println("\nTrying to print stack contents - should fail.");
-
+
stackVar.printStack();
-
+
cont = null;
current.commit(true);
System.out.println("\nCommitted top-level transaction");
-
+
if (current.get_transaction_name() == null)
System.out.println("current transaction name: null");
else
System.out.println("Error - current transaction name: "
+current.get_transaction_name());
-
+
if (val.value == value)
{
System.out.println("\nThis is correct.");
@@ -230,7 +230,7 @@
else
{
System.out.println("Error getting stack value.");
-
+
current.rollback();
System.out.println("\nRolledback top-level transaction.");
@@ -239,7 +239,7 @@
try
{
System.out.println("\nPrinting stack contents (should be empty).");
-
+
stackVar.printStack();
}
catch (Exception e)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/arjuna/ImplicitArjunaClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,7 +43,7 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -66,7 +66,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -86,7 +86,7 @@
if (System.getProperty("os.name").startsWith("Windows"))
{
refFile = "C:\\temp\\stack.ref"; }
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -97,7 +97,7 @@
assertFailure();
}
}
-
+
stack stackVar = null; // pointer the grid object that will be used.
try
@@ -107,7 +107,7 @@
try
{
Services serv = new Services(myORB);
-
+
stackVar = stackHelper.narrow(myORB.orb().string_to_object(getService(refFile)));
}
catch (Exception e)
@@ -117,7 +117,7 @@
}
System.out.println("pushing 1 onto stack");
-
+
stackVar.push(1);
System.out.println("pushing 2 onto stack");
@@ -143,11 +143,11 @@
System.out.println("popped top of stack "+val.value);
current.begin();
-
+
stackVar.push(3);
System.out.println("pushed 3 onto stack. Aborting nested action.");
-
+
current.rollback();
stackVar.pop(val);
@@ -171,7 +171,7 @@
{
assertFailure();
System.err.println("Error getting stack value.");
-
+
current.rollback();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/current/CurrentTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -57,7 +57,7 @@
public class CurrentTest extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -67,7 +67,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -79,7 +79,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
CurrentImple current = OTSImpleManager.current();
Control myControl = null;
String gridReference = "/tmp/grid.ref";
@@ -91,7 +91,7 @@
{
gridReference = "C:\\temp\\grid.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-help") == 0)
@@ -104,11 +104,11 @@
}
System.out.println("Beginning transaction.");
-
+
try
{
current.begin();
-
+
myControl = current.get_control();
if (myControl == null)
@@ -122,11 +122,11 @@
sysEx.printStackTrace(System.err);
assertFailure();
}
-
+
try
{
Services serv = new Services(myORB);
-
+
gridVar = gridHelper.narrow(myORB.orb().string_to_object(getService(gridReference)));
}
catch (Exception sysEx)
@@ -183,13 +183,13 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
assertFailure();
}
else
{
System.out.println("Committing transaction.");
-
+
try
{
current.commit(true);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/explicitinterposition/ExplicitInterClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -44,8 +44,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -58,7 +58,7 @@
public class ExplicitInterClient extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -68,7 +68,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -90,7 +90,7 @@
{
objectReference = "C:\\temp\\object.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-object") == 0)
@@ -121,7 +121,7 @@
try
{
Services serv = new Services(myORB);
-
+
SetGetVar = SetGetHelper.narrow(myORB.orb().string_to_object(getService(objectReference)));
}
catch (Exception ex)
@@ -134,12 +134,12 @@
try
{
theControl = current.get_control();
-
+
SetGetVar.set((short) 2, theControl);
- // SetGetVar.set((short) 2, theControl);
+ // SetGetVar.set((short) 2, theControl);
theControl = null;
-
+
System.out.println("Set value.");
}
catch (Exception ex1)
@@ -152,13 +152,13 @@
try
{
System.out.println("committing first nested action");
-
+
current.commit(true);
// SetGetVar.set((short) 4, current.get_control());
-
+
System.out.println("committing second nested action");
-
+
current.commit(true);
}
catch (Exception sysEx)
@@ -167,15 +167,15 @@
sysEx.printStackTrace(System.err);
assertFailure();
}
-
+
try
{
theControl = current.get_control();
-
+
h = SetGetVar.get(theControl);
theControl = null;
-
+
System.out.println("Got value.");
}
catch (Exception ex2)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/grid/GridClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -44,7 +44,7 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -67,7 +67,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -79,7 +79,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
TransactionFactory theOTS = null;
Control myControl = null;
grid gridVar = null;
@@ -91,7 +91,7 @@
{
gridReference = "C:\\temp\\grid.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-help") == 0)
@@ -128,7 +128,7 @@
}
System.out.println("Creating transaction.");
-
+
try
{
myControl = theOTS.create(0);
@@ -139,7 +139,7 @@
e.printStackTrace();
System.exit(1);
}
-
+
try
{
gridVar = gridHelper.narrow(serv.getService(gridReference, null, Services.FILE));
@@ -167,11 +167,11 @@
try
{
System.out.println("calling set");
-
+
gridVar.set(2, 4, 123, myControl);
System.out.println("calling get");
-
+
v = gridVar.get(2, 4, myControl);
}
catch (Exception sysEx)
@@ -182,7 +182,7 @@
// no problem setting and getting the elememt:
System.out.println("grid[2,4] is "+v);
-
+
// sanity check: make sure we got the value 123 back:
if (v != 123)
{
@@ -196,17 +196,17 @@
catch (Exception e)
{
}
-
+
System.exit(1);
}
else
{
System.out.println("Committing transaction.");
-
+
try
{
Terminator handle = myControl.get_terminator();
-
+
handle.commit(true);
}
catch (Exception sysEx)
@@ -215,7 +215,7 @@
System.exit(1);
}
}
-
+
/*
* OTSArjuna specific call to tell the system
* that we are finished with this transaction.
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer1.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -44,8 +44,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -72,7 +72,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -83,7 +83,7 @@
{
System.err.println("Initialisation failed: "+e);
}
-
+
String server1 = "/tmp/hammer1.ref";
String server2 = "/tmp/hammer2.ref";
@@ -106,11 +106,11 @@
System.exit(0);
}
}
-
+
try
{
Services serv = new Services(myORB);
-
+
DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server1)));
DistributedHammerWorker1.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server2)));
@@ -135,10 +135,10 @@
assertFailure();
}
-
+
for (int i = 0; i < 100; i++)
DistributedHammerWorker1.randomOperation('1', 0);
-
+
DistributedHammerWorker1.get12('m', 0);
DistributedHammerWorker1.get21('m', 0);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer2.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -44,8 +44,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -72,7 +72,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -85,7 +85,7 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
String server1 = "/tmp/hammer1.ref";
String server2 = "/tmp/hammer2.ref";
@@ -107,11 +107,11 @@
assertFailure();
}
}
-
+
try
{
Services serv = new Services(myORB);
-
+
DistributedHammerWorker2.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server1)));
DistributedHammerWorker2.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server2)));
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/hammer/DistributedHammer3.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -44,8 +44,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -72,7 +72,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -85,7 +85,7 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
String server1 = "/tmp/hammer1.ref";
String server2 = "/tmp/hammer2.ref";
@@ -107,11 +107,11 @@
assertFailure();
}
}
-
+
try
{
Services serv = new Services(myORB);
-
+
DistributedHammerWorker3.hammerObject_1 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server1)));
DistributedHammerWorker3.hammerObject_2 = HammerHelper.narrow(myORB.orb().string_to_object(getService(server2)));
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/implicit/ImplicitClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -62,12 +62,12 @@
{
ORB myORB = null;
RootOA myOA = null;
-
+
try
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -87,7 +87,7 @@
{
refFile = "C:\\temp\\trangrid.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-help") == 0)
@@ -107,14 +107,14 @@
}
CurrentImple current = OTSImpleManager.current();
-
+
TranGrid TranGridVar = null; // pointer the grid object that will be used.
short h = 0, w = 0, v = 0;
try
{
current.begin();
-
+
Services serv = new Services(myORB);
TranGridVar = TranGridHelper.narrow(myORB.orb().string_to_object(getService(refFile)));
@@ -128,7 +128,7 @@
System.err.println("Invocation failed: "+e);
e.printStackTrace();
-
+
assertFailure();
}
@@ -138,11 +138,11 @@
try
{
System.out.println("calling set");
-
+
TranGridVar.set((short) 2, (short) 4, (short) 123);
-
+
System.out.println("calling get");
-
+
v = TranGridVar.get((short) 2, (short) 4);
}
catch (Exception sysEx)
@@ -153,15 +153,15 @@
}
// no problem setting and getting the element:
-
+
System.out.println("trangrid[2,4] is "+v);
// sanity check: make sure we got the value 123 back:
-
+
if (v != 123)
{
// oops - we didn't:
-
+
current.rollback();
System.out.println("Result not as expected");
assertFailure();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ExplicitStackServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -55,7 +55,7 @@
public class ExplicitStackServer extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,7 +77,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
String refFile = "/tmp/explicitstack.ref";
String serverName = "ExplicitStack";
@@ -85,7 +85,7 @@
{
refFile = "C:\\temp\\explicitstack.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -102,11 +102,11 @@
myOA.objectIsReady(theObject);
Services serv = new Services(myORB);
-
+
try
{
registerService(refFile, myORB.orb().object_to_string(myOA.corbaReference(theObject)));
-
+
System.out.println("**ExplicitStackServer started**");
assertReady();
assertSuccess();
@@ -120,7 +120,7 @@
}
myOA.shutdownObject(theObject);
-
+
System.out.println("**ExplicitStackServer exiting**");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/GridServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -55,7 +55,7 @@
public class GridServer extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,7 +77,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
String gridReference = "/tmp/grid.ref";
String serverName = "Grid";
@@ -99,7 +99,7 @@
grid_i myGrid = new grid_i(100, 100);
Services serv = new Services(myORB);
-
+
try
{
registerService(gridReference, myORB.orb().object_to_string(myGrid.getReference()));
@@ -117,7 +117,7 @@
}
myOA.shutdownObject(myGrid);
-
+
System.out.println("**Grid server exiting**");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/HammerServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -55,7 +55,7 @@
public class HammerServer extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -108,7 +108,7 @@
assertFailure();
}
}
-
+
if ((number != 1) && (number != 2))
{
System.out.println("Usage: HammerServer -server <1 | 2> [-reffile <file>] [-help]");
@@ -128,7 +128,7 @@
myOA.objectIsReady(theObject);
Services serv = new Services(myORB);
-
+
try
{
registerService( refFile, myORB.orb().object_to_string(HammerHelper.narrow(myOA.corbaReference(theObject))) );
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/ImplGridServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -85,7 +85,7 @@
{
refFile = "C:\\temp\\trangrid.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -99,7 +99,7 @@
trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
Services serv = new Services(myORB);
-
+
try
{
registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
@@ -118,7 +118,7 @@
}
myOA.shutdownObject(gridI);
-
+
System.out.println("**ImplGrid server exiting**");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/SetGetServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,7 +77,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
String serverName = "SetGet";
String refFile = "/tmp/object.ref";
@@ -85,7 +85,7 @@
{
refFile = "C:\\temp\\object.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -99,11 +99,11 @@
setget_i impl = new setget_i();
Services serv = new Services(myORB);
-
+
try
{
registerService(refFile, myORB.orb().object_to_string(impl.getReference()));
-
+
System.out.println("**SetGet server started**");
assertReady();
@@ -118,7 +118,7 @@
}
myOA.shutdownObject(impl);
-
+
System.out.println("**Object server exiting**");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/StackServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -55,7 +55,7 @@
public class StackServer extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,7 +77,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
String refFile = "/tmp/stack.ref";
String serverName = "Stack";
@@ -85,7 +85,7 @@
{
refFile = "C:\\temp\\stack.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -102,11 +102,11 @@
myOA.objectIsReady(theStack);
Services serv = new Services(myORB);
-
+
try
{
registerService(refFile, myORB.orb().object_to_string(stackHelper.narrow(myOA.corbaReference(theStack))));
-
+
System.out.println("**StackServer started**");
assertReady();
assertSuccess();
@@ -120,7 +120,7 @@
}
myOA.shutdownObject(theStack);
-
+
System.out.println("**StackServer exiting**");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/servers/TranGridServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -65,7 +65,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -77,7 +77,7 @@
System.err.println("Initialisation failed: "+e);
assertFailure();
}
-
+
String serverName = "TranGrid";
String refFile = "/tmp/trangrid.ref";
@@ -85,7 +85,7 @@
{
refFile = "C:\\temp\\trangrid.ref";
}
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-marker") == 0)
@@ -104,7 +104,7 @@
trangrid_i gridI = new trangrid_i((short) 100, (short) 100);
Services serv = new Services(myORB);
-
+
try
{
registerService(refFile, myORB.orb().object_to_string(gridI.getReference()));
@@ -122,7 +122,7 @@
}
myOA.shutdownObject(gridI);
-
+
System.out.println("**TranGrid server exiting**");
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/timeout/TimeoutClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -43,8 +43,8 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import org.omg.CosTransactions.*;
@@ -58,7 +58,7 @@
public class TimeoutClient extends Test
{
-
+
public void run(String[] args)
{
ORB myORB = null;
@@ -68,13 +68,13 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
ORBManager.setORB(myORB);
ORBManager.setPOA(myOA);
-
+
CurrentImple current = OTSImpleManager.current();
Control theControl = null;
String objectReference = "/tmp/object.ref";
@@ -82,7 +82,7 @@
if (System.getProperty("os.name").startsWith("Windows"))
objectReference = "C:\\temp\\object.ref";
-
+
for (int i = 0; i < args.length; i++)
{
if (args[i].compareTo("-reffile") == 0)
@@ -97,16 +97,16 @@
SetGet SetGetVar = null;
System.out.println("Setting transaction timeout to 2 seconds.");
-
+
current.set_timeout(2);
-
+
current.begin();
current.begin();
-
+
try
{
Services serv = new Services(myORB);
-
+
SetGetVar = SetGetHelper.narrow(myORB.orb().string_to_object(getService(objectReference)));
}
catch (Exception e)
@@ -119,7 +119,7 @@
try
{
theControl = current.get_control();
-
+
SetGetVar.set((short) 2, theControl);
theControl = null;
@@ -136,7 +136,7 @@
try
{
System.out.println("Now sleeping for 5 seconds.");
-
+
Thread.sleep(5000);
}
catch (Exception e)
@@ -189,7 +189,7 @@
System.out.println("\nTest completed successfully.");
myOA.destroy();
- myORB.shutdown();
+ myORB.shutdown();
assertSuccess();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMClient.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -45,7 +45,7 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import org.omg.CosTransactions.*;
@@ -68,7 +68,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -81,7 +81,7 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
TransactionFactory theOTS = null;
Control topLevelControl = null;
Control nestedControl = null;
@@ -151,7 +151,7 @@
}
System.out.println("Creating transaction.");
-
+
try
{
topLevelControl = theOTS.create(0);
@@ -184,7 +184,7 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
try
{
DistributedHammerWorker1.hammerObject_1 = HammerHelper.narrow(serv.getService(server, null, Services.FILE));
@@ -195,7 +195,7 @@
System.out.println("incremented.");
System.out.println("sleeping.");
-
+
Thread.sleep(20000);
nestedControl.get_terminator().rollback();
@@ -203,13 +203,13 @@
if (!slave)
{
System.out.println("master sleeping again.");
-
+
Thread.sleep(20000);
}
-
+
IntHolder value = new IntHolder(0);
- org.omg.CosTransactions.PropagationContext ctx = topLevelControl.get_coordinator().get_txcontext();
+ org.omg.CosTransactions.PropagationContext ctx = topLevelControl.get_coordinator().get_txcontext();
if (!DistributedHammerWorker1.hammerObject_1.get(value, topLevelControl))
{
@@ -238,7 +238,7 @@
public static void main (String[] args)
{
TMClient test = new TMClient();
-
+
test.run(args);
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/remote/transactionserver/TMTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -45,7 +45,7 @@
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.common.util.propertyservice.PropertyManager;
@@ -70,7 +70,7 @@
{
myORB = ORB.getInstance("test");
myOA = OA.getRootOA(myORB);
-
+
myORB.initORB(args, null);
myOA.initOA();
@@ -83,7 +83,7 @@
e.printStackTrace(System.err);
assertFailure();
}
-
+
TransactionFactory theOTS = null;
Control topLevelControl = null;
Services serv = new Services(myORB);
@@ -130,7 +130,7 @@
}
System.out.println("Creating transaction.");
-
+
try
{
topLevelControl = theOTS.create(0);
@@ -143,7 +143,7 @@
}
assertSuccess();
-
+
myOA.destroy();
myORB.shutdown();
}
@@ -151,8 +151,8 @@
public static void main (String[] args)
{
TMTest test = new TMTest();
-
+
test.run(args);
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/ORBInitialisationTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/ORBInitialisationTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/ORBInitialisationTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
package com.hp.mwtests.orbportability.initialisation;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.orb.*;
import com.arjuna.orbportability.*;
@@ -45,18 +45,18 @@
{
public final static int NONE = 0, PREINIT = 1, POSTINIT = 2, INVALID = 3;
private final static String[] STATE_TEXT = { "NONE","PREINIT","POSTINIT","INVALID" };
-
+
private int _currentState;
-
+
public static String getStateText(int value)
{
return(STATE_TEXT[value]);
}
-
+
public void preInitAttributeCalled()
{
logInformation("Previous State: " + getStateText(_currentState));
-
+
switch (_currentState)
{
case NONE:
@@ -68,14 +68,14 @@
_currentState = INVALID;
break;
}
-
+
logInformation(" Current State: " + getStateText(_currentState));
}
-
+
public void postInitAttributeCalled()
{
logInformation("Previous State: " + getStateText(_currentState));
-
+
switch (_currentState)
{
case NONE:
@@ -87,7 +87,7 @@
_currentState = INVALID;
break;
}
-
+
logInformation(" Current State: " + getStateText(_currentState));
}
@@ -110,12 +110,12 @@
* Initialise the ORB and OA
*/
logInformation("Initialising ORB and OA");
-
+
orb.initORB(args, null);
oa.initOA();
-
+
if (_currentState == POSTINIT)
- assertSuccess();
+ assertSuccess();
else
assertFailure();
}
@@ -125,45 +125,45 @@
e.printStackTrace();
assertFailure();
}
-
+
oa.destroy();
orb.shutdown();
- }
+ }
public class PreTestAttribute extends Attribute
{
protected TestAttributeCallback _callback = null;
-
+
public PreTestAttribute( TestAttributeCallback callback )
{
_callback = callback;
}
-
+
public void initialise (String[] params)
{
_callback.preInitAttributeCalled();
}
-
+
public boolean postORBInit ()
{
return(false);
}
}
-
+
public class PostTestAttribute extends Attribute
{
protected TestAttributeCallback _callback = null;
-
+
public PostTestAttribute( TestAttributeCallback callback )
{
_callback = callback;
}
-
+
public void initialise (String[] params)
{
_callback.postInitAttributeCalled();
}
-
+
public boolean postORBInit ()
{
return(true);
@@ -173,10 +173,10 @@
public static void main(String[] args)
{
ORBInitialisationTest test = new ORBInitialisationTest();
-
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
+
test.runTest();
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PostSetTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PostSetTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PostSetTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,8 +31,8 @@
package com.hp.mwtests.orbportability.initialisation;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.orbportability.internal.utils.PostSetLoader;
import com.arjuna.orbportability.ORB;
import com.hp.mwtests.orbportability.initialisation.postset.AllPostSet;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -30,7 +30,7 @@
*/
package com.hp.mwtests.orbportability.initialisation;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.internal.utils.PreInitLoader;
import com.arjuna.orbportability.internal.utils.PostInitLoader;
import com.arjuna.orbportability.ORB;
@@ -225,7 +225,7 @@
{
PropertyInitTest test = new PropertyInitTest();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.runTest();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest2.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest2.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest2.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -30,7 +30,7 @@
*/
package com.hp.mwtests.orbportability.initialisation;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.internal.utils.PreInitLoader;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
@@ -174,7 +174,7 @@
{
PropertyInitTest2 test = new PropertyInitTest2();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.runTest();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest3.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest3.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest3.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
package com.hp.mwtests.orbportability.initialisation;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.internal.utils.PreInitLoader;
import com.arjuna.orbportability.internal.utils.PostInitLoader;
import com.arjuna.orbportability.ORB;
@@ -227,7 +227,7 @@
{
PropertyInitTest3 test = new PropertyInitTest3();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.runTest();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest4.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest4.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/initialisation/PropertyInitTest4.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,8 +31,8 @@
package com.hp.mwtests.orbportability.initialisation;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.orbportability.internal.utils.PreInitLoader;
import com.arjuna.orbportability.internal.utils.PostInitLoader;
import com.arjuna.orbportability.ORB;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinfo/ORBInfoTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinfo/ORBInfoTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinfo/ORBInfoTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,27 +1,27 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
package com.hp.mwtests.orbportability.orbinfo;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.orbportability.ORBInfo;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinstance/MultipleORBInstances.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinstance/MultipleORBInstances.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbinstance/MultipleORBInstances.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -30,7 +30,7 @@
package com.hp.mwtests.orbportability.orbinstance;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.orbportability.RootOA;
@@ -164,7 +164,7 @@
{
MultipleORBInstances test = new MultipleORBInstances();
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
test.runTest();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbspecific/orbinstance/SimpleServer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbspecific/orbinstance/SimpleServer.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/orbspecific/orbinstance/SimpleServer.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,26 +1,26 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
package com.hp.mwtests.orbportability.orbspecific.orbinstance;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.RootOA;
@@ -92,7 +92,7 @@
{
SimpleServer server = new SimpleServer();
- server.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ server.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
server.runTest();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/services/ServiceTestSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/services/ServiceTestSetup.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/services/ServiceTestSetup.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -25,13 +25,13 @@
* Newcastle upon Tyne,
* Tyne and Wear,
* UK.
- *
+ *
* $Id: ServiceTestSetup.java 2342 2006-03-30 13:06:17Z $
*/
package com.hp.mwtests.orbportability.services;
-import com.arjuna.mwlabs.testframework.unittest.Test;
-import com.arjuna.mwlabs.testframework.unittest.LocalHarness;
+import org.jboss.dtf.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.LocalHarness;
import com.arjuna.orbportability.Services;
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/OAPrePostShutdownTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/OAPrePostShutdownTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/OAPrePostShutdownTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
package com.hp.mwtests.orbportability.shutdown;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.*;
import com.arjuna.orbportability.OA;
@@ -44,9 +44,9 @@
{
public static final int NONE = 0, PRESHUTDOWN = 1, POSTSHUTDOWN = 2, INVALID = 3;
private static final String[] STATE_STRING = {"NONE", "PRESHUTDOWN", "POSTSHUTDOWN", "INVALID" };
-
+
public int _currentState;
-
+
/**
* Generates a String version of the 'enumerated value'.
*
@@ -57,10 +57,10 @@
{
if ( (value >= NONE) && (value <= INVALID) )
return(STATE_STRING[value]);
-
+
return("##ERROR##");
}
-
+
/**
* Called by the pre-shutdown subclass to inform test that it has been prodded
*
@@ -69,7 +69,7 @@
public void preShutdownCalled(String name)
{
logInformation( "Previous State : "+ PrettyPrintState( _currentState ) );
-
+
switch ( _currentState )
{
case NONE :
@@ -81,8 +81,8 @@
default :
_currentState = INVALID;
break;
- }
-
+ }
+
logInformation( " Current State : "+ PrettyPrintState( _currentState ) );
}
@@ -106,11 +106,11 @@
default :
_currentState = INVALID;
break;
- }
+ }
logInformation( " Current State : "+ PrettyPrintState( _currentState ) );
}
-
+
public void run(String[] args)
{
ORB orb = ORB.getInstance("main_orb");
@@ -121,10 +121,10 @@
* Initialise the ORB and OA
*/
logInformation("Initialising ORB and OA");
-
+
orb.initORB(args, null);
oa.initOA();
-
+
_currentState = NONE;
}
catch (Exception e)
@@ -133,7 +133,7 @@
e.printStackTrace();
assertFailure();
}
-
+
/**
* Register pre and post shutdown handlers
*/
@@ -146,32 +146,32 @@
logInformation("Shutting down ORB and OA");
oa.destroy();
orb.shutdown();
-
+
/*
* Ensure final state is correct
*/
logInformation("Final state: " + PrettyPrintState(_currentState) );
-
+
if ( _currentState == POSTSHUTDOWN )
assertSuccess();
else
assertFailure();
}
-
+
/**
*
*/
public class TestPreShutdown extends com.arjuna.orbportability.oa.PreShutdown
{
private PrePostTestCallback _callback;
-
+
public TestPreShutdown(String name, PrePostTestCallback callback)
{
super(name);
-
+
_callback = callback;
}
-
+
/**
* Should be called before the OA is shutdown
*/
@@ -187,30 +187,30 @@
public class TestPostShutdown extends com.arjuna.orbportability.oa.PostShutdown
{
private PrePostTestCallback _callback;
-
+
public TestPostShutdown(String name, PrePostTestCallback callback)
{
super(name);
_callback = callback;
}
-
+
/**
* Should be called before the OA is shutdown
*/
public void work ()
{
_callback.postShutdownCalled(name());
- }
+ }
}
public static void main(String[] args)
{
OAPrePostShutdownTest test = new OAPrePostShutdownTest();
-
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
+
test.runTest();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/ORBPrePostShutdownTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/ORBPrePostShutdownTest.java 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/tests/classes/com/hp/mwtests/orbportability/shutdown/ORBPrePostShutdownTest.java 2008-06-25 13:05:39 UTC (rev 20765)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * 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 General Public License, v. 2.0.
- * 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
+ * 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 General Public License for more details.
* You should have received a copy of the GNU General Public License,
* v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -31,7 +31,7 @@
package com.hp.mwtests.orbportability.shutdown;
-import com.arjuna.mwlabs.testframework.unittest.Test;
+import org.jboss.dtf.testframework.unittest.Test;
import com.arjuna.orbportability.*;
import com.arjuna.orbportability.OA;
@@ -45,9 +45,9 @@
{
public static final int NONE = 0, PRESHUTDOWN = 1, POSTSHUTDOWN = 2, INVALID = 3;
private static final String[] STATE_STRING = {"NONE", "PRESHUTDOWN", "POSTSHUTDOWN", "INVALID" };
-
+
public int _currentState;
-
+
/**
* Generates a String version of the 'enumerated value'.
*
@@ -58,10 +58,10 @@
{
if ( (value >= NONE) && (value <= INVALID) )
return(STATE_STRING[value]);
-
+
return("##ERROR##");
}
-
+
/**
* Called by the pre-shutdown subclass to inform test that it has been prodded
*
@@ -70,7 +70,7 @@
public void preShutdownCalled(String name)
{
logInformation( "Previous State : "+ PrettyPrintState( _currentState ) );
-
+
switch ( _currentState )
{
case NONE :
@@ -82,8 +82,8 @@
default :
_currentState = INVALID;
break;
- }
-
+ }
+
logInformation( " Current State : "+ PrettyPrintState( _currentState ) );
}
@@ -107,11 +107,11 @@
default :
_currentState = INVALID;
break;
- }
+ }
logInformation( " Current State : "+ PrettyPrintState( _currentState ) );
}
-
+
public void run(String[] args)
{
ORB orb = ORB.getInstance("main_orb");
@@ -123,10 +123,10 @@
* Initialise the ORB and OA
*/
logInformation("Initialising ORB and OA");
-
+
orb.initORB(args, null);
oa.initOA();
-
+
_currentState = NONE;
}
catch (Exception e)
@@ -135,7 +135,7 @@
e.printStackTrace();
assertFailure();
}
-
+
/**
* Register pre and post shutdown handlers
*/
@@ -148,35 +148,35 @@
logInformation("Shutting down ORB and OA");
oa.destroy();
orb.shutdown();
-
+
/*
* Ensure final state is correct
*/
logInformation("Final state: " + PrettyPrintState(_currentState) );
-
+
if ( _currentState == POSTSHUTDOWN )
assertSuccess();
else
assertFailure();
}
-
+
/**
*
*/
public class TestPreShutdown extends com.arjuna.orbportability.orb.PreShutdown
{
private PrePostTestCallback _callback;
-
+
public TestPreShutdown(String name, PrePostTestCallback callback)
{
super(name);
-
+
_callback = callback;
}
-
+
/**
* Should be called before the ORB is shutdown
- */
+ */
public void work ()
{
_callback.preShutdownCalled(name());
@@ -189,30 +189,30 @@
public class TestPostShutdown extends com.arjuna.orbportability.orb.PostShutdown
{
private PrePostTestCallback _callback;
-
+
public TestPostShutdown(String name, PrePostTestCallback callback)
{
super(name);
_callback = callback;
}
-
+
/**
* Should be called before the ORB is shutdown
- */
+ */
public void work ()
{
_callback.postShutdownCalled(name());
- }
+ }
}
public static void main(String[] args)
{
OAPrePostShutdownTest test = new OAPrePostShutdownTest();
-
- test.initialise(null, null, args, new com.arjuna.mwlabs.testframework.unittest.LocalHarness());
+ test.initialise(null, null, args, new org.jboss.dtf.testframework.unittest.LocalHarness());
+
test.runTest();
}
}
Modified: labs/jbosstm/trunk/ext/Readme
===================================================================
--- labs/jbosstm/trunk/ext/Readme 2008-06-25 12:46:39 UTC (rev 20764)
+++ labs/jbosstm/trunk/ext/Readme 2008-06-25 13:05:39 UTC (rev 20765)
@@ -22,7 +22,7 @@
"Local" libraries:
-TestingFramework.jar DTF : 16 July 2002
+TestingFramework.jar JBossDTF 4.0.0.GA
"3rd party" libraries:
Modified: labs/jbosstm/trunk/ext/TestingFramework.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list