[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/optimistic ...
Manik Surtani
msurtani at jboss.com
Fri Aug 25 10:10:10 EDT 2006
User: msurtani
Date: 06/08/25 10:10:10
Modified: tests/functional/org/jboss/cache/optimistic
CacheTest.java MockFailureInterceptor.java
MockInterceptor.java OpLockingInterceptorTest.java
OptimisticReplicationInterceptorTest.java
TxInterceptorTest.java
ValidatorInterceptorTest.java
Log:
More work on JBCACHE-734
Revision Changes Path
1.21 +15 -4 JBossCache/tests/functional/org/jboss/cache/optimistic/CacheTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/CacheTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- CacheTest.java 17 Aug 2006 21:57:59 -0000 1.20
+++ CacheTest.java 25 Aug 2006 14:10:10 -0000 1.21
@@ -7,20 +7,31 @@
import junit.framework.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.*;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.GlobalTransaction;
+import org.jboss.cache.OptimisticTransactionEntry;
+import org.jboss.cache.TransactionTable;
+import org.jboss.cache.TreeCache;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.interceptors.*;
+import org.jboss.cache.interceptors.Interceptor;
+import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
+import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
+import org.jboss.cache.interceptors.OptimisticReplicationInterceptor;
+import org.jboss.cache.interceptors.TxInterceptor;
import org.jboss.cache.loader.SamplePojo;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.transaction.DummyTransactionManager;
import org.jgroups.Address;
-import org.jgroups.blocks.MethodCall;
+import org.jboss.cache.marshall.MethodCall;
import javax.transaction.RollbackException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.List;
public class CacheTest extends AbstractOptimisticTestCase
1.4 +1 -1 JBossCache/tests/functional/org/jboss/cache/optimistic/MockFailureInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MockFailureInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/MockFailureInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MockFailureInterceptor.java 20 Jul 2006 09:03:54 -0000 1.3
+++ MockFailureInterceptor.java 25 Aug 2006 14:10:10 -0000 1.4
@@ -2,7 +2,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.interceptors.Interceptor;
-import org.jgroups.blocks.MethodCall;
+import org.jboss.cache.marshall.MethodCall;
import java.util.ArrayList;
import java.util.List;
1.6 +1 -1 JBossCache/tests/functional/org/jboss/cache/optimistic/MockInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MockInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/MockInterceptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MockInterceptor.java 17 Aug 2006 21:57:59 -0000 1.5
+++ MockInterceptor.java 25 Aug 2006 14:10:10 -0000 1.6
@@ -2,7 +2,7 @@
import org.jboss.cache.TreeCache;
import org.jboss.cache.interceptors.Interceptor;
-import org.jgroups.blocks.MethodCall;
+import org.jboss.cache.marshall.MethodCall;
import java.lang.reflect.Method;
import java.util.ArrayList;
1.14 +7 -2 JBossCache/tests/functional/org/jboss/cache/optimistic/OpLockingInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OpLockingInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/OpLockingInterceptorTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- OpLockingInterceptorTest.java 18 Aug 2006 15:40:40 -0000 1.13
+++ OpLockingInterceptorTest.java 25 Aug 2006 14:10:10 -0000 1.14
@@ -6,7 +6,12 @@
*/
package org.jboss.cache.optimistic;
-import org.jboss.cache.*;
+import org.jboss.cache.DataNode;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.GlobalTransaction;
+import org.jboss.cache.OptimisticTransactionEntry;
+import org.jboss.cache.TransactionTable;
+import org.jboss.cache.TreeCache;
import org.jboss.cache.interceptors.Interceptor;
import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
import org.jboss.cache.interceptors.OptimisticLockingInterceptor;
@@ -16,7 +21,7 @@
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.transaction.DummyTransactionManager;
-import org.jgroups.blocks.MethodCall;
+import org.jboss.cache.marshall.MethodCall;
import javax.transaction.Transaction;
import java.util.HashMap;
1.15 +1 -1 JBossCache/tests/functional/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimisticReplicationInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- OptimisticReplicationInterceptorTest.java 17 Aug 2006 21:57:59 -0000 1.14
+++ OptimisticReplicationInterceptorTest.java 25 Aug 2006 14:10:10 -0000 1.15
@@ -17,7 +17,7 @@
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.transaction.DummyTransactionManager;
import org.jgroups.Address;
-import org.jgroups.blocks.MethodCall;
+import org.jboss.cache.marshall.MethodCall;
import javax.transaction.RollbackException;
import javax.transaction.Transaction;
1.14 +2 -1 JBossCache/tests/functional/org/jboss/cache/optimistic/TxInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/TxInterceptorTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- TxInterceptorTest.java 17 Aug 2006 21:57:59 -0000 1.13
+++ TxInterceptorTest.java 25 Aug 2006 14:10:10 -0000 1.14
@@ -14,9 +14,10 @@
import org.jboss.cache.loader.SamplePojo;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.transaction.DummyTransactionManager;
import org.jgroups.Address;
-import org.jgroups.blocks.MethodCall;
+import org.jboss.cache.marshall.MethodCall;
import javax.transaction.Transaction;
import java.io.DataInputStream;
1.15 +7 -2 JBossCache/tests/functional/org/jboss/cache/optimistic/ValidatorInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ValidatorInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/ValidatorInterceptorTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ValidatorInterceptorTest.java 18 Aug 2006 15:40:40 -0000 1.14
+++ ValidatorInterceptorTest.java 25 Aug 2006 14:10:10 -0000 1.15
@@ -6,16 +6,21 @@
*/
package org.jboss.cache.optimistic;
-import org.jboss.cache.*;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.GlobalTransaction;
+import org.jboss.cache.OptimisticTransactionEntry;
+import org.jboss.cache.OptimisticTreeNode;
+import org.jboss.cache.TransactionTable;
+import org.jboss.cache.TreeCache;
import org.jboss.cache.interceptors.Interceptor;
import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
import org.jboss.cache.interceptors.OptimisticValidatorInterceptor;
import org.jboss.cache.loader.SamplePojo;
+import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.transaction.DummyTransactionManager;
-import org.jgroups.blocks.MethodCall;
import javax.transaction.Transaction;
import java.util.HashMap;
More information about the jboss-cvs-commits
mailing list