[jboss-svn-commits] JBL Code SVN: r29917 - in labs/jbosstm/trunk/ArjunaJTA: jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore and 7 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Nov 3 12:41:12 EST 2009


Author: mark.little at jboss.com
Date: 2009-11-03 12:41:11 -0500 (Tue, 03 Nov 2009)
New Revision: 29917

Removed:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecordSetup.java
Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/Implementations.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/AbstractRecordViewer.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/XAResourceRecordViewer.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java
   labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/atomicaction/LiveAtomicActionWrapper.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/Implementations.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/Implementations.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/Implementations.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -31,13 +31,27 @@
 
 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.arjunacore.XAResourceRecord;
 
-import com.arjuna.ats.internal.jta.resources.arjunacore.XAResourceRecordSetup;
+class XAResourceRecordMap implements RecordTypeMap
+{
+    @SuppressWarnings("unchecked")
+    public Class getRecordClass ()
+    {
+        return XAResourceRecord.class;
+    }
+    
+    public int getType ()
+    {
+        return RecordType.JTA_RECORD;
+    }
+}
 
 public class Implementations
 {
-
     public static synchronized boolean added ()
     {
 	return _added;
@@ -50,9 +64,9 @@
 	    /*
 	     * Now add various abstract records which crash recovery needs.
 	     */
-
-	    Inventory.inventory().addToList(new XAResourceRecordSetup());
 	    
+	    RecordTypeManager.manager().add(new XAResourceRecordMap());
+	    
 	    _added = true;
 	}
     }

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -1326,7 +1326,7 @@
 			_failures.clear();
 	}
 
-	private ObjectStore _objStore = new ObjectStore();
+	private ObjectStore _objStore = TxControl.getStore();
 
 	private InputObjectState _uids = new InputObjectState();
 

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -51,13 +51,11 @@
 
 import com.arjuna.ats.arjuna.ObjectType;
 import com.arjuna.ats.arjuna.coordinator.AbstractRecord;
-import com.arjuna.ats.arjuna.coordinator.TwoPhaseCoordinator;
 import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
 import com.arjuna.ats.arjuna.coordinator.RecordType;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.arjuna.common.*;
 import com.arjuna.ats.arjuna.state.*;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
 import com.arjuna.ats.arjuna.recovery.RecoveryModule;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
 
@@ -169,11 +167,6 @@
 		return RecordType.JTA_RECORD;
 	}
 
-	public ClassName className()
-	{
-		return new ClassName("RecordType.JTA_RECORD");
-	}
-
 	public Object value()
 	{
 		return _theXAResource;

Deleted: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecordSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecordSetup.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecordSetup.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -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.arjunacore;
-
-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.jta.resources.arjunacore.XAResourceRecord.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.JTA_RECORD");
-    }
-    
-}

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -318,8 +318,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

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/rootprovider/InFlightTransactionPseudoStore.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -20,7 +20,6 @@
  */
 package com.arjuna.ats.tools.objectstorebrowser.rootprovider;
 
-import com.arjuna.ats.arjuna.objectstore.ObjectStoreImple;
 import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
 import com.arjuna.ats.arjuna.objectstore.ObjectStore;
 import com.arjuna.ats.arjuna.state.InputObjectState;
@@ -28,10 +27,8 @@
 import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.arjuna.logging.tsLogger;
-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.internal.arjuna.common.UidHelper;
+import com.arjuna.ats.internal.arjuna.common.UidHelper;
 import com.arjuna.ats.tools.objectstorebrowser.TransactionLister;
 
 import java.util.Set;
@@ -43,7 +40,7 @@
  * @see com.arjuna.ats.tools.objectstorebrowser.frames.BrowserFrame
  * will only display object store entries.
  */
-public class InFlightTransactionPseudoStore extends ObjectStoreImple implements InventoryElement
+public class InFlightTransactionPseudoStore extends ObjectStore
 {
     public static final String STORE_NAME = "InFlightTransactionPseudoStore";
     private static final String TX_TYPE = "Transaction";
@@ -184,42 +181,4 @@
     {
         return false;
     }
-
-    // InventoryElement implementation
-    public synchronized Object createVoid ()
-    {
-        return new InFlightTransactionPseudoStore();
-    }
-
-    public synchronized Object createResources (Object[] param)
-    {
-        return createVoid();
-    }
-
-    public synchronized Object createClassName (ClassName className)
-    {
-        return null;
-    }
-
-    public synchronized Object createObjectName (ObjectName objectName)
-    {
-        return createVoid();
-    }
-
-    public synchronized Object createClassNameResources (ClassName className, Object[] resources)
-    {
-        return null;
-    }
-
-    public synchronized Object createObjectNameResources (ObjectName objectName, Object[] resources)
-    {
-        return null;
-    }
-
-    public ClassName className ()
-    {
-        return className;
-    }
-
-    private ClassName className = new ClassName(this.getClass().getSimpleName());
 }

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/InFlightTransactionViewer.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -35,9 +35,6 @@
 import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.arjuna.common.Environment;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
-import com.arjuna.ats.arjuna.gandiva.inventory.Inventory;
-import com.arjuna.ats.arjuna.ArjunaNames;
 import com.arjuna.ats.jta.transaction.Transaction;
 
 /**
@@ -45,14 +42,11 @@
  */
 public class InFlightTransactionViewer extends AtomicActionViewer
 {
-    private static final String STORE_KEY = com.arjuna.ats.arjuna.common.Environment.STATIC_INVENTORY_IMPLE + '.' + InFlightTransactionPseudoStore.STORE_NAME;
+   // private static final String STORE_KEY = com.arjuna.ats.arjuna.common.Environment.STATIC_INVENTORY_IMPLE + '.' + InFlightTransactionPseudoStore.STORE_NAME;
     private static final String STORE_VAL = "com.arjuna.ats.tools.objectstorebrowser.rootprovider.InFlightTransactionPseudoStore";
 
     public InFlightTransactionViewer() throws ToolPluginException
     {
-        //arjPropertyManager.propertyManager.setProperty(STORE_KEY, STORE_VAL);
-        Inventory.inventory().addToList(new InFlightTransactionPseudoStore());
-
         if (ObjectStoreBrowserPlugin.getRootProvider() == null)
             throw new ToolPluginException("No object store provider has been configured");
 
@@ -75,7 +69,7 @@
         if (ios instanceof TxInputObjectState)
             delegate = (Transaction)((TxInputObjectState)ios).getRealObject();
 
-        LiveAtomicActionWrapper aaw = new LiveAtomicActionWrapper(delegate, theUid, getObjectName(os), type);
+        LiveAtomicActionWrapper aaw = new LiveAtomicActionWrapper(delegate, theUid, type);
         manipulator.clearEntries();
 
         ListNode node;
@@ -100,21 +94,4 @@
     {
         return "/Transaction/";
     }
-
-    private ObjectName getObjectName(ObjectStore os) //XXX
-    {
-        ObjectName name = new ObjectName("PNS:");
-
-        try
-        {
-            name.setClassNameAttribute(Environment.OBJECTSTORE_TYPE, os.className());
-            name.setStringAttribute(ArjunaNames.StateManager_objectStoreRoot(), os.storeRoot());
-        }
-        catch (java.io.IOException e)
-        {
-            // Ignore
-        }
-
-        return name;
-    }
 }

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/AbstractRecordViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/AbstractRecordViewer.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/AbstractRecordViewer.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -22,7 +22,6 @@
 
 import com.arjuna.ats.arjuna.coordinator.AbstractRecord;
 import com.arjuna.ats.arjuna.coordinator.BasicAction;
-import com.arjuna.ats.arjuna.coordinator.RecoveryAbstractRecord;
 import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
 import com.arjuna.ats.tools.objectstorebrowser.panels.ObjectStoreViewEntry;
 import com.arjuna.ats.tools.objectstorebrowser.panels.StatePanel;
@@ -63,7 +62,7 @@
         statePanel.setData("Creation Time", UidInfo.formatTime(uidInfo.getCreationTime()));
         statePanel.setData("Age (seconds)", String.valueOf(uidInfo.getAge()));
 
-        statePanel.setData("Record Type", record.className().stringForm());
+        statePanel.setData("Record Type", record.getClass().getName());
         statePanel.setData("Type", record.type());
         statePanel.setData("Uid", record.order().toString());
 
@@ -118,17 +117,8 @@
         if (action instanceof BasicActionInfo)
             actionInfo = (BasicActionInfo) action;
 
-        if ((record instanceof RecoveryAbstractRecord))
+        if ((record instanceof XAResourceRecord))
         {
-            RecoveryAbstractRecord rrec = (RecoveryAbstractRecord)record;
-            if (rrec.record() instanceof XAResourceRecord)
-            {
-                xaresrec = (XAResourceRecord) rrec.record();
-                xares = (XAResource) xaresrec.value();
-            }
-        }
-        else if ((record instanceof XAResourceRecord))
-        {
             xaresrec = (XAResourceRecord) record;
             xares = (XAResource) xaresrec.value();
         }

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/XAResourceRecordViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/XAResourceRecordViewer.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/XAResourceRecordViewer.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -23,7 +23,6 @@
 import com.arjuna.ats.tools.objectstorebrowser.panels.StatePanel;
 import com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.XAResourceInfo;
 import com.arjuna.ats.arjuna.coordinator.AbstractRecord;
-import com.arjuna.ats.arjuna.coordinator.RecoveryAbstractRecord;
 import com.arjuna.ats.internal.jta.resources.arjunacore.XAResourceRecord;
 
 import javax.transaction.xa.XAResource;
@@ -34,11 +33,6 @@
     {
         super.updateTableData(record, statePanel);
 
-        if (record instanceof RecoveryAbstractRecord)
-        {
-            record = ((RecoveryAbstractRecord) record).record();
-        }
-
         if (record instanceof XAResourceRecord)
         {
             XAResourceRecord xarr = (XAResourceRecord) record;

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionViewer.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -35,9 +35,7 @@
 import com.arjuna.ats.arjuna.objectstore.ObjectStore;
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.arjuna.common.Environment;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
 import com.arjuna.ats.arjuna.coordinator.RecordList;
-import com.arjuna.ats.arjuna.ArjunaNames;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
@@ -70,7 +68,7 @@
                                 StatePanel infoPanel) throws ObjectStoreException
     {
         Uid theUid = uidNode.getUid();
-        ArjunaTransactionWrapper ba = new ArjunaTransactionWrapper(theUid,getObjectName(os), type);
+        ArjunaTransactionWrapper ba = new ArjunaTransactionWrapper(theUid, type);
         ListNode node;
         SubTreeViewEntry entry;
 
@@ -117,23 +115,6 @@
         }
     }
 
-    private ObjectName getObjectName(ObjectStore os)
-    {
-        ObjectName name = new ObjectName("PNS:");
-
-        try
-        {
-            name.setClassNameAttribute(Environment.OBJECTSTORE_TYPE, os.className());
-            name.setStringAttribute(ArjunaNames.StateManager_objectStoreRoot(), os.storeRoot());
-        }
-        catch (java.io.IOException e)
-        {
-            // Ignore
-        }
-
-        return name;
-    }
-
     /**
      * Get the type this state viewer is intended to be registered against.
      * @return

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/atomicaction/LiveAtomicActionWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/atomicaction/LiveAtomicActionWrapper.java	2009-11-03 17:38:40 UTC (rev 29916)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/atomicaction/LiveAtomicActionWrapper.java	2009-11-03 17:41:11 UTC (rev 29917)
@@ -21,7 +21,6 @@
 package com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.atomicaction;
 
 import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
 import com.arjuna.ats.jta.transaction.Transaction;
 import com.arjuna.ats.internal.jta.xa.TxInfo;
 import com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.UidInfo;
@@ -43,9 +42,9 @@
     private Collection<SynchronizationInfo> synchronizations;
     private Collection<XAResourceInfo> resources;
 
-    public LiveAtomicActionWrapper(Transaction delegate, Uid objUid, ObjectName objectName, String type)
+    public LiveAtomicActionWrapper(Transaction delegate, Uid objUid, String type)
     {
-        super(objUid, objectName, type);  //XXX
+        super(objUid, type);  //XXX
         uidInfo = new UidInfo(objUid, getClass().getName() + "@" + Integer.toHexString(hashCode()));
         this.delegate = delegate;
     }



More information about the jboss-svn-commits mailing list