[jboss-cvs] JBossAS SVN: r60539 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 14 10:34:17 EST 2007
Author: bstansberry at jboss.com
Date: 2007-02-14 10:34:17 -0500 (Wed, 14 Feb 2007)
New Revision: 60539
Modified:
branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java
Log:
[JBAS-4097] Ensure we don't bind DummyTransactionManager in JNDI
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-02-14 15:22:52 UTC (rev 60538)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/TreeCacheSSOClusterManagerUnitTestCase.java 2007-02-14 15:34:17 UTC (rev 60539)
@@ -28,6 +28,7 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
+import javax.transaction.TransactionManager;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
@@ -35,7 +36,10 @@
import org.apache.catalina.session.StandardSession;
import org.jboss.cache.AbstractTreeCacheListener;
import org.jboss.cache.Fqn;
+import org.jboss.cache.TransactionManagerLookup;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.transaction.BatchModeTransactionManager;
+import org.jboss.cache.transaction.DummyTransactionManager;
import org.jboss.security.SimplePrincipal;
import org.jboss.test.JBossTestCase;
import org.jboss.util.threadpool.BasicThreadPool;
@@ -90,7 +94,10 @@
{
// Register a cache
MockTreeCache cache = new MockTreeCache();
- cache.setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
+ // JBAS-4097 -- don't use a TransactionManagerLookup that will
+ // bind DummyTransactionManager into JNDI, as that will screw
+ // up other tests
+ cache.setTransactionManagerLookup(new MockTransactionManagerLookup());
mbeanServer.registerMBean(cache, new ObjectName(TreeCacheSSOClusterManager.DEFAULT_GLOBAL_CACHE_NAME));
cache.startService();
@@ -300,5 +307,14 @@
return ourId;
}
}
+
+ static class MockTransactionManagerLookup implements TransactionManagerLookup
+ {
+ public TransactionManager getTransactionManager() throws Exception
+ {
+ return new BatchModeTransactionManager();
+ }
+
+ }
}
More information about the jboss-cvs-commits
mailing list