geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r984329 - in /geronimo/server/branches/2.1: plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoInboundRecovery.java pom.xml
Date Wed, 11 Aug 2010 08:25:16 GMT
Author: djencks
Date: Wed Aug 11 08:25:16 2010
New Revision: 984329

URL: http://svn.apache.org/viewvc?rev=984329&view=rev
Log:
GERONIMO-5519 upgrade to latest 2.1.x tm to pick up recovery fix. The code change is to use
the new more-async recovery code

Modified:
    geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoInboundRecovery.java
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoInboundRecovery.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoInboundRecovery.java?rev=984329&r1=984328&r2=984329&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoInboundRecovery.java
(original)
+++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoInboundRecovery.java
Wed Aug 11 08:25:16 2010
@@ -20,14 +20,11 @@
 
 package org.apache.geronimo.openejb;
 
-import javax.resource.ResourceException;
 import javax.resource.spi.ActivationSpec;
 import javax.resource.spi.ResourceAdapter;
-import javax.transaction.xa.XAResource;
+import org.apache.geronimo.connector.ActivationSpecNamedXAResourceFactory;
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
-import org.apache.geronimo.transaction.manager.NamedXAResource;
 import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
-import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.core.mdb.InboundRecovery;
 
@@ -43,15 +40,6 @@ public class GeronimoInboundRecovery imp
     }
 
     public void recover(ResourceAdapter resourceAdapter, ActivationSpec activationSpec, String
containerId) throws OpenEJBException {
-        try {
-            XAResource[] xaress = resourceAdapter.getXAResources(new ActivationSpec[] {activationSpec});
-            if (xaress == null || xaress.length == 0) {
-                return;
-            }
-            NamedXAResource xares = new WrapperNamedXAResource(xaress[0], containerId);
-            transactionManager.recoverResourceManager(xares);
-        } catch (ResourceException e) {
-            throw new OpenEJBException("Could not recover resource manager", e);
-        }
+        transactionManager.registerNamedXAResourceFactory(new ActivationSpecNamedXAResourceFactory(containerId,
activationSpec, resourceAdapter));
     }
 }

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=984329&r1=984328&r2=984329&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Aug 11 08:25:16 2010
@@ -94,7 +94,7 @@
         <openjpaVersion>1.2.2</openjpaVersion>
         <xbeanVersion>3.6</xbeanVersion>
         <wadiVersion>2.0</wadiVersion>
-        <txmanagerVersion>2.1.4</txmanagerVersion>
+        <txmanagerVersion>2.1.5-SNAPSHOT</txmanagerVersion>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
@@ -2423,7 +2423,7 @@
                                 <requireJavaVersion>
                                     <version>[1.5,1.6)</version>
                                 </requireJavaVersion>
-                                
+
                                 <!-- Require Maven 2.0.9+ -->
                                 <requireMavenVersion>
                                     <version>[2.0.9,)</version>



Mime
View raw message