[jboss-svn-commits] JBL Code SVN: r26594 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 18 11:19:53 EDT 2009
Author: jhalliday
Date: 2009-05-18 11:19:52 -0400 (Mon, 18 May 2009)
New Revision: 26594
Removed:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicList.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicListIterator.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashList.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashListIterator.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/KeyedList.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElement.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElementWrapper.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedList.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListElement.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListEntry.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListIterator.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleList.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListEntry.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListIterator.java
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/SynchronizationRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/SynchronizationRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/tx/tx.java
Log:
Remove template data structures from ArjunaCore and obsolete references to them from elsewhere. JBTM-212
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -38,7 +38,6 @@
import com.arjuna.ats.arjuna.gandiva.*;
import com.arjuna.ats.arjuna.utils.Utility;
import com.arjuna.ats.arjuna.exceptions.FatalError;
-import com.arjuna.ats.internal.arjuna.template.*;
import java.io.PrintWriter;
import java.util.*;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/SynchronizationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/SynchronizationRecord.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/SynchronizationRecord.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -31,7 +31,7 @@
package com.arjuna.ats.arjuna.coordinator;
-import com.arjuna.ats.internal.arjuna.template.ListElement;
+import com.arjuna.ats.arjuna.common.Uid;
/*
* @author Mark Little (mark at arjuna.com)
@@ -39,11 +39,11 @@
* @since 3.0.
*/
-public interface SynchronizationRecord extends ListElement, Comparable
+public interface SynchronizationRecord extends Comparable
{
+ public Uid get_uid ();
public boolean beforeCompletion ();
public boolean afterCompletion (int status);
-
}
\ No newline at end of file
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicList.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicList.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,100 +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: BasicList.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-import com.arjuna.ats.arjuna.common.Uid;
-
-/**
- * A BasicList extends the concept of a SimpleList by
- * searching and storing entries based upon their Uids.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: BasicList.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class BasicList extends SimpleList
-{
-
- /**
- * Create a new BasicList.
- */
-
-public BasicList ()
- {
- }
-
- /**
- * Remove the entry (and return it) which has the specified
- * Uid.
- */
-
-public synchronized ListElement remove (Uid findMe)
- {
- SimpleListIterator iter = new SimpleListIterator(this);
- ListElement th = null;
-
- while ((th = iter.iterate()) != null)
- {
- if (th.get_uid().equals(findMe))
- {
- super.remove(th);
-
- return th;
- }
- }
-
- return null;
- }
-
- /**
- * Return the entry which has the specified Uid.
- */
-
-public synchronized ListElement lookFor (Uid findMe)
- {
- SimpleListIterator iter = new SimpleListIterator(this);
- ListElement th = null;
-
- while ((th = iter.iterate()) != null)
- {
- if (th.get_uid().equals(findMe))
- {
- return th;
- }
- }
-
- return null;
- }
-
-}
-
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicListIterator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicListIterator.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/BasicListIterator.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -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: BasicListIterator.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * An iterator for BasicLists.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: BasicListIterator.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class BasicListIterator extends SimpleListIterator
-{
-
- /**
- * Create a new iterator which will be used to iterate over
- * the provided list.
- */
-
-public BasicListIterator (BasicList list)
- {
- super(list);
- }
-
-}
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashList.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashList.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,203 +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: HashList.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-import com.arjuna.ats.arjuna.common.Uid;
-
-/**
- * This hash table for objects which define get_uid does not use
- * the Java Hashtable class, since we sometimes want to add multiple
- * different values under the same key.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: HashList.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class HashList
-{
-
- /**
- * Create a new HashList with the specified size.
- */
-
-public HashList (int hashBucket)
- {
- maxBucket = hashBucket;
- buckets = new BasicList[hashBucket];
-
- for (int i = 0; i < hashBucket; i++)
- buckets[i] = null;
- }
-
- /**
- * Empty the list.
- */
-
-public synchronized void empty ()
- {
- for (int i = 0; i < maxBucket; i++)
- if (buckets[i] != null)
- buckets[i] = null;
- }
-
- /**
- * Return the total number of entries in the list.
- */
-
-public synchronized int size ()
- {
- int rVal = 0;
-
- for (int i = 0; i < maxBucket; i++)
- {
- if (buckets[i] != null)
- {
- rVal += buckets[i].size();
- }
- }
-
- return rVal;
- }
-
- /**
- * Add the entry to the list. If the item is already present
- * then it will be added again.
- */
-
-public synchronized boolean add (ListElement th)
- {
- if (th != null)
- {
- int entry = th.get_uid().hashCode() % maxBucket;
-
- if (buckets[entry] == null)
- buckets[entry] = new BasicList();
-
- return buckets[entry].add(th);
- }
-
- return false;
- }
-
- /**
- * Insert is like add execpt that it only adds once, i.e., if the entry
- * already exists it returns false.
- */
-
-public synchronized boolean insert (ListElement th)
- {
- if (th != null)
- {
- int entry = th.get_uid().hashCode() % maxBucket;
-
- if (buckets[entry] != null)
- return buckets[entry].insert(th);
- else
- {
- buckets[entry] = new BasicList();
- return buckets[entry].add(th);
- }
- }
-
- return false;
- }
-
- /**
- * Remove the specified item. If it is not present then
- * returns false, otherwise true.
- */
-
-public synchronized boolean remove (ListElement findMe)
- {
- if (findMe != null)
- {
- int entry = findMe.get_uid().hashCode() % maxBucket;
-
- if (buckets[entry] != null)
- return buckets[entry].remove(findMe);
- }
-
- return false;
- }
-
- /**
- * Remove (and return) the item with the specified Uid.
- */
-
-public synchronized ListElement remove (Uid findMe)
- {
- int entry = findMe.hashCode() % maxBucket;
-
- if (buckets[entry] != null)
- return buckets[entry].remove(findMe);
-
- return null;
- }
-
- /**
- * Look for (and return) the item with the specified Uid.
- */
-
-public synchronized ListElement lookFor (Uid findMe)
- {
- int entry = findMe.hashCode() % maxBucket;
-
- if (buckets[entry] != null)
- return buckets[entry].lookFor(findMe);
-
- return null;
- }
-
- /**
- * Remove (and return) the first element from the list.
- */
-
-public synchronized ListElement orderedPop ()
- {
- ListElement th = null;
-
- for (int i = 0; (i < maxBucket) && (th != null); i++)
- {
- if ((buckets[i] != null) && (buckets[i].size() > 0))
- {
- th = buckets[i].orderedPop();
- }
- }
-
- return th;
- }
-
-protected BasicList[] buckets;
-protected int maxBucket;
-
-}
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashListIterator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashListIterator.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/HashListIterator.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,98 +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: HashListIterator.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * An iterator for HashLists.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: HashListIterator.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class HashListIterator
-{
-
- /**
- * Create a new iterator which will be used to iterate over
- * the specified list.
- */
-
-public HashListIterator (HashList list)
- {
- theList = list;
- iter = null;
- lastBucket = -1;
- }
-
- /**
- * Return the next item in the list.
- */
-
-public synchronized ListElement iterate ()
- {
- ListElement th = null;
-
- /*
- * Assume that receiving a null from the current iterator means
- * we have come to the end of that list, so move on to next.
- */
-
- if (iter != null)
- th = iter.iterate();
-
- if (th != null)
- return th;
- else
- iter = null;
-
- lastBucket++; // move on to next bucket!
-
- while ((lastBucket < theList.maxBucket) &&
- ((theList.buckets[lastBucket] == null) ||
- (theList.buckets[lastBucket].size() == 0)))
- lastBucket++;
-
- if (lastBucket < theList.maxBucket)
- iter = new BasicListIterator(theList.buckets[lastBucket]);
-
- if (iter != null)
- th = iter.iterate();
-
- return th;
- }
-
-private HashList theList;
-private BasicListIterator iter;
-private int lastBucket;
-
-}
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/KeyedList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/KeyedList.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/KeyedList.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,170 +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: KeyedList.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-import com.arjuna.ats.arjuna.logging.tsLogger;
-
-import java.util.Hashtable;
-
-/*
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: KeyedList.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class KeyedList
-{
-
-public KeyedList ()
- {
- _theTable = new Hashtable();
- }
-
-public void finalise ()
- {
- _theTable.clear();
- _theTable = null;
- }
-
-public synchronized void add (Object obj, String id)
- {
- _theTable.put(id, new KeyedElement(obj, id));
- }
-
-public synchronized Object get (String id)
- {
- KeyedElement ptr = (KeyedElement) _theTable.get(id);
-
- if (ptr != null)
- {
- /*
- * Now increment reference count.
- */
-
- ptr.ref();
-
- return ptr.object();
- }
- else
- return null;
- }
-
- /*
- * Will delete if ref count == 0.
- */
-
-public synchronized void unref (String id)
- {
- KeyedElement ptr = (KeyedElement) _theTable.get(id);
-
- if (ptr != null)
- {
- if (ptr.unref())
- {
- _theTable.remove(id);
- }
- }
- }
-
-private Hashtable _theTable;
-
-}
-
-class KeyedElement
-{
-
-public KeyedElement (Object obj, String key)
- {
- _obj = obj;
- _key = key;
- _refCount = 1;
- }
-
- /**
- * @message com.arjuna.ats.internal.arjuna.template.KeyedList_1 [com.arjuna.ats.internal.arjuna.template.KeyedList_1] - KeyedElement deleting object {0} with ref count {1}
- */
-public void finalize ()
- {
- if (_refCount != 0)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled())
- {
- //TBR made _refCount as new new Integer(_refCount)
- tsLogger.arjLoggerI18N.warn("com.arjuna.ats.internal.arjuna.template.KeyedList_1",
- new Object[]{_key, new Integer(_refCount)});
- }
- }
-
- _obj = null;
- }
-
-public int refCount ()
- {
- return _refCount;
- }
-
-public Object object ()
- {
- return _obj;
- }
-
-public String key ()
- {
- return _key;
- }
-
-public void ref ()
- {
- _refCount++;
- }
-
-public boolean unref ()
- {
- return (boolean) (--_refCount == 0);
- }
-
-private Object _obj;
-private String _key;
-private int _refCount;
-
-
-};
-
-
-
-
-
-
-
-
-
-
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElement.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElement.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,51 +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: ListElement.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-import com.arjuna.ats.arjuna.common.Uid;
-
-/**
- * Items which are required to be put in some lists
- * must implement this interface.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: ListElement.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public interface ListElement
-{
-
- public Uid get_uid ();
-
-}
-
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElementWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElementWrapper.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/ListElementWrapper.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,90 +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: ListElementWrapper.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-import com.arjuna.ats.arjuna.common.Uid;
-
-/**
- * For those objects which cannot provide get_uid, but which
- * need to be added to a list.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: ListElementWrapper.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class ListElementWrapper implements ListElement
-{
-
- /**
- * Create a new instance with the specified Uid.
- */
-
-public ListElementWrapper (Object o, Uid u)
- {
- _value = o;
- _uid = u;
- }
-
- /**
- * Create a new instance. A new Uid will be automatically created
- * for this item.
- */
-
-public ListElementWrapper (Object o)
- {
- _value = o;
- _uid = new Uid();
- }
-
- /**
- * Return the Uid for the item.
- */
-
-public Uid get_uid ()
- {
- return _uid;
- }
-
- /**
- * Return the item.
- */
-
-public Object value ()
- {
- return _value;
- }
-
-private Object _value;
-private Uid _uid;
-
-}
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedList.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedList.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,303 +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: OrderedList.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * An ordered list stores items in an order defined by the objects
- * themselves. When an item is added, the implementation scans the list
- * and asks all currently registered items whether they are "equal",
- * "less than", or "greater than" the new item, and inserts at a position
- * determined by these answers (or at the end of the list).
- *
- * A list can be ordered in an increasing manner, or decreasing.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: OrderedList.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.2.4.
- */
-
-public class OrderedList
-{
-
- /**
- * Create a new increasing ordered list.
- */
-
-public OrderedList ()
- {
- this(true);
- }
-
- /**
- * Create a new list. If the parameter is true, then it will be
- * ordered increasing, otherwise decreasing.
- */
-
-public OrderedList (boolean increasing)
- {
- _headOfList = null;
- _entryCount = 0;
- _increasing = increasing;
- }
-
-public void finalize ()
- {
- empty();
- }
-
- /**
- * Insert the item in the list. If items are found to be equal then
- * this one will be inserted at the end of that portion of the list.
- */
-
-public final synchronized boolean insert (OrderedListElement p)
- {
- return insert(p, false);
- }
-
- /**
- * Insert the item in the list. If items are found to be equal then
- * this one will be inserted at the start of that portion of the list if
- * the boolean parameter is true, and at the end otherwise.
- */
-
-public final synchronized boolean insert (OrderedListElement p, boolean prior)
- {
- if (p == null) // error condition first
- return false;
-
- // If list is empty, insert at head
-
- if (_entryCount == 0)
- {
- _headOfList = new OrderedListEntry(p, _headOfList);
- _entryCount++;
-
- return true;
- }
-
- // Try to insert before (if there is anything scheduled later)
-
- OrderedListIterator iter = new OrderedListIterator(this);
- OrderedListElement prev = null;
-
- for (OrderedListElement q = iter.iterate(); (q != null); prev = q, q = iter.iterate())
- {
- if (_increasing)
- {
- if (prior)
- {
- if (q.equals(p) || (q.greaterThan(p)))
- {
- return insertBefore(p, q);
- }
- }
- else
- {
- if (q.greaterThan(p))
- return insertBefore(p, q);
- }
- }
- else
- {
- if (prior)
- {
- if (q.equals(p) || (q.lessThan(p)))
- {
- return insertBefore(p, q);
- }
- }
- else
- {
- if (q.lessThan(p))
- return insertBefore(p, q);
- }
- }
- }
-
- // Got to insert at the end (currently pointed at by 'prev')
-
- return insertAfter(p, prev);
- }
-
- /**
- * Insert the item before the specified item. If the specified item is
- * not in the list then insertion will fail and false will be
- * returned.
- */
-
-public final synchronized boolean insertBefore (OrderedListElement toInsert, OrderedListElement before)
- {
- for (OrderedListEntry prev = null, p = _headOfList; (p != null); prev = p, p = p.cdr())
- {
- if (p.car() == before) // we mean '==' rather than equals
- {
- OrderedListEntry newcons = new OrderedListEntry(toInsert, p);
-
- if (prev != null)
- prev.setfCdr(newcons);
- else
- _headOfList = newcons;
-
- _entryCount++;
-
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Insert the item after the specified item. If the specified item is
- * not in the list then insertion will fail and false will be
- * returned.
- */
-
-public final synchronized boolean insertAfter (OrderedListElement toInsert, OrderedListElement after)
- {
- for (OrderedListEntry p = _headOfList; (p != null); p = p.cdr())
- {
- if (p.car() == after) // we mean '==' rather than equals
- {
- OrderedListEntry newcons = new OrderedListEntry(toInsert, p.cdr());
-
- p.setfCdr(newcons);
-
- _entryCount++;
-
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Remove the specified item from the list. Return an indication
- * of whether or not the item was in the list.
- */
-
-public final synchronized boolean remove (OrderedListElement element)
- {
- // Take care of boundary condition - empty list
- if ((_headOfList == null) || (element == null))
- return false;
-
- for (OrderedListEntry prev = null, ptr = _headOfList; (ptr != null); prev = ptr, ptr = ptr.cdr())
- {
- if (ptr.car() == element) // we mean '==' rather than equals
- {
- // unlink the cons cell for the element we're removing
-
- if (prev != null)
- prev.setfCdr(ptr.cdr());
- else
- _headOfList = ptr.cdr();
- ptr.setfCdr(null) ;
-
- _entryCount--;
-
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Remove and return the first item in the list.
- */
-
-public final synchronized OrderedListElement orderedPop ()
- {
- if (_headOfList != null)
- {
- OrderedListEntry remove = _headOfList;
- OrderedListElement p = _headOfList.car();
-
- _headOfList = remove.cdr();
- remove.setfCdr(null) ;
- _entryCount--;
-
- remove = null;
-
- return p;
- }
- else
- return null;
- }
-
- public final synchronized OrderedListElement peak()
- {
- if (_headOfList != null)
- {
- return _headOfList.car();
- }
- return null;
- }
-
- final synchronized OrderedListEntry head()
- {
- return _headOfList;
- }
-
- /**
- * Empty the list.
- */
-
-public final synchronized void empty ()
- {
- OrderedListElement te;
-
- while ((te = orderedPop()) != null)
- {
- te = null;
- }
- }
-
- /**
- * Return the number of items in the list.
- */
-
-public final synchronized long size ()
- {
- return _entryCount;
- }
-
-private OrderedListEntry _headOfList;
-private long _entryCount;
-
-private boolean _increasing;
-
-}
-
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListElement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListElement.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListElement.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,61 +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: OrderedListElement.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * Entries in OrderedLists must inherit from this class
- * and define the specified methods.
- */
-
-public interface OrderedListElement
-{
-
- /**
- * Are the two entries equal?
- */
-
-public boolean equals (OrderedListElement e);
-
-/**
- * Is the current entry less than the one in the parameter?
- */
-
-public boolean lessThan (OrderedListElement e);
-
-/**
- * Is the current entry greater than the one in the parameter?
- */
-
-public boolean greaterThan (OrderedListElement e);
-
-}
-
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListEntry.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListEntry.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListEntry.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,67 +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: OrderedListEntry.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/*
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: OrderedListEntry.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.2.4.
- */
-
-class OrderedListEntry
-{
-
-public OrderedListEntry (OrderedListElement e, OrderedListEntry n)
- {
- _theElement = e;
- _next = n;
- }
-
-public final OrderedListElement car ()
- {
- return _theElement;
- }
-
-public synchronized final OrderedListEntry cdr ()
- {
- return _next;
- }
-
-public synchronized final void setfCdr (OrderedListEntry n)
- {
- _next = n;
- }
-
-private final OrderedListElement _theElement;
-private OrderedListEntry _next;
-
-};
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListIterator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListIterator.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/OrderedListIterator.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,72 +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: OrderedListIterator.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * An iterator for OrderedLists.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: OrderedListIterator.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.2.4.
- */
-
-public class OrderedListIterator
-{
-
- /**
- * Create a new iterator which will iterate over the specified list.
- */
-
-public OrderedListIterator (OrderedList L)
- {
- ptr = L.head();
- }
-
- /**
- * Return the next item in the list.
- */
-
-public OrderedListElement iterate ()
- {
- if (ptr != null)
- {
- OrderedListEntry p = ptr;
- ptr = ptr.cdr();
- return p.car();
- }
-
- return null;
- }
-
-private OrderedListEntry ptr;
-
-}
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleList.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleList.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,245 +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: SimpleList.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * A SimpleList maintains entries in a linked list.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: SimpleList.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class SimpleList
-{
-
- /**
- * Create a new, empty list.
- */
-
-public SimpleList ()
- {
- head_ = null;
- entryCount = 0;
- }
-
-public void finalize ()
- {
- empty();
- }
-
- /**
- * Empty the list.
- */
-
-public synchronized void empty ()
- {
- ListElement te = null;
-
- while ((te = orderedPop()) != null)
- {
- }
- }
-
- /**
- * Return the head of the list.
- */
-
-public synchronized ListElement head ()
- {
- if (head_ != null)
- return head_.theData;
- else
- return null;
- }
-
- /**
- * Returns the number of entries in the list.
- */
-
-public synchronized int size ()
- {
- return entryCount;
- }
-
- /**
- * Is the specified entry in the list. Uses Object.equals
- * for comparison.
- */
-
-public synchronized boolean lookFor (ListElement th)
- {
- if (th != null)
- {
- SimpleListEntry te = head_;
-
- while (te != null)
- {
- /* exists already ? */
-
- if ((te.theData == th) ||
- (te.equals(th)))
- {
- return true;
- }
-
- te = te.next;
- }
- }
-
- return false;
- }
-
- /**
- * Push the specified item onto the list.
- */
-
-public synchronized boolean push (ListElement th)
- {
- if (th != null)
- {
- SimpleListEntry te = new SimpleListEntry(head_, th);
-
- head_ = te;
- entryCount++;
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Add the specified item to the list. Same as push.
- * Will add the entry even if it is already in the list.
- */
-
-public synchronized boolean add (ListElement th)
- {
- return push(th);
- }
-
- /**
- * Insert is like add except that it only adds once, i.e., if the entry
- * already exists it returns false. So, two different instances of
- * ListElement with the same value will not be allowed.
- */
-
-public synchronized boolean insert (ListElement th)
- {
- if (th != null)
- {
- SimpleListEntry te = head_;
-
- while (te != null)
- {
- /* exists already ? */
-
- if (th == te)
- {
- return false;
- }
-
- te = te.next;
- }
-
- /* insert if not found */
-
- te = new SimpleListEntry(head_, th);
-
- head_ = te;
- entryCount++;
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Remove the specified entry. Returns an indication of
- * whether the item was in the list.
- */
-
-public synchronized boolean remove (ListElement findMe)
- {
- SimpleListEntry te = head_;
- SimpleListEntry old = null;
-
- while (te != null)
- {
- if (te.theData == findMe)
- {
- if (old == null)
- head_ = te.next;
- else
- old.next = te.next;
-
- te = null;
- entryCount--;
-
- return true;
- }
-
- old = te;
- te = te.next;
- }
-
- return false;
- }
-
- /**
- * Pop (remove) the first entry off the list.
- */
-
-public synchronized ListElement orderedPop ()
- {
- ListElement th = null;
-
- if (head_ != null)
- {
- SimpleListEntry te = head_;
-
- head_ = te.next;
- th = te.theData;
- entryCount--;
-
- te = null;
- }
-
- return th;
- }
-
-protected SimpleListEntry head_;
-protected int entryCount;
-
-};
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListEntry.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListEntry.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListEntry.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,52 +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: SimpleListEntry.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/*
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: SimpleListEntry.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-class SimpleListEntry
-{
-
-public SimpleListEntry (SimpleListEntry old, ListElement th)
- {
- next = old;
- theData = th;
- }
-
-protected SimpleListEntry next;
-protected ListElement theData;
-
-};
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListIterator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListIterator.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/template/SimpleListIterator.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -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.
- */
-/*
- * Copyright (C) 1998, 1999, 2000,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: SimpleListIterator.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.arjuna.template;
-
-/**
- * An iterator for SimpleLists.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: SimpleListIterator.java 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class SimpleListIterator
-{
-
- /**
- * Create a new iterator, which whill be used to iterate
- * over the provided list.
- */
-
-public SimpleListIterator (SimpleList list)
- {
- nextEnt = list.head_;
- }
-
- /**
- * Return the next entry in the list.
- */
-
-public synchronized ListElement iterate ()
- {
- ListElement th = null;
-
- if (nextEnt != null)
- {
- th = nextEnt.theData;
- nextEnt = nextEnt.next;
- }
-
- return th;
- }
-
-private SimpleListEntry nextEnt;
-
-};
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -48,7 +48,6 @@
import com.arjuna.ats.jts.OTSManager;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.ats.internal.arjuna.template.*;
import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
import com.arjuna.ats.arjuna.common.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/Interposition.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -31,8 +31,6 @@
package com.arjuna.ats.internal.jts.interposition.resources.arjuna;
-import com.arjuna.ats.internal.arjuna.template.*;
-
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.jts.utils.Utility;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/interposition/resources/arjuna/ServerResource.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -35,7 +35,6 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.ats.arjuna.coordinator.Reapable;
-import com.arjuna.ats.internal.arjuna.template.*;
import com.arjuna.ats.internal.jts.ORBManager;
import com.arjuna.ats.internal.jts.interposition.ServerFactory;
@@ -58,7 +57,7 @@
* @since JTS 1.0.
*/
-public class ServerResource implements ListElement
+public class ServerResource
{
/*
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/CurrentImple.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,8 +1,8 @@
/*
* 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
+ * 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
@@ -14,7 +14,7 @@
* 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.
*/
@@ -24,7 +24,7 @@
* Hewlett-Packard Arjuna Labs,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: CurrentImple.java 2342 2006-03-30 13:06:17Z $
*/
@@ -49,7 +49,6 @@
import com.arjuna.ats.internal.jts.orbspecific.TransactionFactoryImple;
import com.arjuna.ats.internal.jts.orbspecific.coordinator.ArjunaTransactionImple;
-import com.arjuna.ats.internal.arjuna.template.*;
import com.arjuna.ats.internal.arjuna.thread.ThreadActionData;
import com.arjuna.ats.arjuna.common.*;
@@ -82,7 +81,7 @@
/**
* The implementation of CosTransactions::Current.
- *
+ *
* In a multi-threaded environment where threads can terminate transactions they
* may not have started, then it is possible for a thread to call
* commit/rollback/rollback_only on a transaction which has already been (or is
@@ -92,7 +91,7 @@
* NoTransaction, so we would return INVALID_TRANSACTION. This allows us to
* distinguish between the situation where there really is no transaction
* associated with the thread.
- *
+ *
* @author Mark Little (mark at arjuna.com)
* @version $Id: CurrentImple.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
@@ -214,10 +213,10 @@
/**
* It's not possible to commit/abort out of order using the current
* interface.
- *
+ *
* Do we delete the control if the transaction gives an heuristic result?
* CurrentImplely we do.
- *
+ *
* If another thread has already terminated the transaction then: (i) if it
* committed, we do nothing - could throw TransactionRequired of
* INVALID_TRANSACTION, or NoTransaction. Probably not NoTransaction, since
@@ -225,7 +224,7 @@
* transaction has already been terminated and there really is no
* transaction for this thread. (ii) if it rolledback, we throw
* TRANSACTION_ROLLEDBACK.
- *
+ *
*/
public void commit (boolean report_heuristics) throws NoTransaction,
@@ -584,10 +583,10 @@
* return value once it has been sent to the caller. However, in the local
* case, if we call duplicate then there is nothing to call release and we
* get memory leaks!
- *
+ *
* Also assume that BasicAction's notion of current is the same as
* CurrentImple's, if the action is local.
- *
+ *
*/
/**
@@ -604,7 +603,7 @@
{
jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "CurrentImple::suspend ()");
}
-
+
ControlWrapper actPtr = _theManager.popAction();
if (actPtr == null)
@@ -635,18 +634,18 @@
/**
* To support checked transactions we can only resume if the action is local
* or we received it implicitly.
- *
+ *
* If the control refers to a nested transaction then we must recreate the
* entire hierarchy, i.e., the effect of a suspend/resume on the same
* control should be the same as never calling suspend in the first place.
- *
+ *
* If the control is for a local transaction then it is simple to recreate
* the hierarchy. Otherwise we rely upon the PropagationContext to recreate
* it.
- *
+ *
* If this control is a "proxy" then create a new proxy instance, so we can
* delete proxies whenever suspend is called.
- *
+ *
* Should check if "new" transaction is not actually the current one anyway.
* If so, just return. The spec. doesn't mention what to do in this case, so
* for now we go to the overhead of the work regardless.
@@ -787,7 +786,7 @@
/**
* Returns the internal context manager implementation. Applications should
* not use this method.
- *
+ *
* @since JTS 2.1.
*/
@@ -862,9 +861,9 @@
* If this is a local transaction and we haven't zero-ed the transaction
* reference then resume it. Otherwise go with the Control.
*/
-
+
ArjunaTransactionImple tx = ((which.getImple() == null) ? null : which.getImple().getImplHandle());
-
+
if (which.isLocal() && (tx != null))
resumeImple(which.getImple());
else
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -61,8 +61,6 @@
import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.internal.arjuna.template.*;
-
import org.omg.CosTransactions.*;
import com.arjuna.ArjunaOTS.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedNestedAction.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -33,8 +33,6 @@
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.internal.arjuna.template.*;
-
import com.arjuna.ats.jts.exceptions.ExceptionCodes;
import com.arjuna.ats.jts.logging.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/restricted/ServerRestrictedTopLevelAction.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -33,8 +33,6 @@
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.internal.arjuna.template.*;
-
import com.arjuna.ats.jts.exceptions.ExceptionCodes;
import com.arjuna.ats.jts.logging.*;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/SynchronizationRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/SynchronizationRecord.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/resources/SynchronizationRecord.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -37,8 +37,6 @@
import com.arjuna.common.util.logging.*;
-import com.arjuna.ats.internal.arjuna.template.*;
-
import org.omg.CosTransactions.Synchronization;
/**
@@ -50,7 +48,7 @@
* @since JTS 1.0.
*/
-public class SynchronizationRecord implements ListElement, Comparable
+public class SynchronizationRecord implements Comparable
{
public SynchronizationRecord (Synchronization ptr)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/tx/tx.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/tx/tx.java 2009-05-18 14:47:48 UTC (rev 26593)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/tx/tx.java 2009-05-18 15:19:52 UTC (rev 26594)
@@ -1,8 +1,8 @@
/*
* 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
+ * 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
@@ -14,7 +14,7 @@
* 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.
*/
@@ -24,7 +24,7 @@
* Hewlett-Packard Arjuna Labs,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: tx.java 2342 2006-03-30 13:06:17Z $
*/
@@ -34,8 +34,6 @@
import com.arjuna.ats.internal.jts.OTSImpleManager;
import com.arjuna.ats.internal.jts.orbspecific.CurrentImple;
-import com.arjuna.ats.internal.arjuna.template.*;
-
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.jts.*;
@@ -78,11 +76,11 @@
public static final int TX_EINVAL = -9;
public static final int TX_ROLLBACK = -10;
public static final int TX_ROLLBACK_NO_BEGIN = -11;
-
+
public static final synchronized int tx_open ()
{
int toReturn = tx.TX_ERROR; // what to return?
-
+
if (!__tx_open)
{
__tx_open = true;
@@ -101,7 +99,7 @@
public static final synchronized int tx_close ()
{
int toReturn = tx.TX_ERROR;
-
+
if (__tx_open)
{
__tx_open = false;
@@ -153,7 +151,7 @@
catch (Exception e)
{
// something went wrong!
-
+
toReturn = tx.TX_FAIL;
}
}
@@ -169,7 +167,7 @@
toReturn = tx.TX_FAIL;
}
}
-
+
return toReturn;
}
@@ -203,7 +201,7 @@
{
int toReturn = tx.TX_OK;
boolean b = ((when_return == 0) ? false : true);
-
+
if ((when_return == tx.TX_COMMIT_COMPLETED) ||
(when_return == tx.TX_COMMIT_DESICION_LOGGED))
{
@@ -214,7 +212,7 @@
return toReturn;
}
-
+
public static final synchronized int tx_commit ()
{
int toReturn = tx.TX_OK;
@@ -223,11 +221,11 @@
if (report_heuristics == null)
report_heuristics = new Boolean(true); // default TRUE
-
+
try
{
boolean when_return = report_heuristics.booleanValue();
-
+
current.commit(when_return);
}
catch (NoTransaction e1)
@@ -275,9 +273,9 @@
return toReturn;
}
-
+
private static boolean __tx_open = false;
private static boolean __tx_allow_nesting = false;
private static Hashtable __tx_report_heuristics = new Hashtable();
-
+
}
More information about the jboss-svn-commits
mailing list