[jboss-svn-commits] JBL Code SVN: r29921 - in labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats: internal/jts/resources and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 3 13:10:15 EST 2009
Author: mark.little at jboss.com
Date: 2009-11-03 13:10:14 -0500 (Tue, 03 Nov 2009)
New Revision: 29921
Removed:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecordSetup.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecordSetup.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/CosTransactionsNames.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/Implementations.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/utils/TxStoreLog.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/Implementations.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/Implementations.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/Implementations.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -31,15 +31,45 @@
package com.arjuna.ats.internal.jts;
-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;
/*
* Slightly different for historical reasons.
*/
-import com.arjuna.ats.internal.jts.resources.ResourceRecordSetup;
-import com.arjuna.ats.internal.jts.resources.ExtendedResourceRecordSetup;
+import com.arjuna.ats.internal.jts.resources.ExtendedResourceRecord;
+import com.arjuna.ats.internal.jts.resources.ResourceRecord;
+class ResourceRecordMap implements RecordTypeMap
+{
+ @SuppressWarnings("unchecked")
+ public Class getRecordClass ()
+ {
+ return ResourceRecord.class;
+ }
+
+ public int getType ()
+ {
+ return RecordType.OTS_RECORD;
+ }
+}
+
+class ExtendedResourceRecordMap implements RecordTypeMap
+{
+ @SuppressWarnings("unchecked")
+ public Class getRecordClass ()
+ {
+ return ExtendedResourceRecord.class;
+ }
+
+ public int getType ()
+ {
+ return RecordType.OTS_ABSTRACTRECORD;
+ }
+}
+
public class Implementations
{
@@ -56,8 +86,8 @@
* Now add various abstract records which crash recovery needs.
*/
- Inventory.inventory().addToList(new ResourceRecordSetup());
- Inventory.inventory().addToList(new ExtendedResourceRecordSetup());
+ RecordTypeManager.manager().add(new ResourceRecordMap());
+ RecordTypeManager.manager().add(new ExtendedResourceRecordMap());
_added = true;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecord.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -39,8 +39,6 @@
*
*/
-import com.arjuna.ats.jts.CosTransactionsNames;
-
import com.arjuna.ats.jts.logging.*;
import com.arjuna.ats.internal.arjuna.common.UidHelper;
@@ -52,7 +50,6 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.common.util.logging.*;
@@ -292,11 +289,6 @@
return r;
}
- public ClassName className ()
- {
- return CosTransactionsNames.AbstractRecord_ExtendedResourceRecord();
- }
-
public Object value ()
{
return _resourceHandle;
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecordSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecordSetup.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ExtendedResourceRecordSetup.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -1,82 +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) 2000,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: ExtendedResourceRecordSetup.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.jts.resources;
-
-import com.arjuna.ats.jts.CosTransactionsNames;
-
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-
-public class ExtendedResourceRecordSetup implements InventoryElement
-{
-
-public ExtendedResourceRecordSetup ()
- {
- }
-
-public synchronized Object createVoid ()
- {
- return 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 CosTransactionsNames.AbstractRecord_ExtendedResourceRecord();
- }
-
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecord.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -37,7 +37,6 @@
*
*/
-import com.arjuna.ats.jts.CosTransactionsNames;
import com.arjuna.ats.jts.logging.*;
import com.arjuna.ats.internal.arjuna.common.UidHelper;
@@ -49,7 +48,6 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
import com.arjuna.orbportability.*;
@@ -225,11 +223,6 @@
return RecordType.OTS_RECORD;
}
- public ClassName className ()
- {
- return CosTransactionsNames.AbstractRecord_ResourceRecord();
- }
-
public Object value ()
{
return _resourceHandle;
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecordSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecordSetup.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/ResourceRecordSetup.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -1,82 +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) 2000,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: ResourceRecordSetup.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.jts.resources;
-
-import com.arjuna.ats.jts.CosTransactionsNames;
-
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-
-public class ResourceRecordSetup implements InventoryElement
-{
-
-public ResourceRecordSetup ()
- {
- }
-
-public synchronized Object createVoid ()
- {
- return ResourceRecord.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 CosTransactionsNames.AbstractRecord_ResourceRecord();
- }
-
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/utils/TxStoreLog.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/utils/TxStoreLog.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/utils/TxStoreLog.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -32,6 +32,7 @@
package com.arjuna.ats.internal.jts.utils;
import com.arjuna.ats.arjuna.state.*;
+import com.arjuna.ats.arjuna.coordinator.TxControl;
import com.arjuna.ats.arjuna.exceptions.*;
import com.arjuna.ats.arjuna.objectstore.ObjectStore;
@@ -51,7 +52,7 @@
public static boolean getTransactions (InputObjectState os, int status)
{
- ObjectStore store = new ObjectStore(com.arjuna.ats.arjuna.coordinator.TxControl.getActionStoreType());
+ ObjectStore store = TxControl.getStore();
try
{
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/CosTransactionsNames.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/CosTransactionsNames.java 2009-11-03 18:08:19 UTC (rev 29920)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/CosTransactionsNames.java 2009-11-03 18:10:14 UTC (rev 29921)
@@ -1,55 +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) 1998, 1999, 2000,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: CosTransactionsNames.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jts;
-
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-
-/*
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: CosTransactionsNames.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class CosTransactionsNames
-{
-
-public static ClassName AbstractRecord_ResourceRecord ()
- {
- return new ClassName("RecordType.OTS_RECORD");
- }
-
-public static ClassName AbstractRecord_ExtendedResourceRecord ()
- {
- return new ClassName("RecordType.OTS_ABSTRACTRECORD");
- }
-
-}
More information about the jboss-svn-commits
mailing list