Author: manik.surtani(a)jboss.com Date: 2008-06-25 11:34:48 -0400 (Wed, 25 Jun 2008) New Revision: 6039 Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java Log: Renamed TransactionEntry to TransactionContext Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspace.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -15,7 +15,7 @@ * Used to contain a copy of the tree being worked on within the scope of a given transaction. * Maintains {@link WorkspaceNode}s rather than conventional * <p/> - * Also see {@link org.jboss.cache.transaction.OptimisticTransactionEntry}, which creates and maintains + * Also see {@link org.jboss.cache.transaction.OptimisticTransactionContext}, which creates and maintains * an instance of TransactionWorkspace for each * transaction running. * Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -9,10 +9,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.NodeSPI; import org.jboss.cache.RPCManager; -import org.jboss.cache.util.TestingUtil; -import org.jboss.cache.util.internals.ReplicationListener; import org.jboss.cache.commands.ReplicableCommand; -import org.jboss.cache.commands.write.*; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.ComponentRegistry; @@ -20,7 +17,9 @@ import org.jboss.cache.lock.NodeLock; import org.jboss.cache.optimistic.TransactionWorkspace; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; +import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.internals.ReplicationListener; import org.jgroups.Address; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; @@ -454,7 +453,7 @@ try { GlobalTransaction gtx = cs.getTransactionTable().get(cs.getTransactionManager().getTransaction()); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) cs.getTransactionTable().get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) cs.getTransactionTable().get(gtx); return entry.getTransactionWorkSpace(); } catch (SystemException e) Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -7,13 +7,13 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.commands.ReversibleCommand; import org.jboss.cache.commands.VersionedDataCommand; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.parsing.XmlConfigHelper; +import org.jboss.cache.config.parsing.XmlConfigurationParserOld; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.config.parsing.XmlConfigurationParserOld; import org.jboss.cache.interceptors.CacheMgmtInterceptor; import org.jboss.cache.interceptors.CallInterceptor; import org.jboss.cache.interceptors.NotificationInterceptor; @@ -28,7 +28,7 @@ import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.transaction.GlobalTransaction; import org.jboss.cache.transaction.TransactionSetup; -import org.jboss.cache.config.parsing.XmlConfigHelper; +import org.jboss.cache.util.TestingUtil; import org.jgroups.Address; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -95,7 +95,7 @@ cache.getInvocationContext().setTransaction(tx); GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); cache.getInvocationContext().setGlobalTransaction(gtx); - cache.getInvocationContext().setTransactionEntry(cache.getTransactionTable().get(gtx)); + cache.getInvocationContext().setTransactionContext(cache.getTransactionTable().get(gtx)); } protected CacheLoaderConfig getCacheLoaderConfig(boolean shared, boolean passivation) throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -3,15 +3,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.commands.write.RemoveNodeCommand; -import org.jboss.cache.commands.write.PutKeyValueCommand; import org.jboss.cache.config.Configuration; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.lock.LockManager; -import org.jboss.cache.util.TestingUtil; -import org.jboss.cache.util.internals.ReplicationListener; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.internals.ReplicationListener; import static org.testng.AssertJUnit.*; import org.testng.annotations.Test; @@ -332,7 +331,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertEquals(3, entry.getTransactionWorkSpace().getNodes().size()); assertNull(mgr.getTransaction()); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -17,7 +17,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.invocation.NodeInvocationDelegate; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; import org.jboss.cache.util.TestingUtil; import org.jgroups.Address; @@ -211,7 +211,7 @@ GlobalTransaction gtx = c.getCurrentTransaction(tx, true); TransactionTable table = c.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); ReversibleCommand command = entry.getModifications().get(0); mgr.commit(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -7,7 +7,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -205,7 +205,7 @@ { Transaction tx = cache.getTransactionManager().getTransaction(); GlobalTransaction gtx = cache.getTransactionTable().get(tx); - OptimisticTransactionEntry te = (OptimisticTransactionEntry) cache.getTransactionTable().get(gtx); + OptimisticTransactionContext te = (OptimisticTransactionContext) cache.getTransactionTable().get(gtx); TransactionWorkspace tw = te.getTransactionWorkSpace(); return tw.getNode(fqn); } Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -7,10 +7,10 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.lock.LockManager; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.Test; @@ -433,7 +433,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table + OptimisticTransactionContext entry = (OptimisticTransactionContext) table .get(gtx); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -2,15 +2,15 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.factories.ComponentRegistry; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -76,7 +76,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -119,7 +119,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); //assert we can see this with a key value get in the transaction assertEquals(0, cache.getRoot().getChildrenNames().size()); @@ -149,7 +149,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -2,14 +2,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -70,7 +70,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -123,7 +123,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -161,7 +161,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -215,7 +215,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -223,7 +223,7 @@ //resume the suspended transaction GlobalTransaction gtx2 = table.get(tx2); - OptimisticTransactionEntry entry2 = (OptimisticTransactionEntry) table.get(gtx2); + OptimisticTransactionContext entry2 = (OptimisticTransactionContext) table.get(gtx2); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace2 = entry2.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -2,14 +2,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -69,7 +69,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -113,7 +113,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); //assert we can see this with a key value get in the transaction assertEquals(0, cache.getRoot().getKeys().size()); @@ -142,7 +142,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); //assert we can see this with a key value get in the transaction assertEquals(1, cache.getNode("/one/two").getKeys().size()); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -2,14 +2,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -69,7 +69,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -108,7 +108,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -143,7 +143,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -180,7 +180,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -226,7 +226,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -234,7 +234,7 @@ //resume the suspended transaction GlobalTransaction gtx2 = table.get(tx2); - OptimisticTransactionEntry entry2 = (OptimisticTransactionEntry) table.get(gtx2); + OptimisticTransactionContext entry2 = (OptimisticTransactionContext) table.get(gtx2); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace2 = entry2.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -2,14 +2,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -73,7 +73,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -110,7 +110,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -144,7 +144,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -6,10 +6,10 @@ import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -73,7 +73,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -114,7 +114,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -153,7 +153,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -2,14 +2,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -70,7 +70,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -104,7 +104,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -140,7 +140,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); assertEquals(1, workspace.getNode(Fqn.fromString("/one/two")).getMergedData().size()); @@ -178,7 +178,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); assertEquals(1, workspace.getNode(Fqn.fromString("/one/two")).getMergedData().size()); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -8,14 +8,14 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -76,7 +76,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -110,7 +110,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -146,7 +146,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -13,7 +13,7 @@ import org.jboss.cache.commands.tx.OptimisticPrepareCommand; import org.jboss.cache.interceptors.CallInterceptor; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; @@ -75,7 +75,7 @@ TransactionTable table = cache.getTransactionTable(); GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); mgr.commit(); @@ -114,7 +114,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<?, ?> workspace = entry.getTransactionWorkSpace(); @@ -153,7 +153,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<?, ?> workspace = entry.getTransactionWorkSpace(); @@ -192,7 +192,7 @@ TransactionTable table = cache.getTransactionTable(); GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -248,7 +248,7 @@ TransactionTable table = cache.getTransactionTable(); GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -308,7 +308,7 @@ TransactionTable table = cache.getTransactionTable(); GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace workspace = entry.getTransactionWorkSpace(); @@ -369,7 +369,7 @@ TransactionTable table = cache.getTransactionTable(); GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<?, ?> workspace = entry.getTransactionWorkSpace(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -12,11 +12,11 @@ import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.Test; @@ -35,7 +35,7 @@ protected Transaction tx; protected GlobalTransaction gtx; protected TransactionTable table; - protected OptimisticTransactionEntry entry; + protected OptimisticTransactionContext entry; protected TransactionWorkspace workspace; protected void setupTransactionsInInvocationCtx(CacheSPI cache) throws Exception @@ -50,7 +50,7 @@ // create a globalTransaction gtx = cache.getCurrentTransaction(); tx = txManager.getTransaction(); - entry = (OptimisticTransactionEntry) table.get(gtx); + entry = (OptimisticTransactionContext) table.get(gtx); workspace = entry.getTransactionWorkSpace(); setupTransactions(cache, tx); @@ -117,7 +117,7 @@ // we should now remove stuff from the InvocationCtx cache.getInvocationContext().setGlobalTransaction(null); cache.getInvocationContext().setTransaction(null); - cache.getInvocationContext().setTransactionEntry(null); + cache.getInvocationContext().setTransactionContext(null); try { Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -15,7 +15,7 @@ import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; import org.jboss.cache.util.TestingUtil; import org.jgroups.Address; @@ -133,7 +133,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); mgr.commit(); @@ -198,7 +198,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); mgr.commit(); @@ -276,7 +276,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); mgr.commit(); @@ -335,7 +335,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); mgr.commit(); @@ -388,7 +388,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); mgr.commit(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -8,12 +8,12 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.DummyTransactionManager; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; import org.testng.annotations.Test; @@ -76,7 +76,7 @@ cache.put("/one/two", "key2", pojo); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) cache.getTransactionTable().get(cache.getCurrentTransaction()); + OptimisticTransactionContext entry = (OptimisticTransactionContext) cache.getTransactionTable().get(cache.getCurrentTransaction()); assertEquals(3, entry.getTransactionWorkSpace().getNodes().size()); assertTrue(entry.getTransactionWorkSpace().getNode(Fqn.fromString("/")) != null); assertTrue(entry.getTransactionWorkSpace().getNode(Fqn.fromString("/one")) != null); @@ -136,7 +136,7 @@ setTransactionsInInvocationCtx(mgr, cache); cache.put("/one", "key1", pojo); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) cache.getTransactionTable().get(cache.getCurrentTransaction()); + OptimisticTransactionContext entry = (OptimisticTransactionContext) cache.getTransactionTable().get(cache.getCurrentTransaction()); randomSleep(minSleep, maxSleep); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -13,7 +13,7 @@ import org.jboss.cache.commands.tx.RollbackCommand; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionSetup; import org.jboss.cache.transaction.TransactionTable; import org.jboss.cache.util.TestingUtil; @@ -286,7 +286,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); ReversibleCommand command = entry.getModifications().get(0); mgr.commit(); @@ -355,7 +355,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertEquals(tx, mgr.getTransaction()); //now send the remote prepare @@ -438,7 +438,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertEquals(tx, mgr.getTransaction()); //now send the remote prepare @@ -526,7 +526,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertEquals(tx, mgr.getTransaction()); //now send the remote prepare @@ -613,7 +613,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); ReversibleCommand command = entry.getModifications().get(0); mgr.commit(); @@ -705,7 +705,7 @@ GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); assertNotNull(mgr.getTransaction()); ReversibleCommand command = entry.getModifications().get(0); mgr.commit(); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java 2008-06-25 15:33:13 UTC (rev 6038) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java 2008-06-25 15:34:48 UTC (rev 6039) @@ -21,7 +21,7 @@ import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.SamplePojo; import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionEntry; +import org.jboss.cache.transaction.OptimisticTransactionContext; import org.jboss.cache.transaction.TransactionTable; import org.jboss.cache.util.CachePrinter; import org.jboss.cache.util.TestingUtil; @@ -95,7 +95,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -145,7 +145,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -193,7 +193,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -270,7 +270,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); @SuppressWarnings("unchecked") TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace(); @@ -349,7 +349,7 @@ GlobalTransaction gtx = table.get(tx); - OptimisticTransactionEntry entry = (OptimisticTransactionEntry) table.get(gtx); + OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); TransactionWorkspace<Object, Object> workspace = entry.getTransactionWorkSpace();