geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r427273 [3/6] - in /geronimo/branches/dain/notcm: applications/magicGball/magicGball-ear/src/plan/ applications/magicGball/src/plan/ configs/client-corba/src/plan/ configs/client-deployer/src/plan/ configs/client/src/plan/ configs/j2ee-corb...
Date Mon, 31 Jul 2006 21:08:24 GMT
Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/BootstrapContextTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/BootstrapContextTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/BootstrapContextTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/BootstrapContextTest.java Mon Jul 31 14:08:15 2006
@@ -23,11 +23,11 @@
 
 import junit.framework.TestCase;
 import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.pool.ThreadPool;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 
 /**
- * Unit tests for {@link BootstrapContextImpl}
+ * Unit tests for {@link GeronimoBootstrapContext}
  * @version $Rev$ $Date$
  */
 public class BootstrapContextTest extends TestCase {
@@ -40,10 +40,10 @@
     /**
      * Tests get and set work manager
      */
-    public void testGetSetWorkManager() {
-        TransactionContextManager transactionContextManager = new TransactionContextManager();
-        GeronimoWorkManager manager = new GeronimoWorkManager(pool, pool, pool, transactionContextManager);
-        BootstrapContextImpl context = new BootstrapContextImpl(manager);
+    public void testGetSetWorkManager() throws Exception {
+        GeronimoTransactionManager transactionManager = new GeronimoTransactionManager();
+        GeronimoWorkManager manager = new GeronimoWorkManager(pool, pool, pool, transactionManager);
+        GeronimoBootstrapContext context = new GeronimoBootstrapContext(manager, transactionManager);
         WorkManager wm = context.getWorkManager();
 
         assertSame("Make sure it is the same object", manager, wm);
@@ -52,20 +52,20 @@
     /**
      * Tests get and set XATerminator
      */
-    public void testGetSetXATerminator() {
-        TransactionContextManager transactionContextManager = new TransactionContextManager();
-        GeronimoWorkManager manager = new GeronimoWorkManager(pool, pool, pool, transactionContextManager);
-        BootstrapContextImpl context = new BootstrapContextImpl(manager);
+    public void testGetSetXATerminator() throws Exception {
+        GeronimoTransactionManager transactionManager = new GeronimoTransactionManager();
+        GeronimoWorkManager manager = new GeronimoWorkManager(pool, pool, pool, transactionManager);
+        GeronimoBootstrapContext context = new GeronimoBootstrapContext(manager, transactionManager);
         XATerminator xat = context.getXATerminator();
 
-        assertSame("Make sure it is the same object", transactionContextManager, xat);
+        assertSame("Make sure it is the same object", transactionManager, xat);
     }
 
     /**
      * Tests getTimer
      */
     public void testGetTimer() throws Exception {
-        BootstrapContextImpl context = new BootstrapContextImpl(null);
+        GeronimoBootstrapContext context = new GeronimoBootstrapContext(null, null);
         Timer t = context.createTimer();
         assertNotNull("Object is not null", t);
     }

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java Mon Jul 31 14:08:15 2006
@@ -19,7 +19,7 @@
 
 import java.util.HashSet;
 
-import org.apache.geronimo.transaction.DefaultInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.Log;
 
@@ -46,9 +46,8 @@
     private Exception e = null;
 
     public void testNoTransactionCallOneThread() throws Throwable {
-        transactionContextManager.newUnspecifiedTransactionContext();
         for (int i = 0; i < repeatCount; i++) {
-            defaultComponentInterceptor.invoke(defaultComponentContext);
+            defaultComponentInterceptor.invoke(connectorInstanceContext);
         }
     }
 
@@ -58,7 +57,6 @@
         for (int t = 0; t < threadCount; t++) {
             new Thread() {
                 public void run() {
-                    transactionContextManager.newUnspecifiedTransactionContext();
                     long localStartTime = 0;
                     int localSlowCount = 0;
                     try {
@@ -73,7 +71,7 @@
                         for (int i = 0; i < repeatCount; i++) {
                             try {
                                 long start = System.currentTimeMillis();
-                                defaultComponentInterceptor.invoke(new DefaultInstanceContext(new HashSet(), new HashSet()));
+                                defaultComponentInterceptor.invoke(new ConnectorInstanceContextImpl(new HashSet(), new HashSet()));
                                 long duration = System.currentTimeMillis() - start;
                                 if (duration > 100) {
                                     localSlowCount++;

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTest.java Mon Jul 31 14:08:15 2006
@@ -20,9 +20,8 @@
 import org.apache.geronimo.connector.mock.MockConnection;
 import org.apache.geronimo.connector.mock.MockXAResource;
 import org.apache.geronimo.connector.outbound.connectiontracking.DefaultInterceptor;
-import org.apache.geronimo.transaction.InstanceContext;
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.UserTransactionImpl;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.transaction.GeronimoUserTransaction;
 
 /**
  *
@@ -34,40 +33,39 @@
 
 
     public void testSingleTransactionCall() throws Throwable {
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
-        defaultComponentInterceptor.invoke(defaultComponentContext);
+        transactionManager.begin();
+        defaultComponentInterceptor.invoke(connectorInstanceContext);
         MockXAResource mockXAResource = (MockXAResource) mockManagedConnection.getXAResource();
         assertEquals("XAResource should know one xid", 1, mockXAResource.getKnownXids().size());
         assertNull("Should not be committed", mockXAResource.getCommitted());
-        transactionContext.commit();
+        transactionManager.commit();
         assertNotNull("Should be committed", mockXAResource.getCommitted());
     }
 
     public void testNoTransactionCall() throws Throwable {
-        transactionContextManager.newUnspecifiedTransactionContext();
-        defaultComponentInterceptor.invoke(defaultComponentContext);
+        defaultComponentInterceptor.invoke(connectorInstanceContext);
         MockXAResource mockXAResource = (MockXAResource) mockManagedConnection.getXAResource();
         assertEquals("XAResource should know 0 xid", 0, mockXAResource.getKnownXids().size());
         assertNull("Should not be committed", mockXAResource.getCommitted());
     }
 
     public void testOneTransactionTwoCalls() throws Throwable {
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
-        defaultComponentInterceptor.invoke(defaultComponentContext);
+        transactionManager.begin();
+        defaultComponentInterceptor.invoke(connectorInstanceContext);
         MockXAResource mockXAResource = (MockXAResource) mockManagedConnection.getXAResource();
         assertEquals("XAResource should know one xid", 1, mockXAResource.getKnownXids().size());
         assertNull("Should not be committed", mockXAResource.getCommitted());
-        defaultComponentInterceptor.invoke(defaultComponentContext);
+        defaultComponentInterceptor.invoke(connectorInstanceContext);
         assertEquals("Expected same XAResource", mockXAResource, mockManagedConnection.getXAResource());
         assertEquals("XAResource should know one xid", 1, mockXAResource.getKnownXids().size());
         assertNull("Should not be committed", mockXAResource.getCommitted());
-        transactionContext.commit();
+        transactionManager.commit();
         assertNotNull("Should be committed", mockXAResource.getCommitted());
     }
 
     public void testUserTransactionEnlistingExistingConnections() throws Throwable {
         mockComponent = new DefaultInterceptor() {
-            public Object invoke(InstanceContext newInstanceContext) throws Throwable {
+            public Object invoke(ConnectorInstanceContext newConnectorInstanceContext) throws Throwable {
                 MockConnection mockConnection = (MockConnection) connectionFactory.getConnection();
                 mockManagedConnection = mockConnection.getManagedConnection();
                 userTransaction.begin();
@@ -80,11 +78,8 @@
                 return null;
             }
         };
-        transactionContextManager.newUnspecifiedTransactionContext();
-        userTransaction = new UserTransactionImpl();
-        userTransaction.setUp(transactionContextManager, connectionTrackingCoordinator);
-        userTransaction.setOnline(true);
-        defaultComponentInterceptor.invoke(defaultComponentContext);
+        userTransaction = new GeronimoUserTransaction(transactionManager);
+        defaultComponentInterceptor.invoke(connectorInstanceContext);
         MockXAResource mockXAResource = (MockXAResource) mockManagedConnection.getXAResource();
         assertEquals("XAResource should know 1 xid", 1, mockXAResource.getKnownXids().size());
         assertNotNull("Should be committed", mockXAResource.getCommitted());
@@ -100,7 +95,7 @@
     public void testUnshareableConnections() throws Throwable {
         unshareableResources.add(name);
         mockComponent = new DefaultInterceptor() {
-            public Object invoke(InstanceContext newInstanceContext) throws Throwable {
+            public Object invoke(ConnectorInstanceContext newConnectorInstanceContext) throws Throwable {
                 MockConnection mockConnection1 = (MockConnection) connectionFactory.getConnection();
                 mockManagedConnection = mockConnection1.getManagedConnection();
                 MockConnection mockConnection2 = (MockConnection) connectionFactory.getConnection();
@@ -116,12 +111,12 @@
             }
 
         };
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
-        defaultComponentInterceptor.invoke(defaultComponentContext);
+        transactionManager.begin();
+        defaultComponentInterceptor.invoke(connectorInstanceContext);
         MockXAResource mockXAResource = (MockXAResource) mockManagedConnection.getXAResource();
         assertEquals("XAResource should know one xid", 1, mockXAResource.getKnownXids().size());
         assertNull("Should not be committed", mockXAResource.getCommitted());
-        transactionContext.commit();
+        transactionManager.commit();
         assertNotNull("Should be committed", mockXAResource.getCommitted());
     }
 }

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java Mon Jul 31 14:08:15 2006
@@ -20,6 +20,8 @@
 import java.util.HashSet;
 import java.util.Set;
 import javax.security.auth.Subject;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.connector.mock.MockConnection;
@@ -34,12 +36,10 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.DefaultComponentInterceptor;
 import org.apache.geronimo.connector.outbound.connectiontracking.DefaultInterceptor;
 import org.apache.geronimo.security.ContextManager;
-import org.apache.geronimo.transaction.DefaultInstanceContext;
-import org.apache.geronimo.transaction.InstanceContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.context.UserTransactionImpl;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -64,23 +64,23 @@
     protected String name = "testCF";
     //dependencies
     protected ConnectionTrackingCoordinator connectionTrackingCoordinator;
-    protected TransactionContextManager transactionContextManager;
+    protected TransactionManager transactionManager;
     protected AbstractConnectionManager connectionManagerDeployment;
     protected MockConnectionFactory connectionFactory;
     protected MockManagedConnectionFactory mockManagedConnectionFactory;
-    protected DefaultInstanceContext defaultComponentContext;
+    protected ConnectorInstanceContextImpl connectorInstanceContext;
     protected DefaultComponentInterceptor defaultComponentInterceptor;
     protected Set unshareableResources = new HashSet();
     protected Set applicationManagedSecurityResources = new HashSet();
     protected MockManagedConnection mockManagedConnection;
     protected Subject subject;
-    protected UserTransactionImpl userTransaction;
+    protected UserTransaction userTransaction;
     protected TransactionSupport transactionSupport = new XATransactions(useTransactionCaching, useThreadCaching);
     protected PoolingSupport poolingSupport = new PartitionedPool(maxSize, minSize, blockingTimeout, idleTimeoutMinutes, matchOne, matchAll, selectOneNoMatch, useConnectionRequestInfo, useSubject);
     protected boolean containerManagedSecurity = true;
 
     protected DefaultInterceptor mockComponent = new DefaultInterceptor() {
-        public Object invoke(InstanceContext newInstanceContext) throws Throwable {
+        public Object invoke(ConnectorInstanceContext newConnectorInstanceContext) throws Throwable {
             MockConnection mockConnection = (MockConnection) connectionFactory.getConnection();
             mockManagedConnection = mockConnection.getManagedConnection();
             mockConnection.close();
@@ -90,10 +90,12 @@
     private ClassLoader classLoader = this.getClass().getClassLoader();
 
     protected void setUp() throws Exception {
+        TransactionManagerImpl transactionManager = new TransactionManagerImpl();
+        this.transactionManager = transactionManager;
+
         connectionTrackingCoordinator = new ConnectionTrackingCoordinator();
-        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
-        transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
+        transactionManager.addTransactionAssociationListener(new GeronimoTransactionListener(connectionTrackingCoordinator));
+        
         mockManagedConnectionFactory = new MockManagedConnectionFactory();
         subject = new Subject();
         ContextManager.setCurrentCaller(subject);
@@ -102,24 +104,24 @@
                 poolingSupport,
                 containerManagedSecurity,
                 connectionTrackingCoordinator,
-                transactionContextManager,
+                this.transactionManager,
                 name,
                 classLoader);
         connectionFactory = (MockConnectionFactory) connectionManagerDeployment.createConnectionFactory(mockManagedConnectionFactory);
-        defaultComponentContext = new DefaultInstanceContext(unshareableResources, applicationManagedSecurityResources);
-        defaultComponentInterceptor = new DefaultComponentInterceptor(this, connectionTrackingCoordinator, transactionContextManager);
+        connectorInstanceContext = new ConnectorInstanceContextImpl(unshareableResources, applicationManagedSecurityResources);
+        defaultComponentInterceptor = new DefaultComponentInterceptor(this, connectionTrackingCoordinator);
     }
 
     protected void tearDown() throws Exception {
         connectionTrackingCoordinator = null;
-        transactionContextManager = null;
+        transactionManager = null;
         mockManagedConnectionFactory = null;
         connectionManagerDeployment = null;
         connectionFactory = null;
-        defaultComponentContext = null;
+        connectorInstanceContext = null;
     }
 
-    public Object invoke(InstanceContext newInstanceContext) throws Throwable {
-        return mockComponent.invoke(newInstanceContext);
+    public Object invoke(ConnectorInstanceContext newConnectorInstanceContext) throws Throwable {
+        return mockComponent.invoke(newConnectorInstanceContext);
     }
 }

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java Mon Jul 31 14:08:15 2006
@@ -44,7 +44,7 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
- * @version $Rev: 386505 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ManagedConnectionFactoryWrapperTest extends TestCase {
 

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/PoolResizeTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/PoolResizeTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/PoolResizeTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/PoolResizeTest.java Mon Jul 31 14:08:15 2006
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 
 /**
- * @version $Rev:  $ $Date$
+ * @version $Rev$ $Date$
  */
 public class PoolResizeTest extends TestCase {
 

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java Mon Jul 31 14:08:15 2006
@@ -18,11 +18,12 @@
 package org.apache.geronimo.connector.outbound;
 
 import javax.resource.ResourceException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.Status;
 
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.context.TransactionContext;
+import org.apache.geronimo.connector.ConnectorTransactionContext;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 
 /**
  *
@@ -31,35 +32,30 @@
  *
  * */
 public class TransactionCachingInterceptorTest extends ConnectionInterceptorTestUtils {
-
-    private TransactionManagerImpl transactionManager;
-    private TransactionContextManager transactionContextManager;
+    private TransactionManager transactionManager;
     private TransactionCachingInterceptor transactionCachingInterceptor;
 
     protected void setUp() throws Exception {
         super.setUp();
-        transactionManager = new TransactionManagerImpl(10 * 1000, 
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
-        transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
-        transactionCachingInterceptor = new TransactionCachingInterceptor(this, transactionContextManager);
+        transactionManager = new TransactionManagerImpl();
+        transactionCachingInterceptor = new TransactionCachingInterceptor(this, transactionManager);
     }
 
     protected void tearDown() throws Exception {
         super.tearDown();
         transactionManager = null;
-        transactionContextManager = null;
         transactionCachingInterceptor = null;
     }
 
     public void testGetConnectionInTransaction() throws Exception {
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+        transactionManager.begin();
         ConnectionInfo connectionInfo1 = makeConnectionInfo();
         transactionCachingInterceptor.getConnection(connectionInfo1);
         assertTrue("Expected to get an initial connection", obtainedConnectionInfo != null);
         assertTrue("Expected nothing returned yet", returnedConnectionInfo == null);
         assertTrue("Expected the same ManagedConnectionInfo in the TransactionContext as was returned",
                 connectionInfo1.getManagedConnectionInfo()
-                == getSharedManagedConnectionInfo(transactionContext));
+                == getSharedManagedConnectionInfo(transactionManager.getTransaction()));
         obtainedConnectionInfo = null;
         ConnectionInfo connectionInfo2 = new ConnectionInfo();
         transactionCachingInterceptor.getConnection(connectionInfo2);
@@ -68,26 +64,24 @@
         assertTrue("Expected the same ManagedConnectionInfo in both ConnectionInfos",
                 connectionInfo1.getManagedConnectionInfo() == connectionInfo2.getManagedConnectionInfo());
         assertTrue("Expected the same ManagedConnectionInfo in the TransactionContext as was returned",
-                connectionInfo1.getManagedConnectionInfo() == getSharedManagedConnectionInfo(transactionContext));
+                connectionInfo1.getManagedConnectionInfo() == getSharedManagedConnectionInfo(transactionManager.getTransaction()));
         //commit, see if connection returned.
         //we didn't create any handles, so the "ManagedConnection" should be returned.
-        assertTrue("Expected TransactionContext to report active", transactionContext.isActive());
-        transactionContext.commit();
+        assertTrue("Expected TransactionContext to report active", TxUtil.isTransactionActive(transactionManager));
+        transactionManager.commit();
         assertTrue("Expected connection to be returned", returnedConnectionInfo != null);
-        assertTrue("Expected TransactionContext to report inactive", !transactionContext.isActive());
+        assertTrue("Expected TransactionContext to report inactive", !TxUtil.isTransactionActive(transactionManager));
 
     }
 
     public void testGetUnshareableConnectionsInTransaction() throws Exception {
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+        transactionManager.begin();
         ConnectionInfo connectionInfo1 = makeConnectionInfo();
         connectionInfo1.setUnshareable(true);
         transactionCachingInterceptor.getConnection(connectionInfo1);
         assertTrue("Expected to get an initial connection", obtainedConnectionInfo != null);
         assertTrue("Expected nothing returned yet", returnedConnectionInfo == null);
-        assertTrue("Expected different ManagedConnectionInfo in the TransactionContext as was returned",
-                connectionInfo1.getManagedConnectionInfo()
-                != getSharedManagedConnectionInfo(transactionContext));
+
         //2nd is shared, modelling a call into another ejb
         obtainedConnectionInfo = null;
         ConnectionInfo connectionInfo2 = makeConnectionInfo();
@@ -96,8 +90,7 @@
         assertTrue("Expected nothing returned yet", returnedConnectionInfo == null);
         assertTrue("Expected the same ManagedConnectionInfo in both ConnectionInfos",
                 connectionInfo1.getManagedConnectionInfo() != connectionInfo2.getManagedConnectionInfo());
-        assertTrue("Expected the same ManagedConnectionInfo in the TransactionContext as was returned",
-                connectionInfo2.getManagedConnectionInfo() == getSharedManagedConnectionInfo(transactionContext));
+
         //3rd is unshared, modelling a call into a third ejb
         obtainedConnectionInfo = null;
         ConnectionInfo connectionInfo3 = makeConnectionInfo();
@@ -107,22 +100,21 @@
         assertTrue("Expected nothing returned yet", returnedConnectionInfo == null);
         assertTrue("Expected different ManagedConnectionInfo in both unshared ConnectionInfos",
                 connectionInfo1.getManagedConnectionInfo() != connectionInfo3.getManagedConnectionInfo());
-        assertTrue("Expected different ManagedConnectionInfo in the TransactionContext as was returned",
-                connectionInfo3.getManagedConnectionInfo() != getSharedManagedConnectionInfo(transactionContext));
+
         //commit, see if connection returned.
         //we didn't create any handles, so the "ManagedConnection" should be returned.
-        assertTrue("Expected TransactionContext to report active", transactionContext.isActive());
-        transactionContext.commit();
+        assertTrue("Expected TransactionContext to report active", transactionManager.getStatus() == Status.STATUS_ACTIVE);
+        transactionManager.commit();
         assertTrue("Expected connection to be returned", returnedConnectionInfo != null);
-        assertTrue("Expected TransactionContext to report inactive", !transactionContext.isActive());
     }
 
-    private ManagedConnectionInfo getSharedManagedConnectionInfo(TransactionContext transactionContext) {
-        return ((TransactionCachingInterceptor.ManagedConnectionInfos)transactionContext.getManagedConnectionInfo(transactionCachingInterceptor)).getShared();
+    private ManagedConnectionInfo getSharedManagedConnectionInfo(Transaction transaction) {
+        if (transaction == null) return null;
+        ConnectorTransactionContext connectorTransactionContext = ConnectorTransactionContext.get(transaction);
+        return ((TransactionCachingInterceptor.ManagedConnectionInfos)connectorTransactionContext.getManagedConnectionInfo(transactionCachingInterceptor)).getShared();
     }
 
     public void testGetConnectionOutsideTransaction() throws Exception {
-        transactionContextManager.newUnspecifiedTransactionContext();
         ConnectionInfo connectionInfo1 = makeConnectionInfo();
         transactionCachingInterceptor.getConnection(connectionInfo1);
         assertTrue("Expected to get an initial connection", obtainedConnectionInfo != null);
@@ -143,14 +135,14 @@
     }
 
     public void testTransactionIndependence() throws Exception {
-        TransactionContext transactionContext1 = transactionContextManager.newContainerTransactionContext();
+        transactionManager.begin();
         ConnectionInfo connectionInfo1 = makeConnectionInfo();
         transactionCachingInterceptor.getConnection(connectionInfo1);
         obtainedConnectionInfo = null;
 
         //start a second transaction
-        transactionContext1.suspend();
-        TransactionContext transactionContext2 = transactionContextManager.newContainerTransactionContext();
+        Transaction suspendedTransaction = transactionManager.suspend();
+        transactionManager.begin();
         ConnectionInfo connectionInfo2 = makeConnectionInfo();
         transactionCachingInterceptor.getConnection(connectionInfo2);
         assertTrue("Expected to get a second connection", obtainedConnectionInfo != null);
@@ -158,19 +150,19 @@
         assertTrue("Expected different ManagedConnectionInfo in each ConnectionInfos",
                 connectionInfo1.getManagedConnectionInfo() != connectionInfo2.getManagedConnectionInfo());
         assertTrue("Expected the same ManagedConnectionInfo in the TransactionContext as was returned",
-                connectionInfo2.getManagedConnectionInfo() == getSharedManagedConnectionInfo(transactionContext2));
+                connectionInfo2.getManagedConnectionInfo() == getSharedManagedConnectionInfo(transactionManager.getTransaction()));
         //commit 2nd transaction, see if connection returned.
         //we didn't create any handles, so the "ManagedConnection" should be returned.
-        assertTrue("Expected TransactionContext to report active", transactionContext2.isActive());
-        transactionContext2.commit();
+        assertTrue("Expected TransactionContext to report active", transactionManager.getStatus() == Status.STATUS_ACTIVE);
+        transactionManager.commit();
         assertTrue("Expected connection to be returned", returnedConnectionInfo != null);
-        assertTrue("Expected TransactionContext to report inactive", !transactionContext2.isActive());
+        assertTrue("Expected TransactionContext to report inactive", transactionManager.getStatus() == Status.STATUS_NO_TRANSACTION);
         returnedConnectionInfo = null;
         //resume first transaction
-        transactionContext1.resume();
-        transactionContext1.commit();
+        transactionManager.resume(suspendedTransaction);
+        transactionManager.commit();
         assertTrue("Expected connection to be returned", returnedConnectionInfo != null);
-        assertTrue("Expected TransactionContext to report inactive", !transactionContext1.isActive());
+        assertTrue("Expected TransactionContext to report inactive", transactionManager.getStatus() == Status.STATUS_NO_TRANSACTION);
     }
 
 //interface implementations

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java Mon Jul 31 14:08:15 2006
@@ -21,9 +21,8 @@
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
+import javax.transaction.TransactionManager;
 
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.manager.NamedXAResource;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
 import org.apache.geronimo.transaction.manager.XidFactoryImpl;
@@ -34,22 +33,18 @@
  * @version $Rev$ $Date$
  *
  * */
-public class TransactionEnlistingInterceptorTest extends ConnectionInterceptorTestUtils
-        implements NamedXAResource {
-
+public class TransactionEnlistingInterceptorTest extends ConnectionInterceptorTestUtils implements NamedXAResource {
     private TransactionEnlistingInterceptor transactionEnlistingInterceptor;
     private boolean started;
     private boolean ended;
     private boolean returned;
     private boolean committed;
-    private TransactionContextManager transactionContextManager;
+    private TransactionManager transactionManager;
 
     protected void setUp() throws Exception {
         super.setUp();
-        TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, 
-                new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
-        transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
-        transactionEnlistingInterceptor = new TransactionEnlistingInterceptor(this, transactionContextManager);
+        transactionManager = new TransactionManagerImpl();
+        transactionEnlistingInterceptor = new TransactionEnlistingInterceptor(this, this.transactionManager);
     }
 
     protected void tearDown() throws Exception {
@@ -63,7 +58,6 @@
 
     public void testNoTransaction() throws Exception {
         ConnectionInfo connectionInfo = makeConnectionInfo();
-        transactionContextManager.newUnspecifiedTransactionContext();
         transactionEnlistingInterceptor.getConnection(connectionInfo);
         assertTrue("Expected not started", !started);
         assertTrue("Expected not ended", !ended);
@@ -73,7 +67,7 @@
     }
 
     public void testTransactionShareableConnection() throws Exception {
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+        transactionManager.begin();
         ConnectionInfo connectionInfo = makeConnectionInfo();
         transactionEnlistingInterceptor.getConnection(connectionInfo);
         assertTrue("Expected started", started);
@@ -83,12 +77,12 @@
         assertTrue("Expected not started", !started);
         assertTrue("Expected ended", ended);
         assertTrue("Expected returned", returned);
-        transactionContext.commit();
+        transactionManager.commit();
         assertTrue("Expected committed", committed);
     }
 
     public void testTransactionUnshareableConnection() throws Exception {
-        TransactionContext transactionContext = transactionContextManager.newContainerTransactionContext();
+        transactionManager.begin();
         ConnectionInfo connectionInfo = makeConnectionInfo();
         connectionInfo.setUnshareable(true);
         transactionEnlistingInterceptor.getConnection(connectionInfo);
@@ -99,7 +93,7 @@
         assertTrue("Expected not started", !started);
         assertTrue("Expected ended", ended);
         assertTrue("Expected returned", returned);
-        transactionContext.commit();
+        transactionManager.commit();
         assertTrue("Expected committed", committed);
     }
 

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java Mon Jul 31 14:08:15 2006
@@ -31,8 +31,8 @@
 import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
 import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
 import org.apache.geronimo.connector.outbound.GeronimoConnectionEventListener;
-import org.apache.geronimo.transaction.DefaultInstanceContext;
-import org.apache.geronimo.transaction.InstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 
 /**
  *
@@ -67,23 +67,23 @@
     }
 
     public void testSimpleComponentContextLifecyle() throws Exception {
-        DefaultInstanceContext componentContext = new DefaultInstanceContext(unshareableResources, applicationManagedSecurityResources);
-        InstanceContext oldInstanceContext = connectionTrackingCoordinator.enter(componentContext);
-        assertNull("Expected old instance context to be null", oldInstanceContext);
+        ConnectorInstanceContextImpl componentContext = new ConnectorInstanceContextImpl(unshareableResources, applicationManagedSecurityResources);
+        ConnectorInstanceContext oldConnectorInstanceContext = connectionTrackingCoordinator.enter(componentContext);
+        assertNull("Expected old instance context to be null", oldConnectorInstanceContext);
         //give the context a ConnectionInfo
         ConnectionInfo connectionInfo = newConnectionInfo();
         connectionTrackingCoordinator.handleObtained(key1, connectionInfo);
-        connectionTrackingCoordinator.exit(oldInstanceContext);
+        connectionTrackingCoordinator.exit(oldConnectorInstanceContext);
         Map connectionManagerMap = componentContext.getConnectionManagerMap();
         Set infos = (Set) connectionManagerMap.get(key1);
         assertEquals("Expected one connection for key1", 1, infos.size());
         assertTrue("Expected to get supplied ConnectionInfo from infos", connectionInfo == infos.iterator().next());
 
         //Enter again, and close the handle
-        oldInstanceContext = connectionTrackingCoordinator.enter(componentContext);
-        assertNull("Expected old instance context to be null", oldInstanceContext);
+        oldConnectorInstanceContext = connectionTrackingCoordinator.enter(componentContext);
+        assertNull("Expected old instance context to be null", oldConnectorInstanceContext);
         connectionTrackingCoordinator.handleReleased(key1, connectionInfo);
-        connectionTrackingCoordinator.exit(oldInstanceContext);
+        connectionTrackingCoordinator.exit(oldConnectorInstanceContext);
         connectionManagerMap = componentContext.getConnectionManagerMap();
         infos = (Set) connectionManagerMap.get(key1);
         assertEquals("Expected no connection set for key1", null, infos);
@@ -99,22 +99,22 @@
     }
 
     public void testNestedComponentContextLifecyle() throws Exception {
-        DefaultInstanceContext componentContext1 = new DefaultInstanceContext(unshareableResources, applicationManagedSecurityResources);
-        InstanceContext oldInstanceContext1 = connectionTrackingCoordinator.enter(componentContext1);
-        assertNull("Expected old component context to be null", oldInstanceContext1);
+        ConnectorInstanceContextImpl componentContext1 = new ConnectorInstanceContextImpl(unshareableResources, applicationManagedSecurityResources);
+        ConnectorInstanceContext oldConnectorInstanceContext1 = connectionTrackingCoordinator.enter(componentContext1);
+        assertNull("Expected old component context to be null", oldConnectorInstanceContext1);
         //give the context a ConnectionInfo
         ConnectionInfo connectionInfo1 = newConnectionInfo();
         connectionTrackingCoordinator.handleObtained(key1, connectionInfo1);
 
         //Simulate calling another component
-        DefaultInstanceContext componentContext2 = new DefaultInstanceContext(unshareableResources, applicationManagedSecurityResources);
-        InstanceContext oldInstanceContext2 = connectionTrackingCoordinator.enter(componentContext2);
-        assertTrue("Expected returned component context to be componentContext1", oldInstanceContext2 == componentContext1);
+        ConnectorInstanceContextImpl componentContext2 = new ConnectorInstanceContextImpl(unshareableResources, applicationManagedSecurityResources);
+        ConnectorInstanceContext oldConnectorInstanceContext2 = connectionTrackingCoordinator.enter(componentContext2);
+        assertTrue("Expected returned component context to be componentContext1", oldConnectorInstanceContext2 == componentContext1);
         //give the context a ConnectionInfo
         ConnectionInfo connectionInfo2 = newConnectionInfo();
         connectionTrackingCoordinator.handleObtained(key2, connectionInfo2);
 
-        connectionTrackingCoordinator.exit(oldInstanceContext2);
+        connectionTrackingCoordinator.exit(oldConnectorInstanceContext2);
         Map connectionManagerMap2 = componentContext2.getConnectionManagerMap();
         Set infos2 = (Set) connectionManagerMap2.get(key2);
         assertEquals("Expected one connection for key2", 1, infos2.size());
@@ -122,7 +122,7 @@
         assertEquals("Expected no connection for key1", null, connectionManagerMap2.get(key1));
 
 
-        connectionTrackingCoordinator.exit(oldInstanceContext1);
+        connectionTrackingCoordinator.exit(oldConnectorInstanceContext1);
         Map connectionManagerMap1 = componentContext1.getConnectionManagerMap();
         Set infos1 = (Set) connectionManagerMap1.get(key1);
         assertEquals("Expected one connection for key1", 1, infos1.size());
@@ -130,10 +130,10 @@
         assertEquals("Expected no connection for key2", null, connectionManagerMap1.get(key2));
 
         //Enter again, and close the handle
-        oldInstanceContext1 = connectionTrackingCoordinator.enter(componentContext1);
-        assertNull("Expected old component context to be null", oldInstanceContext1);
+        oldConnectorInstanceContext1 = connectionTrackingCoordinator.enter(componentContext1);
+        assertNull("Expected old component context to be null", oldConnectorInstanceContext1);
         connectionTrackingCoordinator.handleReleased(key1, connectionInfo1);
-        connectionTrackingCoordinator.exit(oldInstanceContext1);
+        connectionTrackingCoordinator.exit(oldConnectorInstanceContext1);
         connectionManagerMap1 = componentContext1.getConnectionManagerMap();
         infos1 = (Set) connectionManagerMap1.get(key1);
         assertEquals("Expected no connection set for key1", null, infos1);

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultComponentInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultComponentInterceptor.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultComponentInterceptor.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultComponentInterceptor.java Mon Jul 31 14:08:15 2006
@@ -17,10 +17,8 @@
 
 package org.apache.geronimo.connector.outbound.connectiontracking;
 
-import org.apache.geronimo.transaction.InstanceContext;
-import org.apache.geronimo.transaction.TrackedConnectionAssociator;
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
 
 /**
  * Sample functionality for an interceptor that enables connection caching and obtaining
@@ -32,34 +30,18 @@
 
     private final DefaultInterceptor next;
     private final TrackedConnectionAssociator trackedConnectionAssociator;
-    private final TransactionContextManager transactionContextManager;
 
-    public DefaultComponentInterceptor(DefaultInterceptor next,
-                                       TrackedConnectionAssociator trackedConnectionAssociator,
-                                       TransactionContextManager transactionContextManager) {
+    public DefaultComponentInterceptor(DefaultInterceptor next, TrackedConnectionAssociator trackedConnectionAssociator) {
         this.next = next;
         this.trackedConnectionAssociator = trackedConnectionAssociator;
-        this.transactionContextManager = transactionContextManager;
     }
 
-    public Object invoke(InstanceContext newInstanceContext) throws Throwable {
-        TransactionContext transactionContext = transactionContextManager.getContext();
-        if (transactionContext == null) {
-            transactionContextManager.newUnspecifiedTransactionContext();
-        }
+    public Object invoke(ConnectorInstanceContext newConnectorInstanceContext) throws Throwable {
+        ConnectorInstanceContext oldConnectorInstanceContext = trackedConnectionAssociator.enter(newConnectorInstanceContext);
         try {
-            InstanceContext oldInstanceContext = trackedConnectionAssociator.enter(newInstanceContext);
-            try {
-                return next.invoke(newInstanceContext);
-            } finally {
-                trackedConnectionAssociator.exit(oldInstanceContext);
-            }
+            return next.invoke(newConnectorInstanceContext);
         } finally {
-            if (transactionContext == null) {
-                transactionContext = transactionContextManager.getContext();
-                transactionContext.commit();
-                transactionContextManager.setContext(null);
-            }
+            trackedConnectionAssociator.exit(oldConnectorInstanceContext);
         }
     }
 }

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultInterceptor.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultInterceptor.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultInterceptor.java Mon Jul 31 14:08:15 2006
@@ -17,7 +17,7 @@
 
 package org.apache.geronimo.connector.outbound.connectiontracking;
 
-import org.apache.geronimo.transaction.InstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 
 
 /**
@@ -28,5 +28,5 @@
  * */
 public interface DefaultInterceptor {
 
-    Object invoke(InstanceContext newInstanceContext) throws Throwable;
+    Object invoke(ConnectorInstanceContext newConnectorInstanceContext) throws Throwable;
 }

Modified: geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/connector/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java Mon Jul 31 14:08:15 2006
@@ -25,8 +25,9 @@
 import javax.resource.spi.work.WorkListener;
 
 import junit.framework.TestCase;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.pool.ThreadPool;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.geronimo.transaction.manager.XAWork;
 
 /**
  * Timing is crucial for this test case, which focuses on the synchronization
@@ -39,10 +40,11 @@
     private GeronimoWorkManager workManager;
 
     protected void setUp() throws Exception {
-        TransactionContextManager transactionContextManager = new TransactionContextManager();
+        super.setUp();
+        XAWork xaWork = new GeronimoTransactionManager();
         ThreadPool pool = new ThreadPool(1, "Connector Test", 30000, ThreadPool.class.getClassLoader(), "foo:test=bar");
         pool.setWaitWhenBlocked(true);
-        workManager = new GeronimoWorkManager(pool, pool, pool, transactionContextManager);
+        workManager = new GeronimoWorkManager(pool, pool, pool, xaWork);
         workManager.doStart();
     }
 

Modified: geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Mon Jul 31 14:08:15 2006
@@ -29,7 +29,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class AppClientModule extends Module {
     private final Environment clientEnvironment;

Modified: geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Mon Jul 31 14:08:15 2006
@@ -28,7 +28,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ConnectorModule extends Module {
     public ConnectorModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {

Modified: geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Mon Jul 31 14:08:15 2006
@@ -113,7 +113,6 @@
     private final Environment defaultEnvironment;
     private final AbstractNameQuery serverName;
     private final AbstractNameQuery transactionManagerObjectName;
-    private final AbstractNameQuery transactionContextManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
     private final AbstractNameQuery transactionalTimerObjectName;
     private final AbstractNameQuery nonTransactionalTimerObjectName;
@@ -122,7 +121,6 @@
 
     public EARConfigBuilder(Environment defaultEnvironment,
             AbstractNameQuery transactionManagerAbstractName,
-            AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
             AbstractNameQuery nonTransactionalTimerAbstractName,
@@ -139,7 +137,6 @@
             Kernel kernel) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
-                transactionContextManagerAbstractName,
                 connectionTrackerAbstractName,
                 transactionalTimerAbstractName,
                 nonTransactionalTimerAbstractName,
@@ -158,7 +155,6 @@
     }
     public EARConfigBuilder(Environment defaultEnvironment,
             AbstractNameQuery transactionManagerAbstractName,
-            AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
             AbstractNameQuery nonTransactionalTimerAbstractName,
@@ -175,7 +171,6 @@
             Naming naming) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
-                transactionContextManagerAbstractName,
                 connectionTrackerAbstractName,
                 transactionalTimerAbstractName,
                 nonTransactionalTimerAbstractName,
@@ -195,7 +190,6 @@
 
     private EARConfigBuilder(Environment defaultEnvironment,
             AbstractNameQuery transactionManagerAbstractName,
-            AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
             AbstractNameQuery nonTransactionalTimerAbstractName,
@@ -223,7 +217,6 @@
         this.appClientConfigBuilder = appClientConfigBuilder;
         this.serviceReferenceBuilder = serviceReferenceBuilder;
         this.transactionManagerObjectName = transactionManagerAbstractName;
-        this.transactionContextManagerObjectName = transactionContextManagerAbstractName;
         this.connectionTrackerObjectName = connectionTrackerAbstractName;
         this.transactionalTimerObjectName = transactionalTimerAbstractName;
         this.nonTransactionalTimerObjectName = nonTransactionalTimerAbstractName;
@@ -460,7 +453,6 @@
                     serverName,
                     applicationInfo.getBaseName(),
                     transactionManagerObjectName,
-                    transactionContextManagerObjectName,
                     connectionTrackerObjectName,
                     transactionalTimerObjectName,
                     nonTransactionalTimerObjectName,
@@ -921,7 +913,6 @@
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EARConfigBuilder.class, NameFactory.CONFIG_BUILDER);
         infoFactory.addAttribute("defaultEnvironment", Environment.class, true, true);
         infoFactory.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("transactionContextManagerAbstractName", AbstractNameQuery.class, true);
         infoFactory.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class, true);
         infoFactory.addAttribute("transactionalTimerAbstractName", AbstractNameQuery.class, true);
         infoFactory.addAttribute("nonTransactionalTimerAbstractName", AbstractNameQuery.class, true);
@@ -944,7 +935,6 @@
         infoFactory.setConstructor(new String[]{
                 "defaultEnvironment",
                 "transactionManagerAbstractName",
-                "transactionContextManagerAbstractName",
                 "connectionTrackerAbstractName",
                 "transactionalTimerAbstractName",
                 "nonTransactionalTimerAbstractName",

Modified: geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Mon Jul 31 14:08:15 2006
@@ -36,7 +36,6 @@
  */
 public class EARContext extends DeploymentContext {
     private final AbstractNameQuery transactionManagerObjectName;
-    private final AbstractNameQuery transactionContextManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
 
     private final AbstractNameQuery transactedTimerName;
@@ -61,7 +60,6 @@
             AbstractNameQuery serverName,
             AbstractName baseName,
             AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery transactionContextManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery transactedTimerName,
             AbstractNameQuery nonTransactedTimerName,
@@ -72,7 +70,6 @@
         moduleName = baseName;
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;
-        this.transactionContextManagerObjectName = transactionContextManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.transactedTimerName = transactedTimerName;
         this.nonTransactedTimerName = nonTransactedTimerName;
@@ -89,7 +86,6 @@
             AbstractNameQuery serverName,
             AbstractName baseName,
             AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery transactionContextManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery transactedTimerName,
             AbstractNameQuery nonTransactedTimerName,
@@ -101,7 +97,6 @@
         this.serverName = serverName;
 
         this.transactionManagerObjectName = transactionManagerObjectName;
-        this.transactionContextManagerObjectName = transactionContextManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.transactedTimerName = transactedTimerName;
         this.nonTransactedTimerName = nonTransactedTimerName;
@@ -115,7 +110,6 @@
         this.serverName = parent.getServerName();
 
         this.transactionManagerObjectName = parent.getTransactionManagerObjectName();
-        this.transactionContextManagerObjectName = parent.getTransactionContextManagerObjectName();
         this.connectionTrackerObjectName = parent.getConnectionTrackerObjectName();
         this.transactedTimerName = parent.getTransactedTimerName();
         this.nonTransactedTimerName = parent.getNonTransactedTimerName();
@@ -129,10 +123,6 @@
 
     public AbstractNameQuery getTransactionManagerObjectName() {
         return transactionManagerObjectName;
-    }
-
-    public AbstractNameQuery getTransactionContextManagerObjectName() {
-        return transactionContextManagerObjectName;
     }
 
     public AbstractNameQuery getConnectionTrackerObjectName() {

Modified: geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java Mon Jul 31 14:08:15 2006
@@ -29,7 +29,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class WebModule extends Module {
     private final String contextRoot;

Modified: geronimo/branches/dain/notcm/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Mon Jul 31 14:08:15 2006
@@ -101,7 +101,6 @@
     private static String contextRoot = "test";
     private static final Map portMap = null;
     private final AbstractNameQuery transactionManagerAbstractNameQuery = new AbstractNameQuery(transactionManagerObjectName, null);
-    private final AbstractNameQuery transactionContextManagerAbstractNameQuery = new AbstractNameQuery(transactionManagerObjectName, null);
     private final AbstractNameQuery connectionTrackerAbstractNameQuery = new AbstractNameQuery(connectionTrackerObjectName, null);
     private final AbstractNameQuery transactionalTimerAbstractNameQuery = new AbstractNameQuery(transactionalTimerObjectName, null);
     private final AbstractNameQuery nonTransactionalTimerAbstractNameQuery = new AbstractNameQuery(nonTransactionalTimerObjectName, null);
@@ -262,7 +261,6 @@
         try {
             EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                     transactionManagerAbstractNameQuery,
-                    transactionContextManagerAbstractNameQuery,
                     connectionTrackerAbstractNameQuery,
                     transactionalTimerAbstractNameQuery,
                     nonTransactionalTimerAbstractNameQuery,
@@ -294,7 +292,6 @@
     public void testBadEJBJARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,
@@ -334,7 +331,6 @@
     public void testBadWARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,
@@ -374,7 +370,6 @@
     public void testBadRARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,
@@ -414,7 +409,6 @@
     public void testBadCARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,
@@ -454,7 +448,6 @@
     public void testNoEJBDeployer() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,
@@ -493,7 +486,6 @@
     public void testNoWARDeployer() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,
@@ -531,7 +523,6 @@
     public void testNoConnectorDeployer() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
                 transactionManagerAbstractNameQuery,
-                transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
                 nonTransactionalTimerAbstractNameQuery,

Modified: geronimo/branches/dain/notcm/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Mon Jul 31 14:08:15 2006
@@ -71,16 +71,17 @@
     public static final String SERVICE_MODULE = "ServiceModule";
     // todo should these really be j2eeType or should we have a Geronimo-specific property?
     public static final String TRANSACTION_MANAGER = "TransactionManager";
-    public static final String TRANSACTION_CONTEXT_MANAGER = "TransactionContextManager";
     public static final String TRANSACTION_LOG = "TransactionLog";
     public static final String XID_FACTORY = "XIDFactory";
     public static final String XID_IMPORTER = "XIDImporter";
+    public static final String JCA_BOOTSTRAP_CONTEXT = "JCABootstrapContext";
     public static final String JCA_CONNECTION_TRACKER = "JCAConnectionTracker";
     public static final String JCA_ADMIN_OBJECT = "JCAAdminObject";
     public static final String JCA_ACTIVATION_SPEC = "JCAActivationSpec";
     public static final String JCA_RESOURCE_ADAPTER = "JCAResourceAdapter";
     public static final String JCA_WORK_MANAGER = "JCAWorkManager";
     public static final String JCA_CONNECTION_MANAGER = "JCAConnectionManager";
+    public static final String JCA_XA_TERMINATOR = "JCAXATerminator";
     public static final String WEB_FILTER = "WebFilter";
     public static final String URL_WEB_FILTER_MAPPING = "URLWebFilterMapping";
     public static final String SERVLET_WEB_FILTER_MAPPING = "ServletWebFilterMapping";

Modified: geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java Mon Jul 31 14:08:15 2006
@@ -22,7 +22,7 @@
 import org.apache.geronimo.management.JVM;
 
 /**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class JVMTest extends Abstract77Test {
     private JVM jvm;

Modified: geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java Mon Jul 31 14:08:15 2006
@@ -21,7 +21,7 @@
 
 
 /**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ServerTest extends Abstract77Test {
     private J2EEServer server;

Modified: geronimo/branches/dain/notcm/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty-builder/project.xml?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty-builder/project.xml (original)
+++ geronimo/branches/dain/notcm/modules/jetty-builder/project.xml Mon Jul 31 14:08:15 2006
@@ -41,7 +41,13 @@
     <!-- ============ -->
 
     <dependencies>
-
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
+            <type>test</type>
+        </dependency>
+        
         <dependency>
              <groupId>xmlbeans</groupId>
              <artifactId>xmlbeans-maven-plugin</artifactId>

Modified: geronimo/branches/dain/notcm/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Mon Jul 31 14:08:15 2006
@@ -41,7 +41,6 @@
 
 import javax.management.ObjectName;
 import javax.servlet.Servlet;
-import javax.transaction.UserTransaction;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -85,7 +84,6 @@
 import org.apache.geronimo.security.deployment.SecurityBuilder;
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
-import org.apache.geronimo.transaction.context.OnlineUserTransaction;
 import org.apache.geronimo.web.deployment.AbstractWebModuleBuilder;
 import org.apache.geronimo.web.deployment.GenericToSpecificPlanConverter;
 import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType;
@@ -333,10 +331,9 @@
         GbeanType[] gbeans = jettyWebApp.getGbeanArray();
         ServiceConfigBuilder.addGBeans(gbeans, moduleClassLoader, moduleName, moduleContext);
 
-        UserTransaction userTransaction = new OnlineUserTransaction();
         //this may add to the web classpath with enhanced classes.
         //N.B. we use the ear context which has all the gbeans we could possibly be looking up from this ear.
-        Map compContext = buildComponentContext(earContext, webModule, webApp, jettyWebApp, userTransaction, moduleClassLoader);
+        Map compContext = buildComponentContext(earContext, webModule, webApp, jettyWebApp, moduleClassLoader);
 
         GBeanData webModuleData = new GBeanData(moduleName, JettyWebAppContext.GBEAN_INFO);
         try {
@@ -379,7 +376,6 @@
             webModuleData.addDependencies(dependencies);
 
             webModuleData.setAttribute("componentContext", compContext);
-            webModuleData.setAttribute("userTransaction", userTransaction);
             //classpath may have been augmented with enhanced classes
 //            webModuleData.setAttribute("webClassPath", webModule.getWebClasspath());
             // unsharableResources, applicationManagedSecurityResources
@@ -389,7 +385,7 @@
 
             webModuleData.setAttribute("contextPath", webModule.getContextRoot());
 
-            webModuleData.setReferencePattern("TransactionContextManager", moduleContext.getTransactionContextManagerObjectName());
+            webModuleData.setReferencePattern("TransactionManager", moduleContext.getTransactionManagerObjectName());
             webModuleData.setReferencePattern("TrackedConnectionAssociator", moduleContext.getConnectionTrackerObjectName());
             if (jettyWebApp.isSetWebContainer()) {
                 AbstractNameQuery webContainerName = ENCConfigBuilder.getGBeanQuery(NameFactory.GERONIMO_SERVICE, jettyWebApp.getWebContainer());
@@ -904,11 +900,11 @@
         return servletAbstractName;
     }
 
-    private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType webApp, JettyWebAppType jettyWebApp, UserTransaction userTransaction, ClassLoader cl) throws DeploymentException {
+    private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType webApp, JettyWebAppType jettyWebApp, ClassLoader cl) throws DeploymentException {
         return ENCConfigBuilder.buildComponentContext(earContext,
                 earContext.getConfiguration(),
                 webModule,
-                userTransaction,
+                null,
                 webApp.getEnvEntryArray(),
                 webApp.getEjbRefArray(), jettyWebApp.getEjbRefArray(),
                 webApp.getEjbLocalRefArray(), jettyWebApp.getEjbLocalRefArray(),

Modified: geronimo/branches/dain/notcm/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Mon Jul 31 14:08:15 2006
@@ -81,8 +81,7 @@
 import org.apache.geronimo.kernel.repository.ArtifactManager;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
-import org.apache.geronimo.transaction.context.TransactionContextManagerGBean;
-import org.apache.geronimo.transaction.manager.TransactionManagerImplGBean;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean;
 
 /**
  * @version $Rev:385232 $ $Date$
@@ -93,8 +92,8 @@
     private final AbstractName serverName = naming.createRootName(baseId, "Server", "J2EEServer");
 
     protected Kernel kernel;
+    private AbstractName tmName;
     private AbstractName ctcName;
-    private AbstractName tcmName;
     private ClassLoader cl;
     private JettyModuleBuilder builder;
     private File basedir = new File(System.getProperty("basedir", "."));
@@ -186,8 +185,7 @@
                 repositories,
                 new AbstractNameQuery(serverName),
                 moduleName,
-                null,
-                new AbstractNameQuery(tcmName),
+                new AbstractNameQuery(tmName),
                 new AbstractNameQuery(ctcName),
                 null,
                 null,
@@ -301,13 +299,13 @@
         connector.setAttribute("minThreads", new Integer(10));
         connector.setReferencePattern("JettyContainer", containerName);
 
-        GBeanData tm = bootstrap.addGBean("TransactionManager", TransactionManagerImplGBean.GBEAN_INFO);
+        GBeanData tm = bootstrap.addGBean("TransactionManager", GeronimoTransactionManagerGBean.GBEAN_INFO);
+        tmName = tm.getAbstractName();
         tm.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10));
 
-        GBeanData tcm = bootstrap.addGBean("TransactionContextManager", TransactionContextManagerGBean.GBEAN_INFO);
-        tcm.setReferencePattern("TransactionManager", tm.getAbstractName());
-        tcmName = tcm.getAbstractName();
-        ctcName = bootstrap.addGBean("ConnectionTrackingCoordinator", ConnectionTrackingCoordinatorGBean.GBEAN_INFO).getAbstractName();
+        GBeanData ctc = bootstrap.addGBean("ConnectionTrackingCoordinator", ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
+        ctcName = ctc.getAbstractName();
+        ctc.setReferencePattern("TransactionManager", tmName);
 
         ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
 

Modified: geronimo/branches/dain/notcm/modules/jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/project.xml?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/project.xml (original)
+++ geronimo/branches/dain/notcm/modules/jetty/project.xml Mon Jul 31 14:08:15 2006
@@ -42,6 +42,13 @@
 
     <dependencies>
         <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
+            <type>test</type>
+        </dependency>
+
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-dependency-plugin</artifactId>
             <version>${geronimo_dependency_plugin_version}</version>

Modified: geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java Mon Jul 31 14:08:15 2006
@@ -26,7 +26,7 @@
 import org.mortbay.jetty.servlet.ServletHolder;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class JettyDefaultServletHolder extends JettyServletHolder {
 

Modified: geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java?rev=427273&r1=427272&r2=427273&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java (original)
+++ geronimo/branches/dain/notcm/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java Mon Jul 31 14:08:15 2006
@@ -43,7 +43,7 @@
  * This is intended to hold the web service stack for an axis POJO web service.
  * It is starting life as a copy of JettyServletHolder.
  *
- * @version $Rev: 385886 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class JettyPOJOWebServiceHolder extends ServletHolder implements GBeanLifecycle {
     private WebServiceContainer webServiceContainer;



Mime
View raw message