You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/06/25 18:52:15 UTC
svn commit: r550546 [1/2] - in /geronimo/server/trunk:
configs/client-transaction/src/plan/ configs/transaction-jta11/src/plan/
modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
modules/geronimo-connector-builde...
Author: djencks
Date: Mon Jun 25 09:52:11 2007
New Revision: 550546
URL: http://svn.apache.org/viewvc?view=rev&rev=550546
Log:
GERONIMO-906 Component references involved in transaction recovery are backwards. Unfortunately this change includes a lot of import optimizations, I hope they are not too confusing to review
Added:
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/RecoverableTransactionManager.java (with props)
Removed:
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/ResourceManager.java
Modified:
geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImpl.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImplGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImpl.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolConnectionInterceptor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolMatchAllConnectionInterceptor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionCachingInterceptor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/SharedConnectorInstanceContext.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/ResourcePrincipal.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPoolImpl.java
geronimo/server/trunk/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11.java
geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11GBean.java
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/MockResourceManager.java
geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
Modified: geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml Mon Jun 25 09:52:11 2007
@@ -54,14 +54,6 @@
<reference name="XidFactory">
<name>XidFactory</name>
</reference>
- <references name="ResourceManagers">
- <pattern>
- <type>JCAManagedConnectionFactory</type>
- </pattern>
- <pattern>
- <type>ActivationSpec</type>
- </pattern>
- </references>
</gbean>
<gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
Modified: geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction-jta11/src/plan/plan.xml Mon Jun 25 09:52:11 2007
@@ -82,14 +82,6 @@
<reference name="TransactionLog">
<name>HOWLTransactionLog</name>
</reference>
- <references name="ResourceManagers">
- <pattern>
- <type>JCAManagedConnectionFactory</type>
- </pattern>
- <pattern>
- <type>JCAActivationSpec</type>
- </pattern>
- </references>
</gbean>
<gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Mon Jun 25 09:52:11 2007
@@ -429,6 +429,7 @@
String activationSpecClassName = activationspec.getActivationspecClass().getStringValue().trim();
messageListenerToActivationSpecMap.put(messageListenerInterface, activationSpecClassName);
resourceAdapterGBeanData.setAttribute("messageListenerToActivationSpecMap", messageListenerToActivationSpecMap);
+ resourceAdapterGBeanData.setReferencePattern("TransactionManager", earContext.getTransactionManagerName());
}
}
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml Mon Jun 25 09:52:11 2007
@@ -218,9 +218,5 @@
<gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
<attribute name="defaultTransactionTimeoutSeconds">10</attribute>
- <references name="ResourceManagers">
- <pattern><name>JCAManagedConnectionFactory</name></pattern>
- <pattern><name>MessageDrivenBean</name></pattern>
- </references>
</gbean>
</application>
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapper.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapper.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapper.java Mon Jun 25 09:52:11 2007
@@ -21,12 +21,6 @@
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.ResourceAdapter;
import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.SystemException;
-import javax.transaction.xa.XAResource;
-
-import org.apache.geronimo.transaction.manager.NamedXAResource;
-import org.apache.geronimo.transaction.manager.ResourceManager;
-import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
/**
* Wrapper for ActivationSpec instances.
@@ -35,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public class ActivationSpecWrapper implements ResourceManager {
+public class ActivationSpecWrapper {
protected final ActivationSpec activationSpec;
@@ -101,6 +95,7 @@
resourceAdapterWrapper.registerResourceAdapterAssociation(activationSpec);
}
resourceAdapterWrapper.endpointActivation(messageEndpointFactory, activationSpec);
+ resourceAdapterWrapper.doRecovery(activationSpec, containerId);
}
public void deactivate(final MessageEndpointFactory messageEndpointFactory) {
@@ -111,26 +106,6 @@
//this should never happen, activation spec should have been registered with r.a.
throw new IllegalStateException("ActivationSpec was never registered with ResourceAdapter");
}
- }
-
- //Operations.
- public NamedXAResource getRecoveryXAResources() throws SystemException {
- if (resourceAdapterWrapper == null) {
- throw new IllegalStateException("Attempting to use activation spec when it is not activated");
- }
- try {
- XAResource[] xaResources = resourceAdapterWrapper.getXAResources(new ActivationSpec[]{activationSpec});
- if (xaResources == null || xaResources.length == 0) {
- return null;
- }
- return new WrapperNamedXAResource(xaResources[0], containerId);
- } catch (ResourceException e) {
- throw (SystemException) new SystemException("Could not get XAResource for recovery for mdb: " + containerId).initCause(e);
- }
- }
-
- public void returnResource(NamedXAResource xaResource) {
- //do nothing, no way to return anything.
}
}
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java Mon Jun 25 09:52:11 2007
@@ -19,12 +19,11 @@
import javax.resource.spi.endpoint.MessageEndpointFactory;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.DynamicGBean;
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.transaction.manager.ResourceManager;
/**
*
@@ -94,8 +93,6 @@
infoBuilder.addOperation("activate", new Class[]{MessageEndpointFactory.class});
infoBuilder.addOperation("deactivate", new Class[]{MessageEndpointFactory.class});
-
- infoBuilder.addInterface(ResourceManager.class);
infoBuilder.setConstructor(new String[]{
"activationSpecClass",
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java Mon Jun 25 09:52:11 2007
@@ -17,15 +17,15 @@
package org.apache.geronimo.connector;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.DynamicGBean;
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
-import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.management.geronimo.JCAAdminObject;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.lang.reflect.Constructor;
/**
* Wrapper around AdminObject that exposes its config-properties as GBeanAttributes and
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java Mon Jun 25 09:52:11 2007
@@ -17,9 +17,9 @@
package org.apache.geronimo.connector;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.management.geronimo.JCAAdminObject;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java Mon Jun 25 09:52:11 2007
@@ -22,14 +22,14 @@
import java.io.InputStreamReader;
import java.net.URL;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.SQLException;
+import java.sql.Statement;
import javax.sql.DataSource;
+import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java Mon Jun 25 09:52:11 2007
@@ -17,9 +17,10 @@
package org.apache.geronimo.connector;
import java.util.Timer;
-import javax.resource.spi.work.WorkManager;
-import javax.resource.spi.XATerminator;
+
import javax.resource.spi.UnavailableException;
+import javax.resource.spi.XATerminator;
+import javax.resource.spi.work.WorkManager;
/**
* GBean BootstrapContext implementation that refers to externally configured WorkManager
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImpl.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImpl.java Mon Jun 25 09:52:11 2007
@@ -16,20 +16,20 @@
*/
package org.apache.geronimo.connector;
-import org.apache.geronimo.management.geronimo.JCAResource;
-import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
-import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
-import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-import org.apache.geronimo.management.geronimo.JCAAdminObject;
-import org.apache.geronimo.j2ee.management.impl.Util;
-
-import java.util.Collection;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+
+import org.apache.geronimo.j2ee.management.impl.Util;
+import org.apache.geronimo.management.geronimo.JCAAdminObject;
+import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
+import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.geronimo.JCAResource;
+import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImplGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImplGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImplGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/JCAResourceImplGBean.java Mon Jun 25 09:52:11 2007
@@ -20,10 +20,10 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
-import org.apache.geronimo.management.geronimo.JCAResource;
-import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
import org.apache.geronimo.management.geronimo.JCAAdminObject;
+import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
+import org.apache.geronimo.management.geronimo.JCAResource;
+import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
public class JCAResourceImplGBean {
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImpl.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImpl.java Mon Jun 25 09:52:11 2007
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.connector;
-import org.apache.geronimo.management.geronimo.ResourceAdapter;
import org.apache.geronimo.management.geronimo.JCAResource;
+import org.apache.geronimo.management.geronimo.ResourceAdapter;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java Mon Jun 25 09:52:11 2007
@@ -20,8 +20,8 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.management.geronimo.ResourceAdapter;
import org.apache.geronimo.management.geronimo.JCAResource;
+import org.apache.geronimo.management.geronimo.ResourceAdapter;
public class ResourceAdapterImplGBean {
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java Mon Jun 25 09:52:11 2007
@@ -18,6 +18,7 @@
import java.util.Hashtable;
import java.util.Map;
+
import javax.management.ObjectName;
import org.apache.geronimo.gbean.GBeanData;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java Mon Jun 25 09:52:11 2007
@@ -17,6 +17,8 @@
package org.apache.geronimo.connector;
+import java.util.Map;
+
import javax.resource.ResourceException;
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.BootstrapContext;
@@ -24,8 +26,12 @@
import javax.resource.spi.ResourceAdapterAssociation;
import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.transaction.SystemException;
import javax.transaction.xa.XAResource;
-import java.util.Map;
+
+import org.apache.geronimo.transaction.manager.NamedXAResource;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
/**
* Dynamic GBean wrapper around a ResourceAdapter object, exposing the config-properties as
@@ -45,6 +51,8 @@
private final Map<String,String> messageListenerToActivationSpecMap;
+ private final RecoverableTransactionManager transactionManager;
+
/**
* default constructor for enhancement proxy endpoint
@@ -55,12 +63,14 @@
this.bootstrapContext = null;
this.resourceAdapter = null;
this.messageListenerToActivationSpecMap = null;
+ this.transactionManager = null;
}
public ResourceAdapterWrapper(String name,
String resourceAdapterClass,
- Map<String,String> messageListenerToActivationSpecMap,
+ Map<String, String> messageListenerToActivationSpecMap,
BootstrapContext bootstrapContext,
+ RecoverableTransactionManager transactionManager,
ClassLoader cl) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
this.name = name;
this.resourceAdapterClass = resourceAdapterClass;
@@ -68,14 +78,16 @@
Class clazz = cl.loadClass(resourceAdapterClass);
resourceAdapter = (ResourceAdapter) clazz.newInstance();
this.messageListenerToActivationSpecMap = messageListenerToActivationSpecMap;
+ this.transactionManager = transactionManager;
}
- public ResourceAdapterWrapper(String name, ResourceAdapter resourceAdapter, Map<String,String> messageListenerToActivationSpecMap, BootstrapContext bootstrapContext) {
+ public ResourceAdapterWrapper(String name, ResourceAdapter resourceAdapter, Map<String, String> messageListenerToActivationSpecMap, BootstrapContext bootstrapContext, RecoverableTransactionManager transactionManager) {
this.name = name;
this.resourceAdapterClass = resourceAdapter.getClass().getName();
this.bootstrapContext = bootstrapContext;
this.resourceAdapter = resourceAdapter;
this.messageListenerToActivationSpecMap = messageListenerToActivationSpecMap;
+ this.transactionManager = transactionManager;
}
public String getName() {
@@ -109,6 +121,20 @@
//endpoint handling
public void endpointActivation(final MessageEndpointFactory messageEndpointFactory, final ActivationSpec activationSpec) throws ResourceException {
resourceAdapter.endpointActivation(messageEndpointFactory, activationSpec);
+ }
+
+ public void doRecovery(ActivationSpec activationSpec, String containerId) {
+ try {
+ XAResource[] xaResources = getXAResources(new ActivationSpec[]{activationSpec});
+ if (xaResources == null || xaResources.length == 0) {
+ return;
+ }
+ NamedXAResource xaResource = new WrapperNamedXAResource(xaResources[0], containerId);
+ transactionManager.recoverResourceManager(xaResource);
+ } catch (ResourceException e) {
+ transactionManager.recoveryError((SystemException) new SystemException("Could not get XAResource for recovery for mdb: " + containerId).initCause(e));
+ }
+
}
public void endpointDeactivation(final MessageEndpointFactory messageEndpointFactory, final ActivationSpec activationSpec) {
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java Mon Jun 25 09:52:11 2007
@@ -17,6 +17,13 @@
package org.apache.geronimo.connector;
+import java.util.Map;
+
+import javax.resource.spi.ResourceAdapter;
+import javax.resource.spi.ResourceAdapterAssociation;
+import javax.resource.spi.XATerminator;
+import javax.resource.spi.work.WorkManager;
+
import org.apache.geronimo.gbean.DynamicGBean;
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -24,12 +31,7 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
-
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterAssociation;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.work.WorkManager;
-import java.util.Map;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
/**
*
@@ -45,8 +47,8 @@
objectName = null;
}
- public ResourceAdapterWrapperGBean(String resourceAdapterClass, Map<String,String> messageListenerToActivationSpecMap, WorkManager workManager, XATerminator xaTerminator, ClassLoader cl, String objectName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
- super(objectName, resourceAdapterClass, messageListenerToActivationSpecMap, new GeronimoBootstrapContext (workManager, xaTerminator), cl);
+ public ResourceAdapterWrapperGBean(String resourceAdapterClass, Map<String, String> messageListenerToActivationSpecMap, WorkManager workManager, XATerminator xaTerminator, RecoverableTransactionManager transactionManager, ClassLoader cl, String objectName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ super(objectName, resourceAdapterClass, messageListenerToActivationSpecMap, new GeronimoBootstrapContext (workManager, xaTerminator), transactionManager, cl);
delegate = new DynamicGBeanDelegate();
delegate.addAll(resourceAdapter);
this.objectName = objectName;
@@ -92,13 +94,14 @@
infoBuilder.addReference("WorkManager", WorkManager.class, NameFactory.JCA_WORK_MANAGER);
infoBuilder.addReference("XATerminator", XATerminator.class, NameFactory.JCA_WORK_MANAGER);
+ infoBuilder.addReference("TransactionManager", RecoverableTransactionManager.class, NameFactory.TRANSACTION_MANAGER);
infoBuilder.addOperation("registerResourceAdapterAssociation", new Class[]{ResourceAdapterAssociation.class});
infoBuilder.addInterface(ResourceAdapter.class);
infoBuilder.addInterface(JCAResourceAdapter.class);
- infoBuilder.setConstructor(new String[]{"resourceAdapterClass", "messageListenerToActivationSpecMap", "WorkManager", "XATerminator", "classLoader", "objectName"});
+ infoBuilder.setConstructor(new String[]{"resourceAdapterClass", "messageListenerToActivationSpecMap", "WorkManager", "XATerminator", "TransactionManager", "classLoader", "objectName"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java Mon Jun 25 09:52:11 2007
@@ -22,23 +22,28 @@
import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.LazyAssociatableConnectionManager;
import javax.resource.spi.ManagedConnectionFactory;
+import javax.transaction.SystemException;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
import org.apache.geronimo.transaction.manager.NamedXAResource;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
/**
* @version $Rev$ $Date$
*/
public abstract class AbstractConnectionManager implements ConnectionManagerContainer, ConnectionManager, LazyAssociatableConnectionManager, PoolingAttributes {
protected final Interceptors interceptors;
+ private final RecoverableTransactionManager transactionManager;
//default constructor for use as endpoint
public AbstractConnectionManager() {
interceptors = null;
+ transactionManager = null;
}
- public AbstractConnectionManager(Interceptors interceptors) {
+ public AbstractConnectionManager(Interceptors interceptors, RecoverableTransactionManager transactionManager) {
this.interceptors = interceptors;
+ this.transactionManager = transactionManager;
}
public Object createConnectionFactory(ManagedConnectionFactory mcf) throws ResourceException {
@@ -49,6 +54,27 @@
return this;
}
+ public void doRecovery(ManagedConnectionFactory managedConnectionFactory) {
+ try {
+ if (!getIsRecoverable()) {
+ return;
+ }
+ ManagedConnectionInfo mci = new ManagedConnectionInfo(managedConnectionFactory, null);
+
+ ConnectionInfo recoveryConnectionInfo = new ConnectionInfo(mci);
+ getRecoveryStack().getConnection(recoveryConnectionInfo);
+
+ // For pooled resources, we may now have a new MCI (not the one constructed above). Make sure we use the correct MCI
+ NamedXAResource xaResource = (NamedXAResource) recoveryConnectionInfo.getManagedConnectionInfo().getXAResource();
+ if (xaResource != null) {
+ transactionManager.recoverResourceManager(xaResource);
+ getRecoveryStack().returnConnection(recoveryConnectionInfo, ConnectionReturnAction.DESTROY);
+ }
+ } catch (ResourceException e) {
+ transactionManager.recoveryError((SystemException)new SystemException("Could not obtain recovery XAResource for managedConnectionFactory " + managedConnectionFactory).initCause(e));
+ }
+ }
+
/**
* in: mcf != null, is a deployed mcf
* out: useable connection object.
@@ -83,23 +109,6 @@
ConnectionInterceptor getConnectionInterceptor() {
return getStack();
- }
-
-
- public ConnectionManagerContainer.ReturnableXAResource getRecoveryXAResource(ManagedConnectionFactory managedConnectionFactory) throws ResourceException {
- ManagedConnectionInfo mci = new ManagedConnectionInfo(managedConnectionFactory, null);
-
- // if we aren't recoverable, then there's nothing to do...
- if (!getIsRecoverable()) {
- return null;
- }
-
- ConnectionInfo recoveryConnectionInfo = new ConnectionInfo(mci);
- getRecoveryStack().getConnection(recoveryConnectionInfo);
-
- // For pooled resources, we may now have a new MCI (not the one constructed above). Make sure we use the correct MCI
- NamedXAResource namedXAResource = (NamedXAResource) recoveryConnectionInfo.getManagedConnectionInfo().getXAResource();
- return new ConnectionManagerContainer.ReturnableXAResource(namedXAResource, getRecoveryStack(), recoveryConnectionInfo);
}
//statistics
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java Mon Jun 25 09:52:11 2007
@@ -16,22 +16,22 @@
*/
package org.apache.geronimo.connector.outbound;
-import java.util.TimerTask;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.resource.spi.ManagedConnectionFactory;
-import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.ResourceException;
+import javax.resource.spi.ConnectionRequestInfo;
+import javax.resource.spi.ManagedConnectionFactory;
import javax.security.auth.Subject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java Mon Jun 25 09:52:11 2007
@@ -19,12 +19,6 @@
import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnectionFactory;
-import javax.resource.spi.ConnectionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import org.apache.geronimo.transaction.manager.NamedXAResource;
/**
* ConnectionManagerContainer
@@ -35,71 +29,6 @@
Object createConnectionFactory(ManagedConnectionFactory mcf) throws ResourceException;
- ReturnableXAResource getRecoveryXAResource(ManagedConnectionFactory managedConnectionFactory) throws ResourceException;
-
- public class ReturnableXAResource implements NamedXAResource {
- private final ConnectionInterceptor stack;
- private final ConnectionInfo connectionInfo;
- private final NamedXAResource delegate;
-
- public ReturnableXAResource(NamedXAResource delegate, ConnectionInterceptor stack, ConnectionInfo connectionInfo) {
- this.delegate = delegate;
- this.stack = stack;
- this.connectionInfo = connectionInfo;
- }
-
- public void returnConnection() {
- stack.returnConnection(connectionInfo, ConnectionReturnAction.DESTROY);
- }
-
- public String getName() {
- return delegate.getName();
- }
-
- public void commit(Xid xid, boolean onePhase) throws XAException {
- delegate.commit(xid, onePhase);
- }
-
- public void end(Xid xid, int flags) throws XAException {
- delegate.end(xid, flags);
- }
-
- public void forget(Xid xid) throws XAException {
- delegate.forget(xid);
- }
-
- public int getTransactionTimeout() throws XAException {
- return delegate.getTransactionTimeout();
- }
-
- public boolean isSameRM(XAResource other) throws XAException {
- if (other instanceof ReturnableXAResource) {
- return delegate.isSameRM(((ReturnableXAResource)other).delegate);
- }
- return delegate.isSameRM(other);
- }
-
- public int prepare(Xid xid) throws XAException {
- return delegate.prepare(xid);
- }
-
- public Xid[] recover(int flag) throws XAException {
- return delegate.recover(flag);
- }
-
- public void rollback(Xid xid) throws XAException {
- delegate.rollback(xid);
- }
-
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return delegate.setTransactionTimeout(seconds);
- }
-
- public void start(Xid xid, int flags) throws XAException {
- delegate.start(xid, flags);
- }
-
-
- }
+ void doRecovery(ManagedConnectionFactory managedConnectionFactory);
}
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java Mon Jun 25 09:52:11 2007
@@ -19,12 +19,13 @@
import javax.transaction.TransactionManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
/**
* GenericConnectionManager sets up a connection manager stack according to the
@@ -44,10 +45,10 @@
PoolingSupport pooling,
boolean containerManagedSecurity,
ConnectionTracker connectionTracker,
- TransactionManager transactionManager,
+ RecoverableTransactionManager transactionManager,
String objectName,
ClassLoader classLoader) {
- super(new InterceptorsImpl(transactionSupport, pooling, containerManagedSecurity, objectName, connectionTracker, transactionManager, classLoader));
+ super(new InterceptorsImpl(transactionSupport, pooling, containerManagedSecurity, objectName, connectionTracker, transactionManager, classLoader), transactionManager);
}
private static class InterceptorsImpl implements AbstractConnectionManager.Interceptors {
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java Mon Jun 25 09:52:11 2007
@@ -39,6 +39,7 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.KernelRegistry;
import org.apache.geronimo.kernel.proxy.ProxyManager;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
/**
* @version $Revision$
@@ -59,7 +60,7 @@
PoolingSupport pooling,
boolean containerManagedSecurity,
ConnectionTracker connectionTracker,
- TransactionManager transactionManager,
+ RecoverableTransactionManager transactionManager,
String objectName,
AbstractName abstractName,
ClassLoader classLoader,
@@ -124,7 +125,7 @@
infoBuilder.addAttribute("kernel", Kernel.class, false);
infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
- infoBuilder.addReference("TransactionManager", TransactionManager.class, NameFactory.TRANSACTION_MANAGER);
+ infoBuilder.addReference("TransactionManager", RecoverableTransactionManager.class, NameFactory.TRANSACTION_MANAGER);
infoBuilder.setConstructor(new String[]{
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java Mon Jun 25 09:52:11 2007
@@ -18,9 +18,9 @@
package org.apache.geronimo.connector.outbound;
import java.util.ArrayList;
-import java.util.List;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import javax.resource.spi.ConnectionEvent;
import javax.resource.spi.ConnectionEventListener;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java Mon Jun 25 09:52:11 2007
@@ -16,13 +16,14 @@
*/
package org.apache.geronimo.connector.outbound;
+import java.util.Hashtable;
+
+import javax.management.ObjectName;
+
import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
import org.apache.geronimo.kernel.ObjectNameUtil;
import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-
-import javax.management.ObjectName;
-import java.util.Hashtable;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Mon Jun 25 09:52:11 2007
@@ -25,7 +25,6 @@
import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.ResourceAdapterAssociation;
-import javax.transaction.SystemException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,13 +35,11 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-import org.apache.geronimo.transaction.manager.NamedXAResource;
-import org.apache.geronimo.transaction.manager.ResourceManager;
/**
* @version $Rev$ $Date$
*/
-public class ManagedConnectionFactoryWrapper implements GBeanLifecycle, DynamicGBean, ResourceManager, JCAManagedConnectionFactory, ConnectionFactorySource {
+public class ManagedConnectionFactoryWrapper implements GBeanLifecycle, DynamicGBean, JCAManagedConnectionFactory, ConnectionFactorySource {
private static final Log log = LogFactory.getLog(ManagedConnectionFactoryWrapper.class);
@@ -165,7 +162,7 @@
registered = true;
log.debug("Registered managedConnectionFactory with ResourceAdapter " + resourceAdapterWrapper.toString());
}
-
+ connectionManagerContainer.doRecovery(managedConnectionFactory);
}
public void doStop() {
@@ -271,19 +268,6 @@
public Object getConfigProperty(String property) throws Exception {
return delegate.getAttribute(property);
- }
-
- //ResourceManager implementation
- public NamedXAResource getRecoveryXAResources() throws SystemException {
- try {
- return connectionManagerContainer.getRecoveryXAResource(managedConnectionFactory);
- } catch (ResourceException e) {
- throw (SystemException) new SystemException("Could not obtain recovery XAResource for managedConnectionFactory " + objectName).initCause(e);
- }
- }
-
- public void returnResource(NamedXAResource xaResource) {
- ((ConnectionManagerContainer.ReturnableXAResource) xaResource).returnConnection();
}
public String getObjectName() {
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java Mon Jun 25 09:52:11 2007
@@ -17,13 +17,11 @@
package org.apache.geronimo.connector.outbound;
import org.apache.geronimo.connector.ResourceAdapterWrapper;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.transaction.manager.ResourceManager;
-import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
/**
*
@@ -50,9 +48,6 @@
infoFactory.addOperation("$getResource");
infoFactory.addOperation("$getConnectionFactory");
infoFactory.addOperation("$getManagedConnectionFactory");
-
- infoFactory.addInterface(ResourceManager.class);
- infoFactory.addInterface(JCAManagedConnectionFactory.class);
infoFactory.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
infoFactory.addReference("ConnectionManagerContainer", ConnectionManagerContainer.class, NameFactory.JCA_CONNECTION_MANAGER);
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java Mon Jun 25 09:52:11 2007
@@ -18,8 +18,8 @@
package org.apache.geronimo.connector.outbound;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionRequestInfo;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolConnectionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolConnectionInterceptor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolConnectionInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolConnectionInterceptor.java Mon Jun 25 09:52:11 2007
@@ -18,8 +18,9 @@
package org.apache.geronimo.connector.outbound;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Arrays;
+import java.util.Collections;
+
import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnection;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolMatchAllConnectionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolMatchAllConnectionInterceptor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolMatchAllConnectionInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SinglePoolMatchAllConnectionInterceptor.java Mon Jun 25 09:52:11 2007
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnection;
import javax.resource.spi.ManagedConnectionFactory;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionCachingInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionCachingInterceptor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionCachingInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TransactionCachingInterceptor.java Mon Jun 25 09:52:11 2007
@@ -21,15 +21,16 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+
import javax.resource.ResourceException;
+import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import javax.transaction.SystemException;
-import org.apache.geronimo.connector.ConnectorTransactionContext;
-import org.apache.geronimo.connector.ConnectionReleaser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.connector.ConnectionReleaser;
+import org.apache.geronimo.connector.ConnectorTransactionContext;
/**
* TransactionCachingInterceptor.java
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/TxUtil.java Mon Jun 25 09:52:11 2007
@@ -16,10 +16,10 @@
*/
package org.apache.geronimo.connector.outbound;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
import javax.transaction.Status;
import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/SinglePool.java Mon Jun 25 09:52:11 2007
@@ -18,9 +18,9 @@
package org.apache.geronimo.connector.outbound.connectionmanagerconfig;
import org.apache.geronimo.connector.outbound.ConnectionInterceptor;
+import org.apache.geronimo.connector.outbound.PoolingAttributes;
import org.apache.geronimo.connector.outbound.SinglePoolConnectionInterceptor;
import org.apache.geronimo.connector.outbound.SinglePoolMatchAllConnectionInterceptor;
-import org.apache.geronimo.connector.outbound.PoolingAttributes;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java Mon Jun 25 09:52:11 2007
@@ -17,11 +17,11 @@
package org.apache.geronimo.connector.outbound.connectiontracking;
+import javax.resource.ResourceException;
+
import org.apache.geronimo.connector.outbound.ConnectionInfo;
-import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
-
-import javax.resource.ResourceException;
+import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
/**
*
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java Mon Jun 25 09:52:11 2007
@@ -17,26 +17,27 @@
package org.apache.geronimo.connector.outbound.connectiontracking;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
import javax.resource.ResourceException;
import javax.resource.spi.DissociatableManagedConnection;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.connector.outbound.ConnectionInfo;
+import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
-import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
/**
* ConnectionTrackingCoordinator tracks connections that are in use by
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java Mon Jun 25 09:52:11 2007
@@ -16,12 +16,12 @@
*/
package org.apache.geronimo.connector.outbound.connectiontracking;
-import javax.transaction.Transaction;
import javax.resource.ResourceException;
+import javax.transaction.Transaction;
-import org.apache.geronimo.transaction.manager.TransactionManagerMonitor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.transaction.manager.TransactionManagerMonitor;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/SharedConnectorInstanceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/SharedConnectorInstanceContext.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/SharedConnectorInstanceContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/SharedConnectorInstanceContext.java Mon Jun 25 09:52:11 2007
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
-
/**
* @version $Rev$ $Date$
*/
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java Mon Jun 25 09:52:11 2007
@@ -20,8 +20,8 @@
import java.io.IOException;
import java.util.Map;
-import javax.resource.spi.security.PasswordCredential;
import javax.resource.spi.ManagedConnectionFactory;
+import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java Mon Jun 25 09:52:11 2007
@@ -17,10 +17,11 @@
package org.apache.geronimo.connector.outbound.security;
import java.util.Properties;
+
import javax.resource.spi.ManagedConnectionFactory;
-import org.apache.geronimo.security.jaas.LoginModuleGBean;
import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.security.jaas.LoginModuleGBean;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java Mon Jun 25 09:52:11 2007
@@ -16,11 +16,11 @@
*/
package org.apache.geronimo.connector.outbound.security;
+import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.security.jaas.LoginModuleGBean;
-import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/ResourcePrincipal.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/ResourcePrincipal.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/ResourcePrincipal.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/ResourcePrincipal.java Mon Jun 25 09:52:11 2007
@@ -17,8 +17,8 @@
package org.apache.geronimo.connector.outbound.security;
-import java.security.Principal;
import java.io.Serializable;
+import java.security.Principal;
/**
*
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java Mon Jun 25 09:52:11 2007
@@ -17,14 +17,14 @@
package org.apache.geronimo.connector.work;
+import java.util.concurrent.Executor;
+
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkCompletedException;
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkListener;
import javax.resource.spi.work.WorkManager;
-
-import java.util.concurrent.Executor;
import org.apache.geronimo.connector.work.pool.ScheduleWorkExecutor;
import org.apache.geronimo.connector.work.pool.StartWorkExecutor;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java Mon Jun 25 09:52:11 2007
@@ -17,13 +17,13 @@
package org.apache.geronimo.connector.work;
+import java.util.concurrent.Executor;
+
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.transaction.manager.XAWork;
-
-import java.util.concurrent.Executor;
/**
*
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java Mon Jun 25 09:52:11 2007
@@ -17,6 +17,8 @@
package org.apache.geronimo.connector.work;
+import java.util.concurrent.CountDownLatch;
+
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkAdapter;
@@ -26,16 +28,14 @@
import javax.resource.spi.work.WorkListener;
import javax.resource.spi.work.WorkManager;
import javax.resource.spi.work.WorkRejectedException;
-import javax.transaction.xa.XAException;
import javax.transaction.InvalidTransactionException;
import javax.transaction.SystemException;
+import javax.transaction.xa.XAException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.geronimo.transaction.manager.ImportedTransactionActiveException;
import org.apache.geronimo.transaction.manager.XAWork;
-import java.util.concurrent.CountDownLatch;
/**
* Work wrapper providing an execution context to a Work instance.
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java Mon Jun 25 09:52:11 2007
@@ -17,11 +17,11 @@
package org.apache.geronimo.connector.work.pool;
+import java.util.concurrent.Executor;
+
import javax.resource.spi.work.WorkException;
import org.apache.geronimo.connector.work.WorkerContext;
-
-import java.util.concurrent.Executor;
/**
*
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java Mon Jun 25 09:52:11 2007
@@ -17,12 +17,12 @@
package org.apache.geronimo.connector.work.pool;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+
import javax.resource.spi.work.WorkException;
import org.apache.geronimo.connector.work.WorkerContext;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.CountDownLatch;
/**
*
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java Mon Jun 25 09:52:11 2007
@@ -17,12 +17,12 @@
package org.apache.geronimo.connector.work.pool;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+
import javax.resource.spi.work.WorkException;
import org.apache.geronimo.connector.work.WorkerContext;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.CountDownLatch;
/**
*
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java Mon Jun 25 09:52:11 2007
@@ -16,9 +16,9 @@
*/
package org.apache.geronimo.connector.work.pool;
-import javax.resource.spi.work.WorkException;
-
import java.util.concurrent.Executor;
+
+import javax.resource.spi.work.WorkException;
import org.apache.geronimo.connector.work.WorkerContext;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPoolImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPoolImpl.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPoolImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPoolImpl.java Mon Jun 25 09:52:11 2007
@@ -17,9 +17,9 @@
package org.apache.geronimo.connector.work.pool;
+import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.LinkedBlockingQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: geronimo/server/trunk/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java Mon Jun 25 09:52:11 2007
@@ -19,27 +19,28 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.security.auth.Subject;
-import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
+import org.apache.geronimo.connector.mock.ConnectionExtension;
import org.apache.geronimo.connector.mock.MockConnectionFactory;
import org.apache.geronimo.connector.mock.MockManagedConnection;
import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
-import org.apache.geronimo.connector.mock.ConnectionExtension;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
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.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.security.ContextManager;
import org.apache.geronimo.testsupport.TestSupport;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
/**
* ???
@@ -63,7 +64,7 @@
protected String name = "testCF";
//dependencies
protected ConnectionTrackingCoordinator connectionTrackingCoordinator;
- protected TransactionManager transactionManager;
+ protected RecoverableTransactionManager transactionManager;
protected AbstractConnectionManager connectionManagerDeployment;
protected MockConnectionFactory connectionFactory;
protected MockManagedConnectionFactory mockManagedConnectionFactory;
Modified: geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11.java?view=diff&rev=550546&r1=550545&r2=550546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11.java (original)
+++ geronimo/server/trunk/modules/geronimo-transaction-jta11/src/main/java/org/apache/geronimo/transaction/jta11/GeronimoTransactionManagerJTA11.java Mon Jun 25 09:52:11 2007
@@ -17,8 +17,6 @@
package org.apache.geronimo.transaction.jta11;
-import java.util.Collection;
-
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAException;
@@ -41,8 +39,8 @@
super(defaultTransactionTimeoutSeconds, transactionLog);
}
- public GeronimoTransactionManagerJTA11(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
- super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog, resourceManagers);
+ public GeronimoTransactionManagerJTA11(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog) throws XAException {
+ super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog);
}
}