[infinispan-commits] Infinispan SVN: r722 - in trunk: core/src/main/java/org/infinispan/util and 15 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-24 11:46:28 -0400 (Mon, 24 Aug 2009)
New Revision: 722

Added:
   trunk/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java
Modified:
   trunk/README-Maven.txt
   trunk/core/src/main/java/org/infinispan/util/Util.java
   trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
   trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
   trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
   trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
   trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
   trunk/core/src/test/java/org/infinispan/atomic/APITest.java
   trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
   trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java
   trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java
   trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java
   trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
   trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
   trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java
   trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
   trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
   trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
   trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
   trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
   trunk/core/src/test/java/org/infinispan/replication/SyncReplImplicitLockingTest.java
   trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
   trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
   trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
   trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java
   trunk/core/src/test/java/org/infinispan/tx/LocalDeadlockDetectionTest.java
   trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
   trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
   trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java
   trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
   trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java
   trunk/parent/pom.xml
   trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
Log:
Ability to run tests with JBoss TS

Modified: trunk/README-Maven.txt
===================================================================
--- trunk/README-Maven.txt	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/README-Maven.txt	2009-08-24 15:46:28 UTC (rev 722)
@@ -202,7 +202,7 @@
 
 Or, to use JBoss JTA (Arjuna TM) instead of the DummyTransactionManager in a "transaction" group test, set:
 
-   -Dorg.infinispan.test.tm=jboss-jta
+   -Dinfinispan.tm=jbosstm
 
 Please refer to the POM file for more properties and permutations.
 

Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -26,6 +26,7 @@
 import java.io.ObjectOutput;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.text.NumberFormat;
 import java.util.HashMap;
 import java.util.Map;
@@ -54,18 +55,27 @@
       return cl.loadClass(classname);
    }
 
+   private static Method getFactoryMethod(Class c) {
+      for (Method m : c.getMethods()) {
+         if (m.getName().equals("getInstance") && m.getParameterTypes().length == 0 && Modifier.isStatic(m.getModifiers()))
+            return m;
+      }
+      return null;
+   }
+
    @SuppressWarnings("unchecked")
    public static <T> T getInstance(Class<T> clazz) throws IllegalAccessException, InstantiationException {
       // first look for a getInstance() constructor
-      T instance;
+      T instance = null;
       try {
-         Method factoryMethod = clazz.getMethod("getInstance", new Class[]{});
-         instance = (T) factoryMethod.invoke(null);
+         Method factoryMethod = getFactoryMethod(clazz);
+         if (factoryMethod != null) instance = (T) factoryMethod.invoke(null);
       }
       catch (Exception e) {
          // no factory method or factory method failed.  Try a constructor.
-         instance = clazz.newInstance();
+         instance = null;
       }
+      if (instance == null) instance = clazz.newInstance();
       return instance;
    }
 
@@ -82,6 +92,10 @@
    private Util() {
    }
 
+   public static Util getInstance() {
+      return null;
+   }
+
    /**
     * Null-safe equality test.
     *

Modified: trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -5,9 +5,8 @@
 import org.infinispan.config.ConfigurationException;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
-import org.infinispan.transaction.tm.DummyTransactionManager;
 import org.infinispan.util.ObjectDuplicator;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.testng.annotations.Test;
@@ -31,9 +30,8 @@
 
    protected CacheManager createCacheManager() throws Exception {
       // start a single cache instance
-      Configuration c = new Configuration();
+      Configuration c = getDefaultStandaloneConfig(true);
       c.setIsolationLevel(getIsolationLevel());
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       CacheManager cm = TestCacheManagerFactory.createLocalCacheManager();
       cm.defineConfiguration("test", c);
       cache = cm.getCache("test");
@@ -48,7 +46,7 @@
    public void testConfiguration() {
       Configuration c = cache.getConfiguration();
       assert Configuration.CacheMode.LOCAL.equals(c.getCacheMode());
-      assert DummyTransactionManagerLookup.class.getName().equals(c.getTransactionManagerLookupClass());
+      assert null != c.getTransactionManagerLookupClass();
 
       // note that certain values should be immutable.  E.g., CacheMode cannot be changed on the fly.
       try {
@@ -94,7 +92,7 @@
       cache.putAll(data);
 
       assert value.equals(cache.get(key));
-      assert 1 == cache.keySet().size() && 1 == cache.values().size(); 
+      assert 1 == cache.keySet().size() && 1 == cache.values().size();
       assert cache.keySet().contains(key);
       assert cache.values().contains(value);
    }
@@ -164,7 +162,7 @@
    }
 
    public void testRollbackAfterPut() throws Exception {
-      String key = "key", value = "value", key2 = "keyTwo", value2="value2";
+      String key = "key", value = "value", key2 = "keyTwo", value2 = "value2";
       int size = 0;
       cache.put(key, value);
       assert cache.get(key).equals(value);
@@ -173,14 +171,14 @@
       assert cache.keySet().contains(key);
       assert cache.values().contains(value);
 
-      DummyTransactionManager.getInstance().begin();
+      TestingUtil.getTransactionManager(cache).begin();
       cache.put(key2, value2);
       assert cache.get(key2).equals(value2);
       assert !cache.keySet().contains(key2);
       size = 1;
       assert size == cache.size() && size == cache.keySet().size() && size == cache.values().size() && size == cache.entrySet().size();
       assert !cache.values().contains(value2);
-      DummyTransactionManager.getInstance().rollback();
+      TestingUtil.getTransactionManager(cache).rollback();
 
       assert cache.get(key).equals(value);
       size = 1;
@@ -190,8 +188,8 @@
    }
 
    public void testRollbackAfterOverwrite() throws Exception {
-      String key = "key", value = "value", value2= "value2";
-      int size = 0;      
+      String key = "key", value = "value", value2 = "value2";
+      int size = 0;
       cache.put(key, value);
       assert cache.get(key).equals(value);
       size = 1;
@@ -199,14 +197,14 @@
       assert cache.keySet().contains(key);
       assert cache.values().contains(value);
 
-      DummyTransactionManager.getInstance().begin();
+      TestingUtil.getTransactionManager(cache).begin();
       cache.put(key, value2);
       assert cache.get(key).equals(value2);
       size = 1;
       assert size == cache.size() && size == cache.keySet().size() && size == cache.values().size() && size == cache.entrySet().size();
       assert cache.keySet().contains(key);
       assert !cache.values().contains(value2);
-      DummyTransactionManager.getInstance().rollback();
+      TestingUtil.getTransactionManager(cache).rollback();
 
       assert cache.get(key).equals(value);
       size = 1;
@@ -225,12 +223,12 @@
       assert cache.keySet().contains(key);
       assert cache.values().contains(value);
 
-      DummyTransactionManager.getInstance().begin();
+      TestingUtil.getTransactionManager(cache).begin();
       cache.remove(key);
       assert cache.get(key) == null;
       size = 1;
       assert size == cache.size() && size == cache.keySet().size() && size == cache.values().size() && size == cache.entrySet().size();
-      DummyTransactionManager.getInstance().rollback();
+      TestingUtil.getTransactionManager(cache).rollback();
 
       assert cache.get(key).equals(value);
       size = 1;
@@ -249,12 +247,12 @@
       assert cache.keySet().contains(key);
       assert cache.values().contains(value);
 
-      DummyTransactionManager.getInstance().begin();
+      TestingUtil.getTransactionManager(cache).begin();
       cache.clear();
       assert cache.get(key) == null;
       size = 1;
       assert size == cache.size() && size == cache.keySet().size() && size == cache.values().size() && size == cache.entrySet().size();
-      DummyTransactionManager.getInstance().rollback();
+      TestingUtil.getTransactionManager(cache).rollback();
 
       assert cache.get(key).equals(value);
       size = 1;
@@ -312,7 +310,7 @@
       assert size == cache.size() && size == cache.keySet().size() && size == cache.values().size() && size == cache.entrySet().size();
       assert !cache.containsKey(key);
       assert !cache.keySet().contains(key);
-      assert !cache.values().contains(value);      
+      assert !cache.values().contains(value);
 
       Map<String, String> m = new HashMap<String, String>();
       m.put("1", "one");
@@ -339,7 +337,7 @@
       size = 4;
       assert size == cache.size() && size == cache.keySet().size() && size == cache.values().size() && size == cache.entrySet().size();
    }
-   
+
    public void testKeyValueEntryCollections() {
       String key1 = "1", value1 = "one", key2 = "2", value2 = "two", key3 = "3", value3 = "three";
       Map<String, String> m = new HashMap<String, String>();
@@ -353,23 +351,23 @@
       expKeys.add(key1);
       expKeys.add(key2);
       expKeys.add(key3);
-      
+
       Set expValues = new HashSet();
       expValues.add(value1);
       expValues.add(value2);
       expValues.add(value3);
-      
+
       Set expKeyEntries = ObjectDuplicator.duplicateSet(expKeys);
       Set expValueEntries = ObjectDuplicator.duplicateSet(expValues);
 
       Set<String> keys = cache.keySet();
       for (String key : keys) assert expKeys.remove(key);
       assert expKeys.isEmpty() : "Did not see keys " + expKeys + " in iterator!";
-      
+
       Collection<String> values = cache.values();
       for (String value : values) assert expValues.remove(value);
       assert expValues.isEmpty() : "Did not see keys " + expValues + " in iterator!";
-      
+
       Set<Map.Entry> entries = cache.entrySet();
       for (Map.Entry entry : entries) {
          assert expKeyEntries.remove(entry.getKey());
@@ -378,7 +376,7 @@
       assert expKeyEntries.isEmpty() : "Did not see keys " + expKeyEntries + " in iterator!";
       assert expValueEntries.isEmpty() : "Did not see keys " + expValueEntries + " in iterator!";
    }
-   
+
    public void testImmutabilityOfKeyValueEntryCollections() {
       final String key1 = "1", value1 = "one", key2 = "2", value2 = "two", key3 = "3", value3 = "three";
       Map<String, String> m = new HashMap<String, String>();
@@ -386,7 +384,7 @@
       m.put(key2, value2);
       m.put(key3, value3);
       cache.putAll(m);
-      
+
       Set<String> keys = cache.keySet();
       Collection<String> values = cache.values();
       Set<Map.Entry> entries = cache.entrySet();
@@ -405,32 +403,32 @@
             assert false : "Should have thrown a UnsupportedOperationException";
          } catch (UnsupportedOperationException uoe) {
          }
-         
+
          try {
             col.clear();
             assert false : "Should have thrown a UnsupportedOperationException";
          } catch (UnsupportedOperationException uoe) {
          }
-         
+
          try {
             col.remove(key1);
             assert false : "Should have thrown a UnsupportedOperationException";
          } catch (UnsupportedOperationException uoe) {
          }
-         
+
          try {
             col.removeAll(newObjCol);
             assert false : "Should have thrown a UnsupportedOperationException";
          } catch (UnsupportedOperationException uoe) {
          }
-         
+
          try {
             col.retainAll(newObjCol);
             assert false : "Should have thrown a UnsupportedOperationException";
          } catch (UnsupportedOperationException uoe) {
          }
       }
-      
+
       for (Map.Entry entry : entries) {
          try {
             entry.setValue(newObj);
@@ -439,5 +437,5 @@
          }
       }
    }
-   
+
 }

Modified: trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -1,11 +1,11 @@
 package org.infinispan.api.batch;
 
 import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.test.fwk.TransactionSetup;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -93,7 +93,7 @@
 
    private Cache<String, String> createCache(String name) {
       Configuration c = new Configuration();
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      c.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup());
       c.setInvocationBatchingEnabled(true);
       assert c.getTransactionManagerLookupClass() != null : "Should have a transaction manager lookup class attached!!";
       cm.defineConfiguration(name, c);

Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -6,7 +6,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.infinispan.util.concurrent.TimeoutException;
 import org.infinispan.util.concurrent.locks.LockManager;
@@ -43,10 +42,9 @@
    public void setUp() {
       LockTestBaseTL tl = new LockTestBaseTL();
       Configuration defaultCfg = new Configuration();
-      defaultCfg.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       defaultCfg.setIsolationLevel(repeatableRead ? IsolationLevel.REPEATABLE_READ : IsolationLevel.READ_COMMITTED);
       defaultCfg.setLockAcquisitionTimeout(200); // 200 ms
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(defaultCfg);
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(defaultCfg, true);
       tl.cache = cm.getCache();
       tl.lockManager = TestingUtil.extractComponentRegistry(tl.cache).getComponent(LockManager.class);
       tl.icc = TestingUtil.extractComponentRegistry(tl.cache).getComponent(InvocationContextContainer.class);

Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -17,7 +17,6 @@
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.ReplListener;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.transaction.xa.TransactionTable;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
@@ -35,8 +34,7 @@
    ReplListener replListener1, replListener2;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       createClusteredCaches(2, "replSync", c);
 
       cache1 = cache(0, "replSync");

Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -7,7 +7,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.infinispan.util.concurrent.locks.LockManager;
 import org.testng.annotations.AfterTest;
@@ -32,10 +31,9 @@
    @BeforeTest
    public void setUp() {
       Configuration c = new Configuration();
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       c.setLockAcquisitionTimeout(200);
       c.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
-      cacheManager = TestCacheManagerFactory.createCacheManager(c);
+      cacheManager = TestCacheManagerFactory.createCacheManager(c, true);
    }
 
    @AfterTest

Modified: trunk/core/src/test/java/org/infinispan/atomic/APITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/APITest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/atomic/APITest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -21,12 +21,11 @@
  */
 package org.infinispan.atomic;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
 import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmpty;
 import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmptyMap;
 import org.infinispan.config.Configuration;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -46,8 +45,7 @@
    private void setUp() {
       Configuration c = new Configuration();
       c.setInvocationBatchingEnabled(true);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
-      cache = (AtomicMapCache) TestCacheManagerFactory.createCacheManager(c).getCache();
+      cache = (AtomicMapCache) TestCacheManagerFactory.createCacheManager(c, true).getCache();
       tm = TestingUtil.getTransactionManager(cache);
    }
 

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -5,7 +5,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.TimeoutException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -39,9 +38,8 @@
       Configuration c = new Configuration();
       c.setLockAcquisitionTimeout(500);
       // these 2 need to be set to use the AtomicMapCache
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       c.setInvocationBatchingEnabled(true);
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(c);
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(c, true);
       Cache basicCache = cm.getCache();
       cache = (AtomicMapCache<String, String>) basicCache;
       tm = TestingUtil.getTransactionManager(cache);

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -8,7 +8,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 import org.testng.annotations.AfterMethod;
@@ -29,9 +28,8 @@
    public void setUp() {
       Configuration c = new Configuration();
       // these 2 need to be set to use the AtomicMapCache
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       c.setInvocationBatchingEnabled(true);
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(c);
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(c, true);
       Cache basicCache = cm.getCache();
       cache = (AtomicMapCache<String, String>) basicCache;
       tm = TestingUtil.getTransactionManager(cache);

Modified: trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -5,8 +5,7 @@
 import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmptyMap;
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.transaction.tm.DummyTransactionManager;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -17,8 +16,7 @@
    AtomicMapCache cache1, cache2;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       c.setInvocationBatchingEnabled(true);
 
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "atomic", c);
@@ -29,10 +27,10 @@
    public void testReplicationCommit() throws Exception {
       AtomicMap map = cache1.getAtomicMap("map");
 
-      DummyTransactionManager.getInstance().begin();
+      TestingUtil.getTransactionManager(cache1).begin();
       map.put("existing", "existing");
       map.put("blah", "blah");
-      DummyTransactionManager.getInstance().commit();
+      TestingUtil.getTransactionManager(cache1).commit();
 
       assert map.size() == 2;
       assert map.get("blah").equals("blah");
@@ -47,10 +45,10 @@
       assertIsEmptyMap(cache2, "map");
       AtomicMap map = cache1.getAtomicMap("map");
 
-      DummyTransactionManager.getInstance().begin();
+      TestingUtil.getTransactionManager(cache1).begin();
       map.put("existing", "existing");
       map.put("blah", "blah");
-      DummyTransactionManager.getInstance().rollback();
+      TestingUtil.getTransactionManager(cache1).rollback();
 
       assertIsEmpty(map);
       assertIsEmptyMap(cache1, "map");

Modified: trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/distribution/AsyncAPISyncDistTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -5,7 +5,6 @@
 import org.infinispan.context.Flag;
 import org.infinispan.replication.AsyncAPISyncReplTest;
 import org.infinispan.test.data.Key;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.Util;
 import org.testng.annotations.Test;
 
@@ -18,8 +17,7 @@
    @Override
    protected void createCacheManagers() throws Throwable {
       Configuration c =
-            getDefaultClusteredConfig(sync() ? Configuration.CacheMode.DIST_SYNC : Configuration.CacheMode.DIST_ASYNC);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+            getDefaultClusteredConfig(sync() ? Configuration.CacheMode.DIST_SYNC : Configuration.CacheMode.DIST_ASYNC, true);
       List<Cache<Key, String>> l = createClusteredCaches(2, getClass().getSimpleName(), c);
       c1 = l.get(0);
       c2 = l.get(1);

Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -12,7 +12,6 @@
 import org.infinispan.remoting.transport.Address;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.Util;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.testng.annotations.Test;
@@ -38,14 +37,13 @@
 
    protected void createCacheManagers() throws Throwable {
       cacheName = "dist";
-      configuration = getDefaultClusteredConfig(sync ? Configuration.CacheMode.DIST_SYNC : Configuration.CacheMode.DIST_ASYNC);
+      configuration = getDefaultClusteredConfig(sync ? Configuration.CacheMode.DIST_SYNC : Configuration.CacheMode.DIST_ASYNC, tx);
       if (!testRetVals) {
          configuration.setUnsafeUnreliableReturnValues(true);
          // we also need to use repeatable read for tests to work when we dont have reliable return values, since the
          // tests repeatedly queries changes
          configuration.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
       }
-      if (tx) configuration.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       configuration.setSyncReplTimeout(60, TimeUnit.SECONDS);
       configuration.setLockAcquisitionTimeout(45, TimeUnit.SECONDS);
       caches = createClusteredCaches(4, cacheName, configuration);

Modified: trunk/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/invalidation/AsyncAPISyncInvalTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -6,7 +6,6 @@
 import org.infinispan.context.Flag;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.data.Key;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.Util;
 import org.testng.annotations.Test;
 
@@ -23,8 +22,7 @@
    @SuppressWarnings("unchecked")
    protected void createCacheManagers() throws Throwable {
       Configuration c =
-            getDefaultClusteredConfig(sync() ? Configuration.CacheMode.INVALIDATION_SYNC : Configuration.CacheMode.INVALIDATION_ASYNC);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+            getDefaultClusteredConfig(sync() ? Configuration.CacheMode.INVALIDATION_SYNC : Configuration.CacheMode.INVALIDATION_ASYNC, true);
       List<Cache<Key, String>> l = createClusteredCaches(2, getClass().getSimpleName(), c);
       c1 = l.get(0);
       c2 = l.get(1);

Modified: trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -17,7 +17,6 @@
 import org.infinispan.remoting.transport.Transport;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.locks.LockManager;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
@@ -38,10 +37,9 @@
    }
 
    protected void createCacheManagers() throws Throwable {
-      Configuration c = getDefaultClusteredConfig(isSync ? Configuration.CacheMode.INVALIDATION_SYNC : Configuration.CacheMode.INVALIDATION_ASYNC);
+      Configuration c = getDefaultClusteredConfig(isSync ? Configuration.CacheMode.INVALIDATION_SYNC : Configuration.CacheMode.INVALIDATION_ASYNC, true);
       c.setStateRetrievalTimeout(1000);
       c.setLockAcquisitionTimeout(500);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "invalidation", c);
       cache1 = caches.get(0).getAdvancedCache();
       cache2 = caches.get(1).getAdvancedCache();
@@ -305,7 +303,7 @@
       assert cache1.get("key").equals("value1");
       assert cache2.get("key") == null;
    }
-   
+
    public void testLocalOnlyClear() {
       cache1.put("key", "value1", Flag.CACHE_MODE_LOCAL);
       cache2.put("key", "value2", Flag.CACHE_MODE_LOCAL);
@@ -318,7 +316,7 @@
       assert cache2.get("key") != null;
       assert cache2.get("key").equals("value2");
    }
-   
+
    public void testPutForExternalRead() throws Exception {
       cache1.putForExternalRead("key", "value1");
       Thread.sleep(500); // sleep so that async invalidation (result of PFER) is propagated

Modified: trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -6,7 +6,6 @@
 import org.infinispan.test.SingleCacheManagerTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.management.MBeanServer;
@@ -32,9 +31,8 @@
       globalConfiguration.setJmxDomain("MvccLockManagerMBeanTest");
       cacheManager = TestCacheManagerFactory.createCacheManager(globalConfiguration);
 
-      Configuration configuration = getDefaultClusteredConfig(Configuration.CacheMode.LOCAL);
+      Configuration configuration = getDefaultStandaloneConfig(true);
       configuration.setExposeJmxStatistics(true);
-      configuration.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       configuration.setConcurrencyLevel(CONCURRENCY_LEVEL);
 
       cacheManager.defineConfiguration("test", configuration);

Modified: trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -7,7 +7,6 @@
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -35,9 +34,8 @@
       CacheManager cacheManager2 = TestCacheManagerFactory.createCacheManager(globalConfiguration.clone());
       registerCacheManager(cacheManager2);
 
-      Configuration configuration = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
+      Configuration configuration = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       configuration.setExposeJmxStatistics(true);
-      configuration.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       cacheManager1.defineConfiguration("test", configuration);
       cacheManager2.defineConfiguration("test", configuration.clone());
       cache1 = cacheManager1.getCache("test");

Modified: trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -2,15 +2,14 @@
 
 import org.infinispan.Cache;
 import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
 import org.infinispan.commands.write.RemoveCommand;
 import org.infinispan.commands.write.ReplaceCommand;
 import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.commands.write.PutMapCommand;
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.data.Key;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.Util;
 import org.testng.annotations.Test;
 
@@ -28,8 +27,7 @@
    @SuppressWarnings("unchecked")
    protected void createCacheManagers() throws Throwable {
       Configuration c =
-            getDefaultClusteredConfig(sync() ? Configuration.CacheMode.REPL_SYNC : Configuration.CacheMode.REPL_ASYNC);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+            getDefaultClusteredConfig(sync() ? Configuration.CacheMode.REPL_SYNC : Configuration.CacheMode.REPL_ASYNC, true);
       List<Cache<Key, String>> l = createClusteredCaches(2, getClass().getSimpleName(), c);
       c1 = l.get(0);
       c2 = l.get(1);

Modified: trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -13,7 +13,6 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import static org.testng.AssertJUnit.assertEquals;
 import org.testng.annotations.Test;
 
@@ -26,8 +25,7 @@
    Cache cache1, cache2;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration asyncConfiguration = getDefaultClusteredConfig(Configuration.CacheMode.REPL_ASYNC);
-      asyncConfiguration.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration asyncConfiguration = getDefaultClusteredConfig(Configuration.CacheMode.REPL_ASYNC, true);
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "asyncRepl", asyncConfiguration);
       cache1 = caches.get(0);
       cache2 = caches.get(1);
@@ -99,7 +97,7 @@
       mgr.begin();
       cache1.put(key, "value3");
       mgr.rollback();
-      
+
       assertNotLocked(cache1, key);
 
    }

Modified: trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -10,7 +10,6 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.context.Flag;
 import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import java.util.HashMap;
@@ -24,9 +23,8 @@
    protected boolean isSync;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration c = getDefaultClusteredConfig(isSync ? Configuration.CacheMode.REPL_SYNC : Configuration.CacheMode.REPL_ASYNC);
+      Configuration c = getDefaultClusteredConfig(isSync ? Configuration.CacheMode.REPL_SYNC : Configuration.CacheMode.REPL_ASYNC, true);
       c.setStateRetrievalTimeout(1000);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "replication", c);
       cache1 = caches.get(0).getAdvancedCache();
       cache2 = caches.get(1).getAdvancedCache();
@@ -185,7 +183,7 @@
       assert cache1.get("key").equals("value1");
       assert cache2.get("key").equals("value1");
    }
-   
+
    public void testLocalOnlyClear() {
       cache1.put("key", "value1", Flag.CACHE_MODE_LOCAL);
       cache2.put("key", "value2", Flag.CACHE_MODE_LOCAL);

Modified: trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -15,7 +15,6 @@
 import org.infinispan.interceptors.base.CommandInterceptor;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.infinispan.util.concurrent.TimeoutException;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -35,10 +34,9 @@
    private AdvancedCache cache1, cache2;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration configuration = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
+      Configuration configuration = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       configuration.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
 
-      configuration.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       configuration.setLockAcquisitionTimeout(5000);
 
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "replicatinExceptionTest", configuration);

Modified: trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -1,7 +1,6 @@
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
 import org.infinispan.executors.ScheduledExecutorFactory;
@@ -9,7 +8,7 @@
 import org.infinispan.remoting.ReplicationQueue;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import javax.transaction.TransactionManager;
@@ -42,8 +41,7 @@
       CacheManager second = TestCacheManagerFactory.createCacheManager(globalConfiguration);
       registerCacheManager(first, second);
 
-      Configuration config = getDefaultClusteredConfig(Configuration.CacheMode.REPL_ASYNC);
-      config.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration config = getDefaultClusteredConfig(Configuration.CacheMode.REPL_ASYNC, true);
       config.setUseReplQueue(true);
       config.setReplQueueInterval(REPL_QUEUE_INTERVAL);
       config.setReplQueueMaxElements(REPL_QUEUE_MAX_ELEMENTS);

Modified: trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -17,7 +17,6 @@
 import org.infinispan.notifications.cachelistener.event.TransactionalEvent;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.infinispan.util.concurrent.locks.LockManager;
 import org.infinispan.util.logging.Log;
@@ -39,9 +38,8 @@
    private final static Log log = LogFactory.getLog(SyncCacheListenerTest.class);
 
    protected void createCacheManagers() throws Throwable {
-      Configuration conf = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
+      Configuration conf = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       conf.setIsolationLevel(IsolationLevel.SERIALIZABLE);
-      conf.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       conf.setLockAcquisitionTimeout(5000);
 
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "cache", conf);

Modified: trunk/core/src/test/java/org/infinispan/replication/SyncReplImplicitLockingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncReplImplicitLockingTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncReplImplicitLockingTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -21,29 +21,25 @@
  */
 package org.infinispan.replication;
 
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
+import org.testng.annotations.Test;
 
+import javax.transaction.TransactionManager;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.transaction.TransactionManager;
-
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
-import org.testng.annotations.Test;
-
 /**
  * Tests for implicit locking
- * 
- * Transparent eager locking for transactions 
- * https://jira.jboss.org/jira/browse/ISPN-70
- * 
+ * <p/>
+ * Transparent eager locking for transactions https://jira.jboss.org/jira/browse/ISPN-70
+ *
  * @author <a href="mailto:vblagoje at redhat.com">Vladimir Blagojevic (vblagoje at redhat.com)</a>
  */
 @Test(groups = "functional", testName = "replication.SyncReplImplicitLockingTest")
@@ -52,10 +48,9 @@
    String k = "key", v = "value";
 
    protected void createCacheManagers() throws Throwable {
-      Configuration replSync = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
+      Configuration replSync = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       replSync.setLockAcquisitionTimeout(500);
       replSync.setUseEagerLocking(true);
-      replSync.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       createClusteredCaches(2, "replication.SyncReplImplicitLockingTest", replSync);
 
       cache1 = manager(0).getCache("replication.SyncReplImplicitLockingTest");
@@ -92,7 +87,7 @@
    }
 
    private void concurrentLockingHelper(final boolean sameNode, final boolean useTx)
-            throws Exception {
+         throws Exception {
       assertClusterSize("Should only be 2  caches in the cluster!!!", 2);
 
       assertNull("Should be null", cache1.get(k));
@@ -103,7 +98,7 @@
          @Override
          public void run() {
             log.info("Concurrent " + (useTx ? "tx" : "non-tx") + " write started "
-                     + (sameNode ? "on same node..." : "on a different node..."));
+                  + (sameNode ? "on same node..." : "on a different node..."));
             TransactionManager mgr = null;
             try {
                if (useTx) {
@@ -132,7 +127,7 @@
       mgr.begin();
       // lock node and start other thread whose write should now block
       cache1.put(k, name);
-    //automatically locked on another cache node
+      //automatically locked on another cache node
       assertLocked(cache2, k);
       t.start();
 
@@ -159,24 +154,24 @@
       cache1.put(k, name);
       //automatically locked on another cache node
       assertLocked(cache2, k);
-      
+
       String key2 = "name";
       cache1.put(key2, "Vladimir");
       //automatically locked on another cache node
       assertLocked(cache2, key2);
-      
-      String key3="product";
+
+      String key3 = "product";
       String key4 = "org";
-      Map <String,String> newMap = new HashMap<String,String>();
+      Map<String, String> newMap = new HashMap<String, String>();
       newMap.put(key3, "Infinispan");
       newMap.put(key4, "JBoss");
       cache1.putAll(newMap);
-      
+
       //automatically locked on another cache node
       assertLocked(cache2, key3);
       assertLocked(cache2, key4);
-      
-            
+
+
       if (useCommit)
          mgr.commit();
       else

Modified: trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncReplLockingTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -21,28 +21,23 @@
  */
 package org.infinispan.replication;
 
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import javax.transaction.TransactionManager;
-
 import org.infinispan.Cache;
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 import org.testng.annotations.Test;
 
+import javax.transaction.TransactionManager;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Tests for lock API
- * 
- * Introduce lock() API methods
- * https://jira.jboss.org/jira/browse/ISPN-48
- * 
- * 
+ * <p/>
+ * Introduce lock() API methods https://jira.jboss.org/jira/browse/ISPN-48
+ *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  * @author <a href="mailto:vblagoje at redhat.com">Vladimir Blagojevic (vblagoje at redhat.com)</a>
  */
@@ -52,22 +47,21 @@
    String k = "key", v = "value";
 
    protected void createCacheManagers() throws Throwable {
-      Configuration replSync = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
+      Configuration replSync = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       replSync.setLockAcquisitionTimeout(500);
-      replSync.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       createClusteredCaches(2, "replSync", replSync);
 
       cache1 = manager(0).getCache("replSync");
       cache2 = manager(1).getCache("replSync");
    }
-   
+
    public void testLocksReleasedWithoutExplicitUnlock() throws Exception {
-      locksReleasedWithoutExplicitUnlockHelper(false,false);
-      locksReleasedWithoutExplicitUnlockHelper(true,false);
-      locksReleasedWithoutExplicitUnlockHelper(false,true);
-      locksReleasedWithoutExplicitUnlockHelper(true,true);
+      locksReleasedWithoutExplicitUnlockHelper(false, false);
+      locksReleasedWithoutExplicitUnlockHelper(true, false);
+      locksReleasedWithoutExplicitUnlockHelper(false, true);
+      locksReleasedWithoutExplicitUnlockHelper(true, true);
    }
-   
+
    public void testConcurrentNonTxLocking() throws Exception {
       concurrentLockingHelper(false, false);
       concurrentLockingHelper(true, false);
@@ -77,8 +71,8 @@
       concurrentLockingHelper(false, true);
       concurrentLockingHelper(true, true);
    }
-   
 
+
    public void testLocksReleasedWithNoMods() throws Exception {
       assertClusterSize("Should only be 2  caches in the cluster!!!", 2);
 
@@ -87,21 +81,21 @@
 
       TransactionManager mgr = TestingUtil.getTransactionManager(cache1);
       mgr.begin();
-      
+
       cache1.getAdvancedCache().lock(k);
-      
+
       //do a dummy read
       cache1.get(k);
       mgr.commit();
 
       assertNoLocks(cache1);
       assertNoLocks(cache2);
-      
+
       cleanup();
    }
- 
+
    private void concurrentLockingHelper(final boolean sameNode, final boolean useTx)
-            throws Exception {
+         throws Exception {
       assertClusterSize("Should only be 2  caches in the cluster!!!", 2);
 
       assertNull("Should be null", cache1.get(k));
@@ -112,7 +106,7 @@
          @Override
          public void run() {
             log.info("Concurrent " + (useTx ? "tx" : "non-tx") + " write started "
-                     + (sameNode ? "on same node..." : "on a different node..."));
+                  + (sameNode ? "on same node..." : "on a different node..."));
             TransactionManager mgr = null;
             try {
                if (useTx) {
@@ -156,7 +150,7 @@
    }
 
    private void locksReleasedWithoutExplicitUnlockHelper(boolean lockPriorToPut, boolean useCommit)
-            throws Exception {
+         throws Exception {
       assertClusterSize("Should only be 2  caches in the cluster!!!", 2);
 
       assertNull("Should be null", cache1.get(k));
@@ -187,7 +181,7 @@
       cache2.remove(k);
       cleanup();
    }
-   
+
    @SuppressWarnings("unchecked")
    protected void assertNoLocks(Cache cache) {
       /*
@@ -195,10 +189,10 @@
        * cache.keySet() is not implemented yet
        * LockManager lm = TestingUtil.extractLockManager(cache);
        * for (Object key : cache.keySet()) assert !lm.isLocked(key);
-       */      
+       */
    }
-   
-   protected void cleanup(){
+
+   protected void cleanup() {
       assert cache1.isEmpty();
       assert cache2.isEmpty();
       cache1.clear();

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -7,7 +7,6 @@
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.data.Address;
 import org.infinispan.test.data.Person;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 import org.testng.annotations.Test;
@@ -48,13 +47,10 @@
 
    protected void createCacheManagers() throws Throwable {
       // This impl only really sets up a configuration for use later.
-      config = new Configuration();
-      config.setCacheMode(Configuration.CacheMode.REPL_SYNC);
-      config.setSyncCommitPhase(true);
+      config = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       config.setSyncReplTimeout(30000);
       config.setFetchInMemoryState(true);
       config.setUseLockStriping(false); // reduces the odd chance of a key collision and deadlock
-      config.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
    }
 
    protected CacheManager createCacheManager() {

Modified: trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -10,6 +10,7 @@
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.remoting.ReplicationQueue;
 import org.infinispan.remoting.transport.Address;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 
@@ -108,10 +109,14 @@
    /**
     * When multiple test merhods operate on same cluster, sync commit and rollback are mandatory. This is in order to
     * make sure that an commit message will be dispatched in the same test method it was triggered and it will not
-    * interfere with further log messages.
+    * interfere with further log messages.  This is a non-transactional configuraion.
     */
    protected Configuration getDefaultClusteredConfig(Configuration.CacheMode mode) {
-      Configuration configuration = new Configuration();
+      return getDefaultClusteredConfig(mode, false);
+   }
+
+   protected Configuration getDefaultClusteredConfig(Configuration.CacheMode mode, boolean transactional) {
+      Configuration configuration = TestCacheManagerFactory.getDefaultConfiguration(transactional);
       configuration.setCacheMode(mode);
       configuration.setSyncCommitPhase(true);
       configuration.setSyncRollbackPhase(true);

Modified: trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -1,7 +1,9 @@
 package org.infinispan.test;
 
 import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
@@ -59,5 +61,9 @@
       if (cleanup == CleanupPhase.AFTER_TEST) super.clearContent(cacheManager);
    }
 
+   protected Configuration getDefaultStandaloneConfig(boolean transactional) {
+      return TestCacheManagerFactory.getDefaultConfiguration(transactional);
+   }
+
    protected abstract CacheManager createCacheManager() throws Exception;
 }

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -16,19 +16,33 @@
  * @author Galder Zamarreño
  */
 public class TestCacheManagerFactory {
-   
+
    public static final String MARSHALLER = System.getProperties().getProperty("infinispan.marshaller.class");
 
    /**
+    * Creates an cache manager that does not support clustering or transactions.
+    */
+   public static CacheManager createLocalCacheManager() {
+      return createLocalCacheManager(false);
+   }
+
+   /**
     * Creates an cache manager that does not support clustering.
+    *
+    * @param transactional if true, the cache manager will support transactions by default.
     */
-   public static CacheManager createLocalCacheManager() {
+   public static CacheManager createLocalCacheManager(boolean transactional) {
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getNonClusteredDefault();
       amendMarshaller(globalConfiguration);
-//      amendJmx(globalConfiguration);
-      return new DefaultCacheManager(globalConfiguration);
+      Configuration c = new Configuration();
+      if (transactional) amendJTA(c);
+      return new DefaultCacheManager(globalConfiguration, c);
    }
 
+   private static void amendJTA(Configuration c) {
+      c.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup());
+   }
+
    /**
     * Creates an cache manager that does support clustering.
     */
@@ -41,7 +55,7 @@
       globalConfiguration.setTransportProperties(newTransportProps);
       return new DefaultCacheManager(globalConfiguration);
    }
-   
+
    /**
     * Creates an cache manager that does support clustering with a given default cache configuration.
     */
@@ -68,12 +82,19 @@
 
    /**
     * Creates a local cache manager and ammends so that it won't conflict (e.g. jmx) with other managers whilst running
-    * tests in parallel.
+    * tests in parallel.  This is a non-transactional cache manager.
     */
    public static CacheManager createCacheManager(Configuration defaultCacheConfig) {
+      defaultCacheConfig.setTransactionManagerLookup(null);
+      defaultCacheConfig.setTransactionManagerLookupClass(null);
+      return createCacheManager(defaultCacheConfig, false);
+   }
+
+   public static CacheManager createCacheManager(Configuration defaultCacheConfig, boolean transactional) {
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getNonClusteredDefault();
       amendMarshaller(globalConfiguration);
 //      amendJmx(globalConfiguration);
+      if (transactional) amendJTA(defaultCacheConfig);
       return new DefaultCacheManager(globalConfiguration, defaultCacheConfig);
    }
 
@@ -96,7 +117,7 @@
          configuration.setTransportProperties(newTransportProps);
       }
    }
-   
+
    private static void amendMarshaller(GlobalConfiguration configuration) {
       if (MARSHALLER != null) {
          try {
@@ -107,4 +128,10 @@
          }
       }
    }
+
+   public static Configuration getDefaultConfiguration(boolean transactional) {
+      Configuration c = new Configuration();
+      if (transactional) amendJTA(c);
+      return c;
+   }
 }

Added: trunk/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java	                        (rev 0)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -0,0 +1,130 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.infinispan.test.fwk;
+
+import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup;
+
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+
+/**
+ * A simple abstraction for transaction manager interaction
+ *
+ * @author Jason T. Greene
+ */
+public class TransactionSetup {
+   private interface Operations {
+      UserTransaction getUserTransaction();
+
+      String getLookup();
+
+      void cleanup();
+
+      TransactionManager getManager();
+   }
+
+   public static final String JTA = System.getProperty("infinispan.tm");
+   public static final String JBOSS_TM = "jbosstm";
+
+   private static Operations operations;
+
+   static {
+      init();
+   }
+
+   private static void init() {
+      String property = JTA;
+      if (JBOSS_TM.equalsIgnoreCase(property)) {
+         final String lookup = JBossStandaloneJTAManagerLookup.class.getName();
+         final JBossStandaloneJTAManagerLookup instance = new JBossStandaloneJTAManagerLookup();
+         operations = new Operations() {
+            public UserTransaction getUserTransaction() {
+               try {
+                  return instance.getUserTransaction();
+               }
+               catch (Exception e) {
+                  throw new RuntimeException(e);
+               }
+            }
+
+            public void cleanup() {
+            }
+
+            public String getLookup() {
+               return lookup;
+            }
+
+            public TransactionManager getManager() {
+               try {
+                  return instance.getTransactionManager();
+               }
+               catch (Exception e) {
+                  throw new RuntimeException(e);
+               }
+            }
+         };
+      } else {
+         final String lookup = DummyTransactionManagerLookup.class.getName();
+         final DummyTransactionManagerLookup instance = new DummyTransactionManagerLookup();
+         operations = new Operations() {
+            public UserTransaction getUserTransaction() {
+               return instance.getUserTransaction();
+            }
+
+            public void cleanup() {
+               instance.cleanup();
+            }
+
+            public String getLookup() {
+               return lookup;
+            }
+
+            public TransactionManager getManager() {
+               try {
+                  return instance.getTransactionManager();
+               }
+               catch (Exception e) {
+                  throw new RuntimeException(e);
+               }
+
+            }
+         };
+      }
+   }
+
+   public static TransactionManager getManager() {
+      return operations.getManager();
+   }
+
+   public static String getManagerLookup() {
+      return operations.getLookup();
+   }
+
+   public static UserTransaction getUserTransaction() {
+      return operations.getUserTransaction();
+   }
+
+   public static void cleanup() {
+      operations.cleanup();
+   }
+}
\ No newline at end of file


Property changes on: trunk/core/src/test/java/org/infinispan/test/fwk/TransactionSetup.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/AsyncDeadlockDetectionTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -9,7 +9,6 @@
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.PerCacheExecutorThread;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.transaction.xa.TransactionTable;
 import org.infinispan.util.concurrent.locks.DeadlockDetectedException;
 import org.infinispan.util.concurrent.locks.DeadlockDetectingLockManager;
@@ -37,9 +36,7 @@
 
 
    protected void createCacheManagers() throws Throwable {
-      System.out.println("AsyncDeadlockDetectionTest.createCacheManagers");
-      Configuration config = getDefaultClusteredConfig(Configuration.CacheMode.REPL_ASYNC);
-      config.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration config = getDefaultClusteredConfig(Configuration.CacheMode.REPL_ASYNC, true);
       config.setEnableDeadlockDetection(true);
       config.setSyncCommitPhase(true);
       config.setSyncRollbackPhase(true);
@@ -76,7 +73,7 @@
       t1.stopThread();
       ((DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache0)).resetStatistics();
       ((DeadlockDetectingLockManager) TestingUtil.extractLockManager(cache1)).resetStatistics();
-      remoteReplicationInterceptor.executionResponse = null; 
+      remoteReplicationInterceptor.executionResponse = null;
    }
 
    public void testRemoteTxVsLocal() throws Exception {
@@ -124,7 +121,7 @@
       TransactionTable transactionTable0 = TestingUtil.extractComponent(cache0, TransactionTable.class);
       assertEquals(transactionTable0.getLocalTxCount(), 0);
       for (int i = 0; i < 20; i++) {
-         if (! (transactionTable0.getRemoteTxCount() == 0)) Thread.sleep(50);
+         if (!(transactionTable0.getRemoteTxCount() == 0)) Thread.sleep(50);
       }
 
       assertEquals(transactionTable0.getRemoteTxCount(), 0);
@@ -132,20 +129,20 @@
       TransactionTable transactionTable1 = TestingUtil.extractComponent(cache1, TransactionTable.class);
       assertEquals(transactionTable1.getLocalTxCount(), 0);
       for (int i = 0; i < 20; i++) {
-         if (! (transactionTable1.getRemoteTxCount() == 0)) Thread.sleep(50);
+         if (!(transactionTable1.getRemoteTxCount() == 0)) Thread.sleep(50);
       }
       assertEquals(transactionTable1.getRemoteTxCount(), 0);
 
       if (t1Response instanceof DeadlockDetectedException) {
          assertEquals(cache0.get("k1"), "v1_t0");
          assertEquals(cache0.get("k2"), "v2_t0");
-         assertEquals(cache1.get("k1"),"v1_t0");
-         assertEquals(cache1.get("k2"),"v2_t0");
+         assertEquals(cache1.get("k1"), "v1_t0");
+         assertEquals(cache1.get("k2"), "v2_t0");
       } else {
          assertEquals(cache0.get("k1"), "v1_t1");
          assertEquals(cache0.get("k2"), "v2_t1");
-         assertEquals(cache1.get("k1"),"v1_t1");
-         assertEquals(cache1.get("k2"),"v2_t1");
+         assertEquals(cache1.get("k1"), "v1_t1");
+         assertEquals(cache1.get("k2"), "v2_t1");
       }
    }
 

Modified: trunk/core/src/test/java/org/infinispan/tx/LocalDeadlockDetectionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/LocalDeadlockDetectionTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/LocalDeadlockDetectionTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -6,7 +6,6 @@
 import org.infinispan.test.SingleCacheManagerTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.locks.DeadlockDetectedException;
 import org.infinispan.util.concurrent.locks.DeadlockDetectingLockManager;
 import static org.testng.Assert.assertEquals;
@@ -32,8 +31,7 @@
 
    protected CacheManager createCacheManager() throws Exception {
       cacheManager = TestCacheManagerFactory.createLocalCacheManager();
-      Configuration configuration = new Configuration();
-      configuration.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration configuration = getDefaultStandaloneConfig(true);
       configuration.setEnableDeadlockDetection(true);
       configuration.setUseLockStriping(false);
       configuration.setExposeJmxStatistics(true);
@@ -60,7 +58,7 @@
 
    public void testDldPutAndPut() {
       testLocalVsLocalTxDeadlock(PerCacheExecutorThread.Operations.PUT_KEY_VALUE,
-                                 PerCacheExecutorThread.Operations.PUT_KEY_VALUE );
+                                 PerCacheExecutorThread.Operations.PUT_KEY_VALUE);
       if (response1 instanceof Exception) {
          assertEquals("value_1_t2", cache.get("k1"));
          assertEquals("value_2_t2", cache.get("k2"));
@@ -72,7 +70,7 @@
 
    public void testDldPutAndRemove() {
       testLocalVsLocalTxDeadlock(PerCacheExecutorThread.Operations.PUT_KEY_VALUE,
-                                 PerCacheExecutorThread.Operations.REMOVE_KEY );
+                                 PerCacheExecutorThread.Operations.REMOVE_KEY);
       if (response1 instanceof Exception) {
          assertEquals(cache.get("k1"), null);
          assertEquals("value_2_t2", cache.get("k2"));
@@ -84,7 +82,7 @@
 
    public void testDldRemoveAndPut() {
       testLocalVsLocalTxDeadlock(PerCacheExecutorThread.Operations.REMOVE_KEY,
-                                 PerCacheExecutorThread.Operations.PUT_KEY_VALUE );
+                                 PerCacheExecutorThread.Operations.PUT_KEY_VALUE);
       if (response1 instanceof Exception) {
          System.out.println("t1 failure");
          assertEquals(cache.get("k1"), "value_1_t2");
@@ -98,7 +96,7 @@
 
    public void testDldRemoveAndRemove() {
       testLocalVsLocalTxDeadlock(PerCacheExecutorThread.Operations.REMOVE_KEY,
-                                 PerCacheExecutorThread.Operations.REMOVE_KEY );
+                                 PerCacheExecutorThread.Operations.REMOVE_KEY);
       if (response1 instanceof Exception) {
          System.out.println("t1 failure");
          assertEquals(cache.get("k1"), null);

Modified: trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -22,12 +22,10 @@
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
 import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;
@@ -39,11 +37,8 @@
    Cache c;
 
    protected CacheManager createCacheManager() {
-      Configuration cfg = new Configuration();
-      cfg.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
-      CacheManager cm = TestCacheManagerFactory.createLocalCacheManager();
-      cm.defineConfiguration("test", cfg);
-      c = cm.getCache("test");
+      CacheManager cm = TestCacheManagerFactory.createLocalCacheManager(true);
+      c = cm.getCache();
       return cm;
    }
 

Modified: trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -1,11 +1,10 @@
 package org.infinispan.tx;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.SingleCacheManagerTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import javax.transaction.RollbackException;
@@ -15,9 +14,7 @@
 public class MarkAsRollbackTest extends SingleCacheManagerTest {
 
    protected CacheManager createCacheManager() throws Exception {
-      Configuration c = new Configuration();
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(c);
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(new Configuration(), true);
       cache = cm.getCache();
       return cm;
    }

Modified: trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/ReplDeadlockDetectionTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -17,7 +17,6 @@
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.PerCacheExecutorThread;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.util.concurrent.NotifyingNotifiableFuture;
 import org.infinispan.util.concurrent.locks.DeadlockDetectingLockManager;
 import org.infinispan.util.concurrent.locks.LockManager;
@@ -48,8 +47,7 @@
    protected Configuration.CacheMode cacheMode = Configuration.CacheMode.REPL_SYNC;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration config = getDefaultClusteredConfig(cacheMode);
-      config.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration config = getDefaultClusteredConfig(cacheMode, true);
       config.setEnableDeadlockDetection(true);
       config.setSyncCommitPhase(true);
       config.setSyncRollbackPhase(true);

Modified: trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -1,12 +1,11 @@
 package org.infinispan.tx;
 
 import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.SingleCacheManagerTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;
@@ -16,9 +15,7 @@
 public class TransactionsSpanningCaches extends SingleCacheManagerTest {
 
    protected CacheManager createCacheManager() throws Exception {
-      Configuration c = new Configuration();
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(c);
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(new Configuration(), true);
       cm.defineConfiguration("c1", c);
       cm.defineConfiguration("c2", c);
       return cm;

Modified: trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -5,7 +5,6 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;
@@ -25,8 +24,7 @@
       cm1 = addClusterEnabledCacheManager();
       cm2 = addClusterEnabledCacheManager();
 
-      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
 
       defineConfigurationOnAllManagers("c1", c);
       defineConfigurationOnAllManagers("c2", c);

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/parent/pom.xml	2009-08-24 15:46:28 UTC (rev 722)
@@ -103,6 +103,24 @@
          <scope>test</scope>
       </dependency>
       <dependency>
+         <groupId>jboss.jbossts</groupId>
+         <artifactId>jbossjts</artifactId>
+         <version>4.6.1.GA</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>jboss.jbossts</groupId>
+         <artifactId>jbossts-common</artifactId>
+         <version>4.6.1.GA</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>commons-logging</groupId>
+         <artifactId>commons-logging</artifactId>
+         <version>1.1.1</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
          <groupId>javax.xml.bind</groupId>
          <artifactId>jaxb-api</artifactId>
          <version>2.1</version>

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -1,10 +1,9 @@
 package org.infinispan.api.tree;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.config.Configuration;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.infinispan.tree.Fqn;
 import org.infinispan.tree.Node;
 import org.infinispan.tree.TreeCache;
@@ -37,9 +36,8 @@
    public void setUp() throws Exception {
       // start a single cache instance
       Configuration c = new Configuration();
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       c.setInvocationBatchingEnabled(true);
-      CacheManager cm = TestCacheManagerFactory.createCacheManager(c);
+      CacheManager cm = TestCacheManagerFactory.createCacheManager(c, true);
       cache = new TreeCacheImpl(cm.getCache());
       tm = TestingUtil.getTransactionManager(cache.getCache());
    }

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -10,7 +10,6 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.tree.Fqn;
 import org.infinispan.tree.Node;
 import org.infinispan.tree.TreeCache;
@@ -32,9 +31,8 @@
    TransactionManager tm1;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC);
+      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       c.setInvocationBatchingEnabled(true);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
 
       createClusteredCaches(2, "replSync", c);
 

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -11,7 +11,6 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.infinispan.tree.Fqn;
 import org.infinispan.tree.Node;
 import org.infinispan.tree.TreeCache;
@@ -34,13 +33,8 @@
    TreeCache<Object, Object> cache1, cache2;
 
    protected void createCacheManagers() throws Throwable {
-      Configuration c = new Configuration();
-      c.setCacheMode(Configuration.CacheMode.REPL_SYNC);
-      c.setFetchInMemoryState(false);
+      Configuration c = getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC, true);
       c.setInvocationBatchingEnabled(true);
-      c.setSyncCommitPhase(true);
-      c.setSyncRollbackPhase(true);
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
 
       createClusteredCaches(2, "replSync", c);
 

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java	2009-08-21 15:07:56 UTC (rev 721)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java	2009-08-24 15:46:28 UTC (rev 722)
@@ -7,7 +7,7 @@
 import org.infinispan.manager.CacheManager;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TransactionSetup;
 import org.infinispan.tree.Fqn;
 import org.infinispan.tree.Node;
 import org.infinispan.tree.NodeKey;
@@ -40,7 +40,7 @@
    public void setUp() throws Exception {
       // start a single cache instance
       Configuration c = new Configuration();
-      c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
+      c.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup());
       c.setInvocationBatchingEnabled(true);
       CacheManager cm = TestCacheManagerFactory.createCacheManager(c);