[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...
Elias Ross
genman at noderunner.net
Wed Feb 7 17:06:41 EST 2007
User: genman
Date: 07/02/07 17:06:41
Modified: src/org/jboss/cache/interceptors
InvocationContextInterceptor.java
ActivationInterceptor.java
OptimisticValidatorInterceptor.java
TxInterceptor.java CacheStoreInterceptor.java
DataGravitatorInterceptor.java
BaseTransactionalContextInterceptor.java
CacheLoaderInterceptor.java
InvalidationInterceptor.java
OptimisticLockingInterceptor.java
PessimisticLockInterceptor.java
OptimisticCreateIfNotExistsInterceptor.java
NotificationInterceptor.java
ReplicationInterceptor.java
OptimisticNodeInterceptor.java
CreateIfNotExistsInterceptor.java
OptimisticInterceptor.java
OptimisticReplicationInterceptor.java
CallInterceptor.java
Log:
JBCACHE-969 - Move transaction classes to org.jboss.cache.transaction
Revision Changes Path
1.14 +1 -1 JBossCache/src/org/jboss/cache/interceptors/InvocationContextInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvocationContextInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/InvocationContextInterceptor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- InvocationContextInterceptor.java 3 Jan 2007 15:33:08 -0000 1.13
+++ InvocationContextInterceptor.java 7 Feb 2007 22:06:40 -0000 1.14
@@ -6,11 +6,11 @@
*/
package org.jboss.cache.interceptors;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
1.50 +4 -4 JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ActivationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- ActivationInterceptor.java 17 Jan 2007 16:24:06 -0000 1.49
+++ ActivationInterceptor.java 7 Feb 2007 22:06:40 -0000 1.50
@@ -1,13 +1,13 @@
package org.jboss.cache.interceptors;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.Modification;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.TransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.TransactionManager;
import java.lang.reflect.Method;
@@ -25,7 +25,7 @@
* their attributes have been initialized and their children have been loaded in memory.
*
* @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
- * @version $Id: ActivationInterceptor.java,v 1.49 2007/01/17 16:24:06 msurtani Exp $
+ * @version $Id: ActivationInterceptor.java,v 1.50 2007/02/07 22:06:40 genman Exp $
*/
public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
{
1.57 +1 -1 JBossCache/src/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticValidatorInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- OptimisticValidatorInterceptor.java 31 Jan 2007 16:44:29 -0000 1.56
+++ OptimisticValidatorInterceptor.java 7 Feb 2007 22:06:40 -0000 1.57
@@ -8,7 +8,6 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
import org.jboss.cache.marshall.MethodCall;
@@ -17,6 +16,7 @@
import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.optimistic.TransactionWorkspace;
import org.jboss.cache.optimistic.WorkspaceNode;
+import org.jboss.cache.transaction.GlobalTransaction;
import javax.transaction.Transaction;
import java.util.Collection;
1.77 +3 -3 JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- TxInterceptor.java 30 Jan 2007 18:12:45 -0000 1.76
+++ TxInterceptor.java 7 Feb 2007 22:06:40 -0000 1.77
@@ -8,17 +8,17 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
-import org.jboss.cache.OptimisticTransactionEntry;
import org.jboss.cache.ReplicationException;
-import org.jboss.cache.TransactionEntry;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
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.transaction.OptimisticTransactionEntry;
+import org.jboss.cache.transaction.TransactionEntry;
import javax.transaction.Status;
import javax.transaction.Synchronization;
1.44 +4 -4 JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheStoreInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- CacheStoreInterceptor.java 31 Dec 2006 03:01:20 -0000 1.43
+++ CacheStoreInterceptor.java 7 Feb 2007 22:06:40 -0000 1.44
@@ -3,13 +3,13 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.Modification;
-import org.jboss.cache.TransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.TransactionManager;
import java.lang.reflect.Method;
@@ -27,7 +27,7 @@
* through the CacheLoader, either after each method call (no TXs), or at TX commit.
*
* @author Bela Ban
- * @version $Id: CacheStoreInterceptor.java,v 1.43 2006/12/31 03:01:20 msurtani Exp $
+ * @version $Id: CacheStoreInterceptor.java,v 1.44 2007/02/07 22:06:40 genman Exp $
*/
public class CacheStoreInterceptor extends BaseCacheLoaderInterceptor implements CacheStoreInterceptorMBean
{
1.40 +2 -2 JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataGravitatorInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- DataGravitatorInterceptor.java 7 Feb 2007 02:21:14 -0000 1.39
+++ DataGravitatorInterceptor.java 7 Feb 2007 22:06:40 -0000 1.40
@@ -11,11 +11,9 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.TransactionEntry;
import org.jboss.cache.buddyreplication.BuddyManager;
import org.jboss.cache.buddyreplication.GravitateResult;
import org.jboss.cache.config.Configuration;
@@ -23,6 +21,8 @@
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.marshall.NodeData;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
import org.jboss.util.stream.MarshalledValueInputStream;
import org.jgroups.Address;
import org.jgroups.blocks.GroupRequest;
1.3 +3 -3 JBossCache/src/org/jboss/cache/interceptors/BaseTransactionalContextInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseTransactionalContextInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/BaseTransactionalContextInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BaseTransactionalContextInterceptor.java 16 Oct 2006 10:55:40 -0000 1.2
+++ BaseTransactionalContextInterceptor.java 7 Feb 2007 22:06:40 -0000 1.3
@@ -1,11 +1,11 @@
package org.jboss.cache.interceptors;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
-import org.jboss.cache.TransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.config.Option;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.Status;
import javax.transaction.SystemException;
1.77 +4 -4 JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- CacheLoaderInterceptor.java 23 Jan 2007 13:54:48 -0000 1.76
+++ CacheLoaderInterceptor.java 7 Feb 2007 22:06:40 -0000 1.77
@@ -3,11 +3,8 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.TransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.loader.AsyncCacheLoader;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.loader.ChainingCacheLoader;
@@ -15,6 +12,9 @@
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import java.util.Collections;
import java.util.HashMap;
@@ -28,7 +28,7 @@
* Loads nodes that don't exist at the time of the call into memory from the CacheLoader
*
* @author Bela Ban
- * @version $Id: CacheLoaderInterceptor.java,v 1.76 2007/01/23 13:54:48 msurtani Exp $
+ * @version $Id: CacheLoaderInterceptor.java,v 1.77 2007/02/07 22:06:40 genman Exp $
*/
public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
{
1.30 +4 -4 JBossCache/src/org/jboss/cache/interceptors/InvalidationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvalidationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/InvalidationInterceptor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- InvalidationInterceptor.java 30 Dec 2006 17:49:53 -0000 1.29
+++ InvalidationInterceptor.java 7 Feb 2007 22:06:40 -0000 1.30
@@ -8,17 +8,17 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
-import org.jboss.cache.OptimisticTransactionEntry;
-import org.jboss.cache.TransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.optimistic.TransactionWorkspace;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.OptimisticTransactionEntry;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
1.26 +4 -9 JBossCache/src/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticLockingInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- OptimisticLockingInterceptor.java 4 Jan 2007 05:35:37 -0000 1.25
+++ OptimisticLockingInterceptor.java 7 Feb 2007 22:06:40 -0000 1.26
@@ -8,15 +8,15 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.TransactionEntry;
import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.optimistic.TransactionWorkspace;
import org.jboss.cache.optimistic.WorkspaceNode;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -134,20 +134,15 @@
return retval;
}
-
private Object lockNodes(GlobalTransaction gtx) throws Exception
{
TransactionWorkspace workspace = getTransactionWorkspace(gtx);
log.debug("locking nodes");
// should be an ordered list
- Collection nodes = workspace.getNodes().values();
+ for (WorkspaceNode workspaceNode : workspace.getNodes().values()) {
- for (Iterator it = nodes.iterator(); it.hasNext();)
- {
- WorkspaceNode workspaceNode = (WorkspaceNode) it.next();
NodeSPI node = workspaceNode.getNode();
-
boolean acquired = node.getLock().acquire(gtx, lockAcquisitionTimeout, NodeLock.LockType.WRITE);
if (acquired)
{
1.47 +12 -12 JBossCache/src/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PessimisticLockInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/PessimisticLockInterceptor.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- PessimisticLockInterceptor.java 30 Jan 2007 21:34:26 -0000 1.46
+++ PessimisticLockInterceptor.java 7 Feb 2007 22:06:41 -0000 1.47
@@ -9,17 +9,17 @@
import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.TransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.lock.LockingException;
import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.lock.TimeoutException;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.Transaction;
import java.util.Collections;
@@ -36,7 +36,7 @@
* current method and unlock when the method returns.
*
* @author Bela Ban
- * @version $Id: PessimisticLockInterceptor.java,v 1.46 2007/01/30 21:34:26 msurtani Exp $
+ * @version $Id: PessimisticLockInterceptor.java,v 1.47 2007/02/07 22:06:41 genman Exp $
*/
public class PessimisticLockInterceptor extends Interceptor
{
@@ -47,7 +47,7 @@
/**
* Map<Object, java.util.List>. Keys = threads, values = lists of locks held by that thread
*/
- private Map lock_table;
+ private Map<Thread, List<NodeLock>> lock_table;
private long lock_acquisition_timeout;
private LockManager lockManager = new LockManager();
@@ -330,7 +330,7 @@
if (recursive && isTargetNode(i, treeNodeSize))
{
//Set acquired_locks=child_node.acquireAll(owner, lock_timeout, lock_type);
- Set acquired_locks = lockManager.acquireAll(child_node, owner, lock_type, timeout);
+ Set<NodeLock> acquired_locks = lockManager.acquireAll(child_node, owner, lock_type, timeout);
if (acquired_locks.size() > 0)
{
if (gtx != null)
@@ -339,7 +339,7 @@
}
else
{
- List locks = getLocks(currentThread);
+ List<NodeLock> locks = getLocks(currentThread);
locks.addAll(acquired_locks);
}
}
@@ -407,7 +407,7 @@
else
{
Thread currentThread = Thread.currentThread();
- List locks = getLocks(currentThread);
+ List<NodeLock> locks = getLocks(currentThread);
if (!locks.contains(lock))
{
locks.add(lock);
@@ -416,14 +416,14 @@
}
}
- private List getLocks(Thread currentThread)
+ private List<NodeLock> getLocks(Thread currentThread)
{
// This sort of looks like a get/put race condition, but
// since we key off the Thread, it's not
- List locks = (List) lock_table.get(currentThread);
+ List<NodeLock> locks = lock_table.get(currentThread);
if (locks == null)
{
- locks = Collections.synchronizedList(new LinkedList());
+ locks = Collections.synchronizedList(new LinkedList<NodeLock>());
lock_table.put(currentThread, locks);
}
return locks;
@@ -582,7 +582,7 @@
return node.getLock();
}
- public Set acquireAll(NodeSPI node, Object owner, NodeLock.LockType lockType, long timeout) throws InterruptedException
+ public Set<NodeLock> acquireAll(NodeSPI node, Object owner, NodeLock.LockType lockType, long timeout) throws InterruptedException
{
return getLock(node).acquireAll(owner, timeout, lockType);
}
1.45 +3 -3 JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticCreateIfNotExistsInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- OptimisticCreateIfNotExistsInterceptor.java 19 Jan 2007 02:04:28 -0000 1.44
+++ OptimisticCreateIfNotExistsInterceptor.java 7 Feb 2007 22:06:41 -0000 1.45
@@ -9,12 +9,9 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeFactory;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.OptimisticTransactionEntry;
-import org.jboss.cache.TransactionEntry;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.notifications.Notifier;
@@ -22,6 +19,9 @@
import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.optimistic.TransactionWorkspace;
import org.jboss.cache.optimistic.WorkspaceNode;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.OptimisticTransactionEntry;
+import org.jboss.cache.transaction.TransactionEntry;
import java.util.ArrayList;
import java.util.List;
1.5 +1 -1 JBossCache/src/org/jboss/cache/interceptors/NotificationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NotificationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/NotificationInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NotificationInterceptor.java 1 Feb 2007 17:02:31 -0000 1.4
+++ NotificationInterceptor.java 7 Feb 2007 22:06:41 -0000 1.5
@@ -1,10 +1,10 @@
package org.jboss.cache.interceptors;
import org.jboss.cache.InvocationContext;
-import org.jboss.cache.TransactionEntry;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.notifications.Notifier;
+import org.jboss.cache.transaction.TransactionEntry;
import java.util.List;
1.42 +2 -2 JBossCache/src/org/jboss/cache/interceptors/ReplicationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ReplicationInterceptor.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- ReplicationInterceptor.java 10 Nov 2006 20:32:51 -0000 1.41
+++ ReplicationInterceptor.java 7 Feb 2007 22:06:41 -0000 1.42
@@ -1,11 +1,11 @@
package org.jboss.cache.interceptors;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
/**
* Takes care of replicating modifications to other nodes in a cluster. Also
@@ -13,7 +13,7 @@
* 'side-ways' (see docs/design/Refactoring.txt).
*
* @author Bela Ban
- * @version $Id: ReplicationInterceptor.java,v 1.41 2006/11/10 20:32:51 msurtani Exp $
+ * @version $Id: ReplicationInterceptor.java,v 1.42 2007/02/07 22:06:41 genman Exp $
*/
public class ReplicationInterceptor extends BaseRpcInterceptor
{
1.54 +1 -1 JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticNodeInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- OptimisticNodeInterceptor.java 29 Jan 2007 11:46:53 -0000 1.53
+++ OptimisticNodeInterceptor.java 7 Feb 2007 22:06:41 -0000 1.54
@@ -10,7 +10,6 @@
import org.jboss.cache.CacheListener;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.NodeFactory;
import org.jboss.cache.NodeNotExistsException;
@@ -22,6 +21,7 @@
import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.optimistic.TransactionWorkspace;
import org.jboss.cache.optimistic.WorkspaceNode;
+import org.jboss.cache.transaction.GlobalTransaction;
import java.util.HashMap;
import java.util.Iterator;
1.26 +2 -2 JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreateIfNotExistsInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- CreateIfNotExistsInterceptor.java 17 Jan 2007 16:24:06 -0000 1.25
+++ CreateIfNotExistsInterceptor.java 7 Feb 2007 22:06:41 -0000 1.26
@@ -4,11 +4,11 @@
import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.NodeSPI;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
import java.util.ArrayList;
import java.util.Iterator;
@@ -19,7 +19,7 @@
* (depending on the create_if_not_exists argument)
*
* @author Bela Ban
- * @version $Id: CreateIfNotExistsInterceptor.java,v 1.25 2007/01/17 16:24:06 msurtani Exp $
+ * @version $Id: CreateIfNotExistsInterceptor.java,v 1.26 2007/02/07 22:06:41 genman Exp $
* @deprecated This code is not used anymore and will be removed in a future unlock
*/
public class CreateIfNotExistsInterceptor extends Interceptor
1.10 +3 -3 JBossCache/src/org/jboss/cache/interceptors/OptimisticInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticInterceptor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- OptimisticInterceptor.java 4 Jan 2007 05:35:37 -0000 1.9
+++ OptimisticInterceptor.java 7 Feb 2007 22:06:41 -0000 1.10
@@ -9,11 +9,11 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.NodeSPI;
-import org.jboss.cache.OptimisticTransactionEntry;
-import org.jboss.cache.TransactionTable;
import org.jboss.cache.optimistic.TransactionWorkspace;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.OptimisticTransactionEntry;
+import org.jboss.cache.transaction.TransactionTable;
import javax.transaction.TransactionManager;
import java.util.List;
1.33 +2 -2 JBossCache/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticReplicationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- OptimisticReplicationInterceptor.java 12 Dec 2006 14:51:44 -0000 1.32
+++ OptimisticReplicationInterceptor.java 7 Feb 2007 22:06:41 -0000 1.33
@@ -8,9 +8,7 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
-import org.jboss.cache.OptimisticTransactionEntry;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
@@ -20,6 +18,8 @@
import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.optimistic.TransactionWorkspace;
import org.jboss.cache.optimistic.WorkspaceNode;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.OptimisticTransactionEntry;
import java.util.ArrayList;
import java.util.Iterator;
1.17 +2 -2 JBossCache/src/org/jboss/cache/interceptors/CallInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CallInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CallInterceptor.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- CallInterceptor.java 30 Dec 2006 17:49:53 -0000 1.16
+++ CallInterceptor.java 7 Feb 2007 22:06:41 -0000 1.17
@@ -2,11 +2,11 @@
import org.jboss.cache.CacheImpl;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.GlobalTransaction;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.transaction.GlobalTransaction;
import javax.transaction.Transaction;
@@ -19,7 +19,7 @@
* this interceptor unless it is a call the OptimisticNodeInterceptor knows nothing about.
*
* @author Bela Ban
- * @version $Id: CallInterceptor.java,v 1.16 2006/12/30 17:49:53 msurtani Exp $
+ * @version $Id: CallInterceptor.java,v 1.17 2007/02/07 22:06:41 genman Exp $
*/
public class CallInterceptor extends Interceptor
{
More information about the jboss-cvs-commits
mailing list