geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1074024 [2/2] - in /geronimo/sandbox/djencks/txmanager: ./ connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ geronimo-connector/src/main/java/org/apache/geronimo/connector/assembler/ geronimo-connector/src/mai...
Date Thu, 24 Feb 2011 02:25:53 GMT
Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptor.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptor.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptor.java
Thu Feb 24 02:25:51 2011
@@ -17,12 +17,15 @@
 
 package org.apache.geronimo.connector.outbound;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 import javax.resource.ResourceException;
 import javax.transaction.RollbackException;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,20 +41,21 @@ public class TransactionEnlistingInterce
     protected static Logger log = LoggerFactory.getLogger(TransactionEnlistingInterceptor.class);
 
     private final ConnectionInterceptor next;
-    private final TransactionManager transactionManager;
+    private final AtomicReference<TransactionManager> transactionManager = new AtomicReference<TransactionManager>();
 
     public TransactionEnlistingInterceptor(ConnectionInterceptor next, TransactionManager
transactionManager) {
         this.next = next;
-        this.transactionManager = transactionManager;
+        this.transactionManager.set(transactionManager);
     }
 
+    @Override
     public void getConnection(ConnectionInfo connectionInfo) throws ResourceException {
         next.getConnection(connectionInfo);
         try {
             ManagedConnectionInfo mci = connectionInfo.getManagedConnectionInfo();
 
             // get the current transation and status... if there is a problem just assume
there is no transaction present
-            Transaction transaction = TxUtil.getTransactionIfActive(transactionManager);
+            Transaction transaction = TxUtil.getTransactionIfActive(transactionManager.get());
             if (transaction != null) {
                 XAResource xares = mci.getXAResource();
                 if (log.isTraceEnabled()) {
@@ -85,11 +89,12 @@ public class TransactionEnlistingInterce
      * @param connectionInfo         a <code>ConnectionInfo</code> value
      * @param connectionReturnAction a <code>ConnectionReturnAction</code> value
      */
+    @Override
     public void returnConnection(ConnectionInfo connectionInfo,
                                  ConnectionReturnAction connectionReturnAction) {
         try {
             ManagedConnectionInfo mci = connectionInfo.getManagedConnectionInfo();
-            Transaction transaction = TxUtil.getTransactionIfActive(transactionManager);
+            Transaction transaction = TxUtil.getTransactionIfActive(transactionManager.get());
             if (transaction != null) {
                 XAResource xares = mci.getXAResource();
                 if (log.isTraceEnabled()) {
@@ -113,13 +118,47 @@ public class TransactionEnlistingInterce
         next.returnConnection(connectionInfo, connectionReturnAction);
     }
 
+    @Override
     public void destroy() {
         next.destroy();
     }
 
+    @Override
     public void info(StringBuilder s) {
         s.append(getClass().getName()).append("[transactionManager=").append(transactionManager).append("]\n");
         next.info(s);
     }
 
+    @Override
+    public void setConnectionTracker(ConnectionTracker connectionTracker) {
+        next.setConnectionTracker(connectionTracker);
+    }
+
+    @Override
+    public void unsetConnectionTracker() {
+        next.unsetConnectionTracker();
+    }
+
+    @Override
+    public void setTransactionManager(TransactionManager transactionManager) {
+        this.transactionManager.set(transactionManager);
+        next.setTransactionManager(transactionManager);
+    }
+
+    @Override
+    public void unsetTransactionManager() {
+        this.transactionManager.set(null);
+        next.unsetTransactionManager();
+    }
+
+    @Override
+    public void setSubjectSource(SubjectSource subjectSource) {
+        next.setSubjectSource(subjectSource);
+    }
+
+    @Override
+    public void unsetSubjectSource() {
+        next.unsetSubjectSource();
+    }
+
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java
Thu Feb 24 02:25:51 2011
@@ -29,6 +29,9 @@ public final class TxUtil {
     }
 
     public static Transaction getTransactionIfActive(TransactionManager transactionManager)
{
+        if (transactionManager == null) {
+            return null;
+        }
         Transaction transaction = null;
         int status = Status.STATUS_NO_TRANSACTION;
         try {
@@ -44,6 +47,9 @@ public final class TxUtil {
     }
 
     public static boolean isTransactionActive(TransactionManager transactionManager) {
+        if (transactionManager == null) {
+            return false;
+        }
         try {
             int status = transactionManager.getStatus();
             return status == Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK;

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/XAResourceInsertionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/XAResourceInsertionInterceptor.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/XAResourceInsertionInterceptor.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/XAResourceInsertionInterceptor.java
Thu Feb 24 02:25:51 2011
@@ -18,7 +18,9 @@
 package org.apache.geronimo.connector.outbound;
 
 import javax.resource.ResourceException;
+import javax.transaction.TransactionManager;
 
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
 
 /**
@@ -37,23 +39,57 @@ public class XAResourceInsertionIntercep
         this.name = name;
     }
 
+    @Override
     public void getConnection(ConnectionInfo connectionInfo) throws ResourceException {
         next.getConnection(connectionInfo);
         ManagedConnectionInfo mci = connectionInfo.getManagedConnectionInfo();
         mci.setXAResource(new WrapperNamedXAResource(mci.getManagedConnection().getXAResource(),
name));
     }
 
+    @Override
     public void returnConnection(ConnectionInfo connectionInfo, ConnectionReturnAction connectionReturnAction)
{
         next.returnConnection(connectionInfo, connectionReturnAction);
     }
     
+    @Override
     public void destroy() {
         next.destroy();
     }
 
+    @Override
     public void info(StringBuilder s) {
         s.append(getClass().getName()).append("[name=").append(name).append("]\n");
         next.info(s);
     }
 
+    @Override
+    public void setConnectionTracker(ConnectionTracker connectionTracker) {
+        next.setConnectionTracker(connectionTracker);
+    }
+
+    @Override
+    public void unsetConnectionTracker() {
+        next.unsetConnectionTracker();
+    }
+
+    @Override
+    public void setTransactionManager(TransactionManager transactionManager) {
+        next.setTransactionManager(transactionManager);
+    }
+
+    @Override
+    public void unsetTransactionManager() {
+        next.unsetTransactionManager();
+    }
+
+    @Override
+    public void setSubjectSource(SubjectSource subjectSource) {
+        next.setSubjectSource(subjectSource);
+    }
+
+    @Override
+    public void unsetSubjectSource() {
+        next.unsetSubjectSource();
+    }
+
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
Thu Feb 24 02:25:51 2011
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
  *
  * @version $Rev$ $Date$
  */
-@Component(metatype = true, immediate = true)
+@Component(metatype = true)
 @Service
 public class ConnectionTrackingCoordinator implements TransactionManagerMonitor, TrackedConnectionAssociator,
ConnectionTracker {
     private static final Logger log = LoggerFactory.getLogger(ConnectionTrackingCoordinator.class.getName());

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResourceInsertionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResourceInsertionInterceptor.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResourceInsertionInterceptor.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResourceInsertionInterceptor.java
Thu Feb 24 02:25:51 2011
@@ -18,11 +18,14 @@
 package org.apache.geronimo.connector.outbound.transactionlog;
 
 import javax.resource.ResourceException;
+import javax.transaction.TransactionManager;
 
 import org.apache.geronimo.connector.outbound.ConnectionInfo;
 import org.apache.geronimo.connector.outbound.ConnectionInterceptor;
 import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
 import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
+import org.apache.geronimo.connector.outbound.SubjectSource;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 
 /**
  * LocalXAResourceInsertionInterceptor.java
@@ -42,6 +45,7 @@ public class LogXAResourceInsertionInter
         this.name = name;
     }
 
+    @Override
     public void getConnection(ConnectionInfo connectionInfo) throws ResourceException {
         next.getConnection(connectionInfo);
         ManagedConnectionInfo mci = connectionInfo.getManagedConnectionInfo();
@@ -50,16 +54,19 @@ public class LogXAResourceInsertionInter
                         mci.getManagedConnection().getLocalTransaction(), name));
     }
 
+    @Override
     public void returnConnection(
             ConnectionInfo connectionInfo,
             ConnectionReturnAction connectionReturnAction) {
         next.returnConnection(connectionInfo, connectionReturnAction);
     }
 
+    @Override
     public void destroy() {
         next.destroy();
     }
 
+    @Override
     public void info(StringBuilder s) {
         s.append(getClass().getName()).append("[name=").append(name).append("]\n");
         if (next == null) {
@@ -69,4 +76,34 @@ public class LogXAResourceInsertionInter
         }
     }
 
+    @Override
+    public void setConnectionTracker(ConnectionTracker connectionTracker) {
+        next.setConnectionTracker(connectionTracker);
+    }
+
+    @Override
+    public void unsetConnectionTracker() {
+        next.unsetConnectionTracker();
+    }
+
+    @Override
+    public void setTransactionManager(TransactionManager transactionManager) {
+        next.setTransactionManager(transactionManager);
+    }
+
+    @Override
+    public void unsetTransactionManager() {
+        next.unsetTransactionManager();
+    }
+
+    @Override
+    public void setSubjectSource(SubjectSource subjectSource) {
+        next.setSubjectSource(subjectSource);
+    }
+
+    @Override
+    public void unsetSubjectSource() {
+        next.unsetSubjectSource();
+    }
+
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/AssemblerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/AssemblerTest.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/AssemblerTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/AssemblerTest.java
Thu Feb 24 02:25:51 2011
@@ -38,7 +38,7 @@ import org.apache.geronimo.connector.mod
 import org.apache.geronimo.connector.model.ManagedConnectionFactoryInfo;
 import org.apache.geronimo.connector.model.ResourceAdapterInfo;
 import org.apache.geronimo.connector.model.ResourceAdapterModuleInfo;
-import org.apache.geronimo.connector.outbound.GenericConnectionManager;
+import org.apache.geronimo.connector.outbound.BaseConnectionManager;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -130,14 +130,14 @@ public class AssemblerTest {
             aoCount++;
         }
 
-        public void newManagedConnectionFactory(String name, ManagedConnectionFactory managedConnectionFactory,
GenericConnectionManager connectionManager) {
+        public void newManagedConnectionFactory(String name, ManagedConnectionFactory managedConnectionFactory,
BaseConnectionManager.Interceptors interceptors) {
             mcfCount++;
             assertTrue(name.startsWith("mcf"));
             assertNotNull(managedConnectionFactory);
             assertEquals(MockManagedConnectionFactory.class, managedConnectionFactory.getClass());
 
-            assertNotNull(connectionManager);
-            assertEquals(10, connectionManager.getPartitionMaxSize());
+            assertNotNull(interceptors);
+            assertEquals(10, interceptors.getPoolingAttributes().getPartitionMaxSize());
         }
 
     }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolTest.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolTest.java
Thu Feb 24 02:25:51 2011
@@ -25,9 +25,11 @@ import java.util.ArrayList;
 
 import javax.resource.ResourceException;
 import javax.resource.spi.ManagedConnectionFactory;
+import javax.transaction.TransactionManager;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 
 /**
  * @version $Rev$ $Date$
@@ -274,5 +276,29 @@ public class AbstractSinglePoolTest exte
             next.info(s);
         }
 
+        @Override
+        public void setConnectionTracker(ConnectionTracker connectionTracker) {
+        }
+
+        @Override
+        public void unsetConnectionTracker() {
+        }
+
+        @Override
+        public void setTransactionManager(TransactionManager transactionManager) {
+        }
+
+        @Override
+        public void unsetTransactionManager() {
+        }
+
+        @Override
+        public void setSubjectSource(SubjectSource subjectSource) {
+        }
+
+        @Override
+        public void unsetSubjectSource() {
+        }
+
     }
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionInterceptorTestUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionInterceptorTestUtils.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionInterceptorTestUtils.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionInterceptorTestUtils.java
Thu Feb 24 02:25:51 2011
@@ -28,9 +28,11 @@ import javax.resource.spi.LocalTransacti
 import javax.resource.spi.ManagedConnection;
 import javax.resource.spi.ManagedConnectionMetaData;
 import javax.security.auth.Subject;
+import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
 import junit.framework.TestCase;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 
 /**
  *
@@ -188,4 +190,28 @@ public class ConnectionInterceptorTestUt
         s.append("<end>");
     }
 
+    @Override
+    public void setConnectionTracker(ConnectionTracker connectionTracker) {
+    }
+
+    @Override
+    public void unsetConnectionTracker() {
+    }
+
+    @Override
+    public void setTransactionManager(TransactionManager transactionManager) {
+    }
+
+    @Override
+    public void unsetTransactionManager() {
+    }
+
+    @Override
+    public void setSubjectSource(SubjectSource subjectSource) {
+    }
+
+    @Override
+    public void unsetSubjectSource() {
+    }
+
 }

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
Thu Feb 24 02:25:51 2011
@@ -66,7 +66,7 @@ public class ConnectionManagerTestUtils 
     //dependencies
     protected ConnectionTrackingCoordinator connectionTrackingCoordinator;
     protected RecoverableTransactionManager transactionManager;
-    protected AbstractConnectionManager connectionManagerDeployment;
+    protected BaseConnectionManager connectionManagerDeployment;
     protected MockConnectionFactory connectionFactory;
     protected MockManagedConnectionFactory mockManagedConnectionFactory;
     protected ConnectorInstanceContextImpl connectorInstanceContext;

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorProxyTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorProxyTest.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorProxyTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorProxyTest.java
Thu Feb 24 02:25:51 2011
@@ -23,6 +23,7 @@ import org.apache.geronimo.connector.out
 import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
 import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
 import org.apache.geronimo.connector.outbound.GeronimoConnectionEventListener;
+import org.apache.geronimo.connector.outbound.SubjectSource;
 
 import javax.security.auth.Subject;
 import javax.resource.ResourceException;
@@ -31,6 +32,7 @@ import javax.resource.spi.ConnectionRequ
 import javax.resource.spi.ConnectionEventListener;
 import javax.resource.spi.LocalTransaction;
 import javax.resource.spi.ManagedConnectionMetaData;
+import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 import java.util.Set;
 import java.util.HashSet;
@@ -280,6 +282,30 @@ public class ConnectionTrackingCoordinat
         s.append(getClass().getName()).append("\n");
     }
 
+    @Override
+    public void setConnectionTracker(ConnectionTracker connectionTracker) {
+    }
+
+    @Override
+    public void unsetConnectionTracker() {
+    }
+
+    @Override
+    public void setTransactionManager(TransactionManager transactionManager) {
+    }
+
+    @Override
+    public void unsetTransactionManager() {
+    }
+
+    @Override
+    public void setSubjectSource(SubjectSource subjectSource) {
+    }
+
+    @Override
+    public void unsetSubjectSource() {
+    }
+
     private ConnectionInfo createConnectionInfo() {
         ConnectionInfo ci = new ConnectionInfo(mci);
         ci.setConnectionHandle(connection);

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java
Thu Feb 24 02:25:51 2011
@@ -23,6 +23,7 @@ import java.util.Set;
 
 import javax.resource.ResourceException;
 import javax.security.auth.Subject;
+import javax.transaction.TransactionManager;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.connector.outbound.ConnectionInfo;
@@ -31,6 +32,7 @@ import org.apache.geronimo.connector.out
 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.connector.outbound.SubjectSource;
 
 /**
  * @version $Rev$ $Date$
@@ -172,4 +174,28 @@ public class ConnectionTrackingCoordinat
         s.append("<end>");
     }
 
+    @Override
+    public void setConnectionTracker(ConnectionTracker connectionTracker) {
+    }
+
+    @Override
+    public void unsetConnectionTracker() {
+    }
+
+    @Override
+    public void setTransactionManager(TransactionManager transactionManager) {
+    }
+
+    @Override
+    public void unsetTransactionManager() {
+    }
+
+    @Override
+    public void setSubjectSource(SubjectSource subjectSource) {
+    }
+
+    @Override
+    public void unsetSubjectSource() {
+    }
+
 }

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1074024&r1=1074023&r2=1074024&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Thu Feb 24 02:25:51 2011
@@ -14,7 +14,8 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
---><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -212,10 +213,10 @@
                 <version>4.2.0</version>
             </dependency>
             <dependency>
-                 <groupId>org.apache.felix</groupId>
-                 <artifactId>org.apache.felix.scr</artifactId>
-                 <version>1.6.0</version>
-             </dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.scr</artifactId>
+                <version>1.6.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -264,11 +265,11 @@
     <modules>
         <module>geronimo-transaction</module>
         <module>geronimo-connector</module>
-        <module>geronimo-txmanager-server</module>
         <module>org.apache.geronimo.transaction</module>
         <module>org.apache.geronimo.transaction.kar</module>
-    <module>connector-itests</module>
-    <module>geronimo-mock-ra</module>
-  </modules>
+        <module>connector-itests</module>
+        <module>geronimo-mock-ra</module>
+        <module>geronimo-txmanager-server</module>
+    </modules>
 
 </project>
\ No newline at end of file



Mime
View raw message