[jboss-svn-commits] JBL Code SVN: r29918 - in labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta: resources/jts/orbspecific and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 3 12:57:30 EST 2009
Author: mark.little at jboss.com
Date: 2009-11-03 12:57:29 -0500 (Tue, 03 Nov 2009)
New Revision: 29918
Removed:
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecordSetup.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java 2009-11-03 17:41:11 UTC (rev 29917)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java 2009-11-03 17:57:29 UTC (rev 29918)
@@ -31,8 +31,25 @@
package com.arjuna.ats.internal.jta;
-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 com.arjuna.ats.internal.jta.resources.jts.orbspecific.XAResourceRecord;
+class ExtendedXAResourceRecordMap implements RecordTypeMap
+{
+ @SuppressWarnings("unchecked")
+ public Class getRecordClass ()
+ {
+ return XAResourceRecord.class;
+ }
+
+ public int getType ()
+ {
+ return RecordType.JTAX_RECORD;
+ }
+}
+
public class Implementationsx
{
@@ -49,7 +66,7 @@
* Now add various abstract records which crash recovery needs.
*/
- Inventory.inventory().addToList(new com.arjuna.ats.internal.jta.resources.jts.orbspecific.XAResourceRecordSetup());
+ RecordTypeManager.manager().add(new ExtendedXAResourceRecordMap());
_added = true;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2009-11-03 17:41:11 UTC (rev 29917)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2009-11-03 17:57:29 UTC (rev 29918)
@@ -47,6 +47,7 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
+import com.arjuna.ats.arjuna.coordinator.TxControl;
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.coordinator.RecordType;
@@ -1359,7 +1360,7 @@
private final void setObjectStore()
{
if (_objStore == null)
- _objStore = new ObjectStore(null, ""); // interface gets default
+ _objStore = TxControl.getStore();
}
/**
Deleted: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecordSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecordSetup.java 2009-11-03 17:41:11 UTC (rev 29917)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecordSetup.java 2009-11-03 17:57:29 UTC (rev 29918)
@@ -1,80 +0,0 @@
-/*
- * 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
- * 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.
- */
-/*
- * Copyright (C) 2004,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: XAResourceRecordSetup.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.jta.resources.jts.orbspecific;
-
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-
-public class XAResourceRecordSetup implements InventoryElement
-{
-
- public XAResourceRecordSetup ()
- {
- }
-
- public synchronized Object createVoid ()
- {
- return com.arjuna.ats.internal.jts.resources.ExtendedResourceRecord.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.JTAX_RECORD");
- }
-
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java 2009-11-03 17:41:11 UTC (rev 29917)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java 2009-11-03 17:57:29 UTC (rev 29918)
@@ -251,8 +251,7 @@
try
{
- ObjectStore objStore = new ObjectStore(TxControl
- .getActionStoreType());
+ ObjectStore objStore = TxControl.getStore();
InputObjectState states = new InputObjectState();
// only look in the JCA section of the object store
More information about the jboss-svn-commits
mailing list