[jboss-svn-commits] JBL Code SVN: r29920 - in labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa: Utils and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 3 13:08:19 EST 2009
Author: mark.little at jboss.com
Date: 2009-11-03 13:08:19 -0500 (Tue, 03 Nov 2009)
New Revision: 29920
Removed:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst0Setup.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst1Setup.java
Modified:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst0.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst1.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JDBCAccess.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/TransactionLog.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst0.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst0.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst0.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -20,12 +20,29 @@
*/
package org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.setup;
-import com.arjuna.ats.arjuna.gandiva.inventory.Inventory;
+import com.arjuna.ats.arjuna.coordinator.RecordType;
+import com.arjuna.ats.arjuna.coordinator.record.RecordTypeManager;
+import com.arjuna.ats.arjuna.coordinator.record.RecordTypeMap;
+import org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.impl.BasicAbstractRecord;
+class UserDefFirst0Map implements RecordTypeMap
+{
+ @SuppressWarnings("unchecked")
+ public Class getRecordClass ()
+ {
+ return BasicAbstractRecord.class;
+ }
+
+ public int getType ()
+ {
+ return RecordType.USER_DEF_FIRST0;
+ }
+}
+
public class AddUserDefFirst0
{
public AddUserDefFirst0()
{
- Inventory.inventory().addToList(new UserDefFirst0Setup());
+ RecordTypeManager.manager().add(new UserDefFirst0Map());
}
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst1.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst1.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/AddUserDefFirst1.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -20,12 +20,30 @@
*/
package org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.setup;
-import com.arjuna.ats.arjuna.gandiva.inventory.Inventory;
+import org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.impl.CrashAbstractRecord02;
+import com.arjuna.ats.arjuna.coordinator.RecordType;
+import com.arjuna.ats.arjuna.coordinator.record.RecordTypeManager;
+import com.arjuna.ats.arjuna.coordinator.record.RecordTypeMap;
+
+class UserDefFirst1Map implements RecordTypeMap
+{
+ @SuppressWarnings("unchecked")
+ public Class getRecordClass ()
+ {
+ return CrashAbstractRecord02.class;
+ }
+
+ public int getType ()
+ {
+ return RecordType.USER_DEF_FIRST1;
+ }
+}
+
public class AddUserDefFirst1
{
public AddUserDefFirst1()
{
- Inventory.inventory().addToList(new UserDefFirst1Setup());
+ RecordTypeManager.manager().add(new UserDefFirst1Map());
}
}
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst0Setup.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst0Setup.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst0Setup.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- *
- * Look at OTS_AbstractRecordSetup.java to see what CORBA does.
- */
-package org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.setup;
-
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-import org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.impl.BasicAbstractRecord;
-
-public class UserDefFirst0Setup implements InventoryElement
-{
-
- public UserDefFirst0Setup()
- {
- }
-
- public synchronized Object createVoid()
- {
- return BasicAbstractRecord.create();
- }
-
- public synchronized Object createClassName(ClassName className)
- {
- return null;
- }
-
- public synchronized Object createObjectName(ObjectName objectName)
- {
- return null;
- }
-
- public synchronized Object createResources(Object[] resources)
- {
- return null;
- }
-
- public synchronized Object createClassNameResources(ClassName className, Object[] resources)
- {
- return null;
- }
-
- public synchronized Object createObjectNameResources(ObjectName objectName, Object[] resources)
- {
- return null;
- }
-
- public ClassName className()
- {
- return new ClassName("RecordType.USER_DEF_FIRST0");
- }
-
-}
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst1Setup.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst1Setup.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/CrashRecovery/setup/UserDefFirst1Setup.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- *
- * Look at OTS_AbstractRecordSetup.java to see what CORBA does.
- */
-package org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.setup;
-
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-import org.jboss.jbossts.qa.ArjunaCore.AbstractRecord.CrashRecovery.impl.CrashAbstractRecord02;
-
-public class UserDefFirst1Setup implements InventoryElement
-{
-
- public UserDefFirst1Setup()
- {
- }
-
- public synchronized Object createVoid()
- {
- return CrashAbstractRecord02.create();
- }
-
- public synchronized Object createClassName(ClassName className)
- {
- return null;
- }
-
- public synchronized Object createObjectName(ObjectName objectName)
- {
- return null;
- }
-
- public synchronized Object createResources(Object[] resources)
- {
- return null;
- }
-
- public synchronized Object createClassNameResources(ClassName className, Object[] resources)
- {
- return null;
- }
-
- public synchronized Object createObjectNameResources(ObjectName objectName, Object[] resources)
- {
- return null;
- }
-
- public ClassName className()
- {
- return new ClassName("RecordType.USER_DEF_FIRST1");
- }
-
-}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JDBCAccess.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JDBCAccess.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JDBCAccess.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -34,8 +34,6 @@
package org.jboss.jbossts.qa.Utils;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -80,7 +78,7 @@
return false;
}
- public void initialise(ObjectName objName)
+ public void initialise(Object[] objName)
{
}
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/TransactionLog.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/TransactionLog.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/astests/taskdefs/TransactionLog.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -22,16 +22,13 @@
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.AtomicAction;
-import com.arjuna.ats.arjuna.coordinator.ActionStatus;
+import com.arjuna.ats.arjuna.coordinator.TxControl;
import com.arjuna.ats.internal.arjuna.common.UidHelper;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Collection;
/**
@@ -56,9 +53,20 @@
System.setProperty("com.arjuna.ats.arjuna.objectstore.objectStoreDir", storeDir);
if (impleType != null)
- store = new ObjectStore(new ClassName(impleType), (String) null);
+ {
+ try
+ {
+ Class c = Class.forName(impleType);
+
+ store = (ObjectStore) c.newInstance();
+ }
+ catch (final Throwable ex)
+ {
+ ex.printStackTrace();
+ }
+ }
else
- store = new ObjectStore();
+ store = TxControl.getStore();
}
/**
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java 2009-11-03 18:00:23 UTC (rev 29919)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java 2009-11-03 18:08:19 UTC (rev 29920)
@@ -535,7 +535,7 @@
list.add((param));
}
}
-
+
return list.toArray(new String[list.size()]);
}
More information about the jboss-svn-commits
mailing list