Diff
Modified: branches/v2_0/openejb2/modules/core/src/test/org/openejb/slsb/StatelessInstanceInterceptorTest.java (2439 => 2440)
--- branches/v2_0/openejb2/modules/core/src/test/org/openejb/slsb/StatelessInstanceInterceptorTest.java 2006-02-11 07:01:19 UTC (rev 2439)
+++ branches/v2_0/openejb2/modules/core/src/test/org/openejb/slsb/StatelessInstanceInterceptorTest.java 2006-02-12 04:05:34 UTC (rev 2440)
@@ -58,6 +58,8 @@
import org.apache.geronimo.core.service.InvocationResult;
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+
import junit.framework.TestCase;
import org.openejb.cache.InstancePool;
@@ -128,7 +130,8 @@
protected void setUp() throws Exception {
super.setUp();
- transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
mockEJB = new MockEJB();
pool = new MockPool(mockEJB);
Modified: branches/v2_0/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java (2439 => 2440)
--- branches/v2_0/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java 2006-02-11 07:01:19 UTC (rev 2439)
+++ branches/v2_0/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java 2006-02-12 04:05:34 UTC (rev 2440)
@@ -69,9 +69,16 @@
import org.apache.geronimo.timer.vm.VMWorkerPersistence;
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.core.service.Invocation;
import org.openejb.EJBInterfaceType;
import org.openejb.EJBInvocation;
import org.openejb.EJBInvocationImpl;
+import org.openejb.dispatch.VirtualOperation;
+import org.openejb.dispatch.InterfaceMethodSignature;
+import org.openejb.security.PermissionManager;
+import org.openejb.transaction.TransactionPolicyManager;
/**
*
@@ -103,7 +110,8 @@
private Serializable userKey = "test user info";
protected void setUp() throws Exception {
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
executableWorkFactory = new TransactionalExecutorTaskFactory(transactionContextManager, 1);
threadPool = new ThreadPool(5, "TestPool", 10000, this.getClass().getClassLoader(), "test:type=ThreadPool");
Modified: branches/v2_0/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java (2439 => 2440)
--- branches/v2_0/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-02-11 07:01:19 UTC (rev 2439)
+++ branches/v2_0/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-02-12 04:05:34 UTC (rev 2440)
@@ -81,6 +81,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManagerGBean;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
import org.apache.geronimo.transaction.manager.TransactionManagerImplGBean;
+import org.apache.geronimo.transaction.manager.XidFactoryImplGBean;
import org.openejb.deployment.mdb.mockra.MockActivationSpec;
import org.openejb.deployment.mdb.mockra.MockResourceAdapter;
@@ -99,6 +100,7 @@
//type is random to look for problems.
private static final J2eeContext raContext = new J2eeContextImpl(j2eeDomainName, j2eeServerName, appName, NameFactory.RESOURCE_ADAPTER_MODULE, moduleName, "xxx", NameFactory.JCA_WORK_MANAGER);
public static final ObjectName CONTAINER_NAME = JMXUtil.getObjectName("geronimo.test:ejb=Mock");
+ public static final ObjectName XIDFACTORY_NAME = JMXUtil.getObjectName(j2eeDomainName + ":type=" + NameFactory.XID_FACTORY);
public static final ObjectName TRANSACTIONMANAGER_NAME = JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionManager");
public static final ObjectName TRANSACTIONCONTEXTMANAGER_NAME = JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionContextManager");
public static final ObjectName TRACKEDCONNECTIONASSOCIATOR_NAME = JMXUtil.getObjectName("geronimo.test:role=TrackedConnectionAssociator");
@@ -125,10 +127,15 @@
public static Kernel setUpKernelWithTransactionManager() throws Exception {
Kernel kernel = KernelHelper.getPreparedKernel();
+ GBeanData xidFacGBean = new GBeanData(XIDFACTORY_NAME, XidFactoryImplGBean.GBEAN_INFO);
+ xidFacGBean.setAttribute("tmId", "WHAT DO WE CALL IT?".getBytes());
+ start(kernel, xidFacGBean);
+
GBeanData tmGBean = new GBeanData(TRANSACTIONMANAGER_NAME, TransactionManagerImplGBean.GBEAN_INFO);
Set rmpatterns = new HashSet();
rmpatterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*"));
tmGBean.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10));
+ tmGBean.setReferencePattern("XidFactory", XIDFACTORY_NAME);
tmGBean.setReferencePatterns("ResourceManagers", rmpatterns);
start(kernel, tmGBean);
