[jboss-svn-commits] JBL Code SVN: r29919 - in labs/jbosstm/trunk/XTS: WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Nov 3 13:00:23 EST 2009


Author: mark.little at jboss.com
Date: 2009-11-03 13:00:23 -0500 (Tue, 03 Nov 2009)
New Revision: 29919

Removed:
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ParticipantRecordSetup.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/ParticipantRecordSetup.java
Modified:
   labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ParticipantRecord.java
   labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java
   labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java
   labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/DemoParticipant.java
   labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/FailureParticipant.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/Implementations.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/Implementations.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615

Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ParticipantRecord.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ParticipantRecord.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ParticipantRecord.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -37,7 +37,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.mw.wscf.model.as.coordinator.*;
 
@@ -151,15 +150,6 @@
 	}
 
 	/**
-	 * The class name for this record.
-	 */
-
-	public ClassName className ()
-	{
-		return new ClassName(toString());
-	}
-
-	/**
 	 * The internal value.
 	 */
 

Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -37,7 +37,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.mw.wscf.model.sagas.participants.Participant;
 import com.arjuna.mw.wscf.model.sagas.participants.ParticipantWithComplete;
@@ -109,15 +108,6 @@
 	}
 
 	/**
-	 * The class name for this record.
-	 */
-
-	public ClassName className ()
-	{
-		return new ClassName("WSBAParticipantRecord");
-	}
-
-	/**
 	 * The internal value.
 	 */
 

Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -37,7 +37,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.mw.wscf.model.twophase.vote.*;
 import com.arjuna.mw.wscf.model.twophase.participants.Participant;
@@ -106,15 +105,6 @@
 	}
 
 	/**
-	 * The class name for this record.
-	 */
-
-	public ClassName className ()
-	{
-		return new ClassName("WSATParticipantRecord");
-	}
-
-	/**
 	 * The internal value.
 	 */
 

Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/DemoParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/DemoParticipant.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/DemoParticipant.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -31,11 +31,9 @@
 
 package com.arjuna.wscf.tests;
 
-import com.arjuna.ats.arjuna.ObjectType;
 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.mw.wsas.activity.Outcome;
 
@@ -46,15 +44,12 @@
 import com.arjuna.mw.wscf.model.as.coordinator.twophase.outcomes.*;
 import com.arjuna.mw.wscf.model.as.coordinator.twophase.messages.*;
 
-import com.arjuna.mw.wscf.model.twophase.common.*;
 import com.arjuna.mw.wscf.model.twophase.outcomes.*;
 
 import com.arjuna.mw.wsas.exceptions.SystemException;
 import com.arjuna.mw.wsas.exceptions.WrongStateException;
 import com.arjuna.mw.wsas.exceptions.ProtocolViolationException;
 
-import java.util.Hashtable;
-
 /**
  * @author Mark Little (mark.little at arjuna.com)
  * @version $Id: DemoParticipant.java,v 1.4 2004/03/15 13:25:14 nmcl Exp $

Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/FailureParticipant.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/FailureParticipant.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/FailureParticipant.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -31,11 +31,9 @@
 
 package com.arjuna.wscf.tests;
 
-import com.arjuna.ats.arjuna.ObjectType;
 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.mw.wsas.activity.Outcome;
 
@@ -45,15 +43,12 @@
 import com.arjuna.mw.wscf.model.as.coordinator.twophase.outcomes.*;
 import com.arjuna.mw.wscf.model.as.coordinator.twophase.messages.*;
 
-import com.arjuna.mw.wscf.model.twophase.common.*;
 import com.arjuna.mw.wscf.model.twophase.outcomes.*;
 
 import com.arjuna.mw.wsas.exceptions.SystemException;
 import com.arjuna.mw.wsas.exceptions.WrongStateException;
 import com.arjuna.mw.wsas.exceptions.ProtocolViolationException;
 
-import java.util.Hashtable;
-
 /**
  * @author Mark Little (mark.little at arjuna.com)
  * @version $Id: FailureParticipant.java,v 1.4 2004/03/15 13:25:14 nmcl Exp $

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/Implementations.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/Implementations.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/Implementations.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -21,7 +21,10 @@
 
 package org.jboss.jbossts.xts.recovery.coordinator.at;
 
-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.mwlabs.wscf.model.twophase.arjunacore.ParticipantRecord;
 
 /**
  * Module specific class that is responsible for adding any implementations
@@ -31,24 +34,37 @@
  * @version $Id: Implementations.java 2342 2006-03-30 13:06:17Z  $
  * @since JTS 1.0.
  */
+
+class ParticipantMap implements RecordTypeMap
+{
+    @SuppressWarnings("unchecked")
+    public Class getRecordClass ()
+    {
+        return ParticipantRecord.class;
+    }
+    
+    public int getType ()
+    {
+        return RecordType.XTS_WSAT_RECORD;
+    }
+    
+}
 public class Implementations {
 
-    static ParticipantRecordSetup _inventoryItem = null;
+    static boolean _added = false;
 
     public static synchronized void install ()
     {
-        if (_inventoryItem == null)  {
-            _inventoryItem = new ParticipantRecordSetup();
-            // WS-AT Participant records.
-            Inventory.inventory().addToList(_inventoryItem);
+        if (!_added)
+        {
+            RecordTypeManager.manager().add(new ParticipantMap());
+            
+            _added = true;
         }
     }
 
     public static synchronized void uninstall()
     {
-        if (_inventoryItem != null) {
-            Inventory.inventory().removeFromList(_inventoryItem.className());
-        }
     }
 
     private Implementations ()

Deleted: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ParticipantRecordSetup.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ParticipantRecordSetup.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/ParticipantRecordSetup.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -1,74 +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.
- */
-package org.jboss.jbossts.xts.recovery.coordinator.at;
-
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.coordinator.RecordType;
-
-import com.arjuna.mwlabs.wscf.model.twophase.arjunacore.ParticipantRecord;
-
-/**
- * Created by IntelliJ IDEA.
- * User: jhalli
- * Date: Aug 20, 2007
- * Time: 3:18:23 PM
- * To change this template use File | Settings | File Templates.
- */
-public class ParticipantRecordSetup implements InventoryElement {
-
-    public synchronized Object createVoid ()
-    {
-        return ParticipantRecord.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 RecordType.typeToClassName(RecordType.XTS_WSAT_RECORD);
-    }
-
-}

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/Implementations.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/Implementations.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/Implementations.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -21,7 +21,10 @@
 
 package org.jboss.jbossts.xts.recovery.coordinator.ba;
 
-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.mwlabs.wscf.model.sagas.arjunacore.ParticipantRecord;
 
 /**
  * Module specific class that is responsible for adding any implementations
@@ -31,24 +34,37 @@
  * @version $Id: Implementations.java 2342 2006-03-30 13:06:17Z  $
  * @since JTS 1.0.
  */
+
+class ParticipantRecordMap implements RecordTypeMap
+{
+    @SuppressWarnings("unchecked")
+    public Class getRecordClass ()
+    {
+        return ParticipantRecord.class;
+    }
+    
+    public int getType ()
+    {
+        return RecordType.XTS_WSBA_RECORD;
+    }
+}
+
 public class Implementations {
 
-    static ParticipantRecordSetup _inventoryItem = null;
+    static boolean _added = false;
 
     public static synchronized void install ()
     {
-        if (_inventoryItem == null)  {
-            _inventoryItem = new ParticipantRecordSetup();
-            // WS-BA Participant records.
-            Inventory.inventory().addToList(_inventoryItem);
+        if (!_added)
+        {
+            RecordTypeManager.manager().add(new ParticipantRecordMap());
+            
+            _added = true;
         }
     }
 
     public static synchronized void uninstall()
     {
-        if (_inventoryItem != null) {
-            Inventory.inventory().removeFromList(_inventoryItem.className());
-        }
     }
 
     private Implementations()

Deleted: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/ParticipantRecordSetup.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/ParticipantRecordSetup.java	2009-11-03 17:57:29 UTC (rev 29918)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/ParticipantRecordSetup.java	2009-11-03 18:00:23 UTC (rev 29919)
@@ -1,74 +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.
- */
-package org.jboss.jbossts.xts.recovery.coordinator.ba;
-
-import com.arjuna.ats.arjuna.gandiva.inventory.InventoryElement;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.coordinator.RecordType;
-
-import com.arjuna.mwlabs.wscf.model.sagas.arjunacore.ParticipantRecord;
-
-/**
- * Created by IntelliJ IDEA.
- * User: jhalli
- * Date: Aug 20, 2007
- * Time: 3:18:23 PM
- * To change this template use File | Settings | File Templates.
- */
-public class ParticipantRecordSetup implements InventoryElement {
-
-    public synchronized Object createVoid ()
-    {
-        return ParticipantRecord.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 RecordType.typeToClassName(RecordType.XTS_WSBA_RECORD);
-    }
-
-}
\ No newline at end of file



More information about the jboss-svn-commits mailing list