[jboss-cvs] JBossCache/src/org/jboss/cache ...
Elias Ross
genman at noderunner.net
Wed Feb 7 17:06:46 EST 2007
User: genman
Date: 07/02/07 17:06:46
Modified: src/org/jboss/cache InvocationContext.java
ConsoleListener.java CacheSPI.java
UnversionedNode.java NodeSPI.java RPCManager.java
RegionManager.java CacheImpl.java
Removed: src/org/jboss/cache
BatchModeTransactionManagerLookup.java
JBossTransactionManagerLookup.java
DummyTransactionManagerLookup.java
TransactionManagerLookup.java
OptimisticTransactionEntry.java
GlobalTransaction.java TransactionEntry.java
GenericTransactionManagerLookup.java
TransactionTable.java
Log:
JBCACHE-969 - Move transaction classes to org.jboss.cache.transaction
Revision Changes Path
1.12 +1 -0 JBossCache/src/org/jboss/cache/InvocationContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvocationContext.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/InvocationContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- InvocationContext.java 3 Jan 2007 15:33:09 -0000 1.11
+++ InvocationContext.java 7 Feb 2007 22:06:44 -0000 1.12
@@ -8,6 +8,7 @@
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.transaction.GlobalTransaction;
import javax.transaction.Transaction;
import java.util.ArrayList;
1.15 +2 -2 JBossCache/src/org/jboss/cache/ConsoleListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConsoleListener.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/ConsoleListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ConsoleListener.java 11 Jan 2007 13:49:07 -0000 1.14
+++ ConsoleListener.java 7 Feb 2007 22:06:44 -0000 1.15
@@ -92,10 +92,10 @@
_cache.start();
}
- if (wait)
- {
synchronized (this)
{
+ while (wait)
+ {
wait();
}
}
1.32 +2 -0 JBossCache/src/org/jboss/cache/CacheSPI.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheSPI.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheSPI.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- CacheSPI.java 19 Jan 2007 14:47:40 -0000 1.31
+++ CacheSPI.java 7 Feb 2007 22:06:44 -0000 1.32
@@ -15,6 +15,8 @@
import org.jboss.cache.marshall.Marshaller;
import org.jboss.cache.notifications.Notifier;
import org.jboss.cache.statetransfer.StateTransferManager;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
1.24 +1 -0 JBossCache/src/org/jboss/cache/UnversionedNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UnversionedNode.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/UnversionedNode.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- UnversionedNode.java 25 Jan 2007 14:12:07 -0000 1.23
+++ UnversionedNode.java 7 Feb 2007 22:06:44 -0000 1.24
@@ -13,6 +13,7 @@
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.optimistic.DataVersion;
+import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.util.MapCopy;
import java.io.Serializable;
1.15 +1 -0 JBossCache/src/org/jboss/cache/NodeSPI.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeSPI.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/NodeSPI.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NodeSPI.java 25 Jan 2007 14:12:07 -0000 1.14
+++ NodeSPI.java 7 Feb 2007 22:06:44 -0000 1.15
@@ -8,6 +8,7 @@
import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.optimistic.DataVersion;
+import org.jboss.cache.transaction.GlobalTransaction;
import java.util.Map;
import java.util.Set;
1.8 +1 -1 JBossCache/src/org/jboss/cache/RPCManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RPCManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/RPCManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- RPCManager.java 17 Jan 2007 01:31:06 -0000 1.7
+++ RPCManager.java 7 Feb 2007 22:06:44 -0000 1.8
@@ -19,7 +19,7 @@
*/
public class RPCManager
{
- CacheImpl c;
+ private CacheImpl c;
private RPCManager(CacheImpl c)
{
1.30 +4 -4 JBossCache/src/org/jboss/cache/RegionManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/RegionManager.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- RegionManager.java 29 Jan 2007 16:55:48 -0000 1.29
+++ RegionManager.java 7 Feb 2007 22:06:44 -0000 1.30
@@ -46,7 +46,7 @@
private EvictionConfig evictionConfig;
private EvictionTimerTask evictionTimerTask = new EvictionTimerTask();
- protected final Set activationChangeNodes = Collections.synchronizedSet(new HashSet());
+ protected final Set<Fqn> activationChangeNodes = Collections.synchronizedSet(new HashSet<Fqn>());
/**
* Constructs a new instance not attached to a cache.
@@ -481,7 +481,7 @@
// Create a list with the Fqn in the main cache and any buddy backup trees
BuddyManager buddyManager = cache.getBuddyManager();
- ArrayList list = new ArrayList();
+ ArrayList<Fqn> list = new ArrayList<Fqn>();
list.add(fqn);
if (buddyManager != null)
@@ -499,9 +499,9 @@
long stateFetchTimeout = cache.getConfiguration().getLockAcquisitionTimeout() + 5000;
// Remove the subtree from the main cache and any buddy backup trees
- for (Iterator it = list.iterator(); it.hasNext();)
+ for (Iterator<Fqn> it = list.iterator(); it.hasNext();)
{
- Fqn subtree = (Fqn) it.next();
+ Fqn subtree = it.next();
subtreeRoot = cache.findNode(subtree);
if (subtreeRoot != null)
{
1.44 +6 -1 JBossCache/src/org/jboss/cache/CacheImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- CacheImpl.java 6 Feb 2007 15:07:59 -0000 1.43
+++ CacheImpl.java 7 Feb 2007 22:06:44 -0000 1.44
@@ -38,6 +38,11 @@
import org.jboss.cache.notifications.Notifier;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.statetransfer.StateTransferManager;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.OptimisticTransactionEntry;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionManagerLookup;
+import org.jboss.cache.transaction.TransactionTable;
import org.jboss.cache.util.ExposedByteArrayOutputStream;
import org.jboss.util.stream.MarshalledValueInputStream;
import org.jboss.util.stream.MarshalledValueOutputStream;
@@ -85,7 +90,7 @@
/**
* The default implementation class of {@link org.jboss.cache.Cache} and {@link org.jboss.cache.CacheSPI}. This class
- * has it's roots in the legacy (JBoss Cache 1.x.x) org.jboss.cache.TreeCache class.
+ * has its roots in the legacy (JBoss Cache 1.x.x) org.jboss.cache.TreeCache class.
* <p/>
* You should not use this class directly, or attempt to cast {@link org.jboss.cache.Cache} or {@link org.jboss.cache.CacheSPI}
* interfaces directly to this class.
More information about the jboss-cvs-commits
mailing list