openejb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r670115 - in /openejb/trunk/openejb3: assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/ container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ container/openejb-core/src/main/jav...
Date Sat, 21 Jun 2008 01:48:41 GMT
Author: dblevins
Date: Fri Jun 20 18:48:40 2008
New Revision: 670115

URL: http://svn.apache.org/viewvc?rev=670115&view=rev
Log:
OPENEJB-825: Eliminate possible mismatch of TxRecovery flag between TransactionManager and
Resources

Added:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/XAResourceWrapper.java
Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/ManagedDataSourceWithRecovery.java
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
Fri Jun 20 18:48:40 2008
@@ -173,7 +173,7 @@
           id="Default MDB Container"
           service="Container"
           types="MESSAGE"
-          constructor="id, transactionManager, securityService, ResourceAdapter, MessageListenerInterface,
ActivationSpecClass, InstanceLimit, TxRecovery"
+          constructor="id, transactionManager, securityService, ResourceAdapter, MessageListenerInterface,
ActivationSpecClass, InstanceLimit"
           class-name="org.apache.openejb.core.mdb.MdbContainer">
 
     # The resource adapter delivers messages to the container
@@ -193,11 +193,6 @@
 
     InstanceLimit 10
 
-    # Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
-    # to log and recover in doubt transactions.
-    TxRecovery false
-
-
   </ServiceProvider>
 
   <!--
@@ -245,9 +240,10 @@
             service="TransactionManager"
             types="TransactionManager"
             factory-name="create"
-            constructor="defaultTransactionTimeoutSeconds, tmId, bufferClassName, bufferSizeKb,
checksumEnabled, adler32Checksum, flushSleepTimeMilliseconds, logFileDir, logFileExt, logFileName,
maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers, threadsWaitingForceThreshold"
+            constructor="defaultTransactionTimeoutSeconds, TxRecovery, tmId, bufferClassName,
bufferSizeKb, checksumEnabled, adler32Checksum, flushSleepTimeMilliseconds, logFileDir, logFileExt,
logFileName, maxBlocksPerFile, maxBuffers, maxLogFiles, minBuffers, threadsWaitingForceThreshold"
             class-name="org.apache.openejb.resource.GeronimoTransactionManagerFactory">
            defaultTransactionTimeoutSeconds 600
+           TxRecovery false
            bufferSizeKb 32
            checksumEnabled true
            adler32Checksum true
@@ -257,7 +253,6 @@
            logFileName howl
            maxBlocksPerFile -1
            maxBuffers 0
-        # set to 0 or less to disable transaction logging and recovery
            maxLogFiles 2
            minBuffers 4
            threadsWaitingForceThreshold -1
@@ -273,7 +268,7 @@
           service="Resource"
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
-          constructor="JtaManaged,TxRecovery"
+          constructor="JtaManaged"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
 
     # Determines wether or not this data source should be JTA managed
@@ -288,10 +283,6 @@
 
     JtaManaged = true
 
-    # Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
-    # to log and recover in doubt transactions.
-    TxRecovery false
-
     # Driver class name
 
     JdbcDriver org.hsqldb.jdbcDriver
@@ -471,11 +462,10 @@
           service="Resource"
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
-          constructor="JtaManaged,TxRecovery"
+          constructor="JtaManaged"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
 
     JtaManaged = false
-    TxRecovery = false
 
     # Driver class name
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
Fri Jun 20 18:48:40 2008
@@ -18,8 +18,8 @@
 package org.apache.openejb.core.mdb;
 
 import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.resource.XAResourceWrapper;
 import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.geronimo.transaction.manager.NamedXAResource;
 import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
 
 import javax.resource.spi.UnavailableException;
@@ -37,16 +37,16 @@
     private final MdbInstanceFactory instanceFactory;
     private final ClassLoader classLoader;
     private final Class[] interfaces;
-    private final boolean txRecovery;
+    private final XAResourceWrapper xaResourceWrapper;
 
-    public EndpointFactory(ActivationSpec activationSpec, MdbContainer container, CoreDeploymentInfo
deploymentInfo, MdbInstanceFactory instanceFactory, boolean txRecovery) {
+    public EndpointFactory(ActivationSpec activationSpec, MdbContainer container, CoreDeploymentInfo
deploymentInfo, MdbInstanceFactory instanceFactory, XAResourceWrapper xaResourceWrapper) {
         this.activationSpec = activationSpec;
         this.container = container;
         this.deploymentInfo = deploymentInfo;
         this.instanceFactory = instanceFactory;
         classLoader = container.getMessageListenerInterface().getClassLoader();
         interfaces = new Class[]{container.getMessageListenerInterface(), MessageEndpoint.class};
-        this.txRecovery = txRecovery;
+        this.xaResourceWrapper = xaResourceWrapper;
     }
 
     public ActivationSpec getActivationSpec() {
@@ -58,8 +58,8 @@
     }
 
     public MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException
{
-        if (txRecovery && xaResource != null) {
-            xaResource = new WrapperNamedXAResource(xaResource, container.getContainerID().toString());
+        if (xaResource != null && xaResourceWrapper != null) {
+            xaResource = xaResourceWrapper.wrap(xaResource, container.getContainerID().toString());
         }
         EndpointHandler endpointHandler = new EndpointHandler(container, deploymentInfo,
instanceFactory, xaResource);
         MessageEndpoint messageEndpoint = (MessageEndpoint) Proxy.newProxyInstance(classLoader,
interfaces, endpointHandler);

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
Fri Jun 20 18:48:40 2008
@@ -23,6 +23,8 @@
 import org.apache.openejb.ApplicationException;
 import org.apache.openejb.ContainerType;
 import org.apache.openejb.RpcContainer;
+import org.apache.openejb.resource.XAResourceWrapper;
+import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.core.BaseContext;
 import org.apache.openejb.core.CoreDeploymentInfo;
 import org.apache.openejb.core.Operation;
@@ -67,11 +69,11 @@
     private final Class messageListenerInterface;
     private final Class activationSpecClass;
     private final int instanceLimit;
-    private final boolean txRecovery;
 
     private final ConcurrentMap<Object, CoreDeploymentInfo> deployments = new ConcurrentHashMap<Object,
CoreDeploymentInfo>();
+    private final XAResourceWrapper xaResourceWrapper;
 
-    public MdbContainer(Object containerID, TransactionManager transactionManager, SecurityService
securityService, ResourceAdapter resourceAdapter, Class messageListenerInterface, Class activationSpecClass,
int instanceLimit, boolean txRecovery) {
+    public MdbContainer(Object containerID, TransactionManager transactionManager, SecurityService
securityService, ResourceAdapter resourceAdapter, Class messageListenerInterface, Class activationSpecClass,
int instanceLimit) {
         this.containerID = containerID;
         this.transactionManager = transactionManager;
         this.securityService = securityService;
@@ -79,7 +81,7 @@
         this.messageListenerInterface = messageListenerInterface;
         this.activationSpecClass = activationSpecClass;
         this.instanceLimit = instanceLimit;
-        this.txRecovery = txRecovery;
+        xaResourceWrapper = SystemInstance.get().getComponent(XAResourceWrapper.class);
     }
 
     public DeploymentInfo [] deployments() {
@@ -124,7 +126,7 @@
 
         // create the message endpoint
         MdbInstanceFactory instanceFactory = new MdbInstanceFactory(deploymentInfo, transactionManager,
securityService, instanceLimit);
-        EndpointFactory endpointFactory = new EndpointFactory(activationSpec, this, deploymentInfo,
instanceFactory, txRecovery);
+        EndpointFactory endpointFactory = new EndpointFactory(activationSpec, this, deploymentInfo,
instanceFactory, xaResourceWrapper);
 
         // update the data structures
         // this must be done before activating the endpoint since the ra may immedately begin
delivering messages

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
Fri Jun 20 18:48:40 2008
@@ -20,17 +20,16 @@
 
 package org.apache.openejb.resource;
 
-import java.io.IOException;
-
-import javax.transaction.xa.XAException;
-
 import org.apache.geronimo.transaction.log.HOWLLog;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.geronimo.transaction.manager.TransactionLog;
 import org.apache.geronimo.transaction.manager.XidFactory;
 import org.apache.geronimo.transaction.manager.XidFactoryImpl;
+import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
 import org.apache.openejb.loader.SystemInstance;
 
+import javax.transaction.xa.XAResource;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -58,6 +57,8 @@
         XidFactory xidFactory = null;
         TransactionLog txLog = null;
         if (txRecovery) {
+            SystemInstance.get().setComponent(XAResourceWrapper.class, new GeronimoXAResourceWrapper());
+            
             xidFactory = new XidFactoryImpl(tmId == null ? DEFAULT_TM_ID: tmId);
             txLog = new HOWLLog(bufferClassName == null ? "org.objectweb.howl.log.BlockLogBuffer"
: bufferClassName,
                     bufferSizeKb == 0 ? DEFAULT_BUFFER_SIZE : bufferSizeKb,
@@ -76,6 +77,13 @@
                     SystemInstance.get().getBase().getDirectory("."));
             ((HOWLLog)txLog).doStart();
         }
+
         return new GeronimoTransactionManager(defaultTransactionTimeoutSeconds, xidFactory,
txLog);
     }
+
+    public static class GeronimoXAResourceWrapper implements XAResourceWrapper {
+        public XAResource wrap(XAResource xaResource, String name) {
+            return new WrapperNamedXAResource(xaResource, name);
+        }
+    }
 }

Added: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/XAResourceWrapper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/XAResourceWrapper.java?rev=670115&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/XAResourceWrapper.java
(added)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/XAResourceWrapper.java
Fri Jun 20 18:48:40 2008
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  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.
+ */
+package org.apache.openejb.resource;
+
+import javax.transaction.xa.XAResource;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface XAResourceWrapper {
+    XAResource wrap(XAResource resource, String name);
+}

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
Fri Jun 20 18:48:40 2008
@@ -16,16 +16,20 @@
  */
 package org.apache.openejb.resource.jdbc;
 
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.resource.XAResourceWrapper;
+
 import javax.sql.DataSource;
 
 /**
  * @version $Rev$ $Date$
  */
 public class DataSourceFactory {
-    public static DataSource create(boolean managed, boolean txRecovery){
+    public static DataSource create(boolean managed){
         if (managed){
-            if (txRecovery) {
-                return new ManagedDataSourceWithRecovery();
+            XAResourceWrapper xaResourceWrapper = SystemInstance.get().getComponent(XAResourceWrapper.class);
+            if (xaResourceWrapper != null) {
+                return new ManagedDataSourceWithRecovery(xaResourceWrapper);
             } else {
                 return new BasicManagedDataSource();
             }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/ManagedDataSourceWithRecovery.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/ManagedDataSourceWithRecovery.java?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/ManagedDataSourceWithRecovery.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/ManagedDataSourceWithRecovery.java
Fri Jun 20 18:48:40 2008
@@ -17,11 +17,6 @@
  */
 package org.apache.openejb.resource.jdbc;
 
-import java.io.File;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import javax.sql.DataSource;
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;
 import javax.transaction.InvalidTransactionException;
@@ -33,11 +28,15 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
-import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
-import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.resource.XAResourceWrapper;
 
 public class ManagedDataSourceWithRecovery extends BasicManagedDataSource {
     private TransactionManager suppliedTransactionManager;
+    private final XAResourceWrapper xaResourceWrapper;
+
+    public ManagedDataSourceWithRecovery(XAResourceWrapper xaResourceWrapper) {
+        this.xaResourceWrapper = xaResourceWrapper;
+    }
 
     @Override
     public void setTransactionManager(TransactionManager transactionManager) {
@@ -46,7 +45,7 @@
 
     protected void wrapTransactionManager() {
         if (suppliedTransactionManager != null) {
-            super.setTransactionManager(new TransactionManagerWrapper(suppliedTransactionManager,
getUrl()));
+            super.setTransactionManager(new TransactionManagerWrapper(suppliedTransactionManager,
getUrl(), xaResourceWrapper));
         }
     }
 
@@ -54,10 +53,12 @@
 
         private final TransactionManager transactionManager;
         private final String name;
+        private final XAResourceWrapper xaResourceWrapper;
 
-        private TransactionManagerWrapper(TransactionManager transactionManager, String name)
{
+        private TransactionManagerWrapper(TransactionManager transactionManager, String name,
XAResourceWrapper xaResourceWrapper) {
             this.transactionManager = transactionManager;
             this.name = name;
+            this.xaResourceWrapper = xaResourceWrapper;
         }
 
         public void begin() throws NotSupportedException, SystemException {
@@ -74,7 +75,7 @@
 
         public Transaction getTransaction() throws SystemException {
             Transaction tx = transactionManager.getTransaction();
-            return tx == null? null: new TransactionWrapper(transactionManager.getTransaction(),
name);
+            return tx == null? null: new TransactionWrapper(transactionManager.getTransaction(),
name, xaResourceWrapper);
         }
 
         public void resume(Transaction transaction) throws IllegalStateException, InvalidTransactionException,
SystemException {
@@ -94,7 +95,7 @@
         }
 
         public Transaction suspend() throws SystemException {
-            return new TransactionWrapper(transactionManager.suspend(), name);
+            return new TransactionWrapper(transactionManager.suspend(), name, xaResourceWrapper);
         }
     }
 
@@ -102,10 +103,12 @@
 
         private final Transaction transaction;
         private final String name;
+        private final XAResourceWrapper xaResourceWrapper;
 
-        private TransactionWrapper(Transaction transaction, String name) {
+        private TransactionWrapper(Transaction transaction, String name, XAResourceWrapper
xaResourceWrapper) {
             this.transaction = transaction;
             this.name = name;
+            this.xaResourceWrapper = xaResourceWrapper;
         }
 
         public void commit() throws HeuristicMixedException, HeuristicRollbackException,
RollbackException, SecurityException, SystemException {
@@ -113,12 +116,12 @@
         }
 
         public boolean delistResource(XAResource xaResource, int i) throws IllegalStateException,
SystemException {
-            XAResource wrapper = new WrapperNamedXAResource(xaResource, name);
+            XAResource wrapper = xaResourceWrapper.wrap(xaResource, name);
             return transaction.delistResource(wrapper, i);
         }
 
         public boolean enlistResource(XAResource xaResource) throws IllegalStateException,
RollbackException, SystemException {
-            XAResource wrapper = new WrapperNamedXAResource(xaResource, name);
+            XAResource wrapper = xaResourceWrapper.wrap(xaResource, name);
             return transaction.enlistResource(wrapper);
         }
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
Fri Jun 20 18:48:40 2008
@@ -167,7 +167,7 @@
           id="Default MDB Container"
           service="Container"
           types="MESSAGE"
-          constructor="id, transactionManager, securityService, ResourceAdapter, MessageListenerInterface,
ActivationSpecClass, InstanceLimit, TxRecovery"
+          constructor="id, transactionManager, securityService, ResourceAdapter, MessageListenerInterface,
ActivationSpecClass, InstanceLimit"
           class-name="org.apache.openejb.core.mdb.MdbContainer">
 
     # The resource adapter delivers messages to the container
@@ -187,10 +187,6 @@
 
     InstanceLimit 10
 
-    # Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
-    # to log and recover in doubt transactions.
-    TxRecovery false
-
   </ServiceProvider>
 
   <!--
@@ -259,7 +255,7 @@
           service="Resource"
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
-          constructor="JtaManaged, TxRecovery"
+          constructor="JtaManaged"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
 
     # Determines wether or not this data source should be JTA managed
@@ -274,10 +270,6 @@
 
     JtaManaged = true
 
-    # Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
-    # to log and recover in doubt transactions.
-    TxRecovery false
-
     # Driver class name
 
     JdbcDriver org.hsqldb.jdbcDriver
@@ -457,11 +449,10 @@
           service="Resource"
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
-          constructor="JtaManaged, TxRecovery"
+          constructor="JtaManaged"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
 
     JtaManaged = false
-    TxRecovery = false
 
     # Driver class name
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=670115&r1=670114&r2=670115&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Fri Jun 20 18:48:40 2008
@@ -169,7 +169,7 @@
           id="Default MDB Container"
           service="Container"
           types="MESSAGE"
-          constructor="id, transactionManager, securityService, ResourceAdapter, MessageListenerInterface,
ActivationSpecClass, InstanceLimit, TxRecovery"
+          constructor="id, transactionManager, securityService, ResourceAdapter, MessageListenerInterface,
ActivationSpecClass, InstanceLimit"
           class-name="org.apache.openejb.core.mdb.MdbContainer">
 
     # The resource adapter delivers messages to the container
@@ -189,10 +189,6 @@
 
     InstanceLimit 10
 
-    # Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
-    # to log and recover in doubt transactions.
-    TxRecovery false
-
   </ServiceProvider>
 
   <!--
@@ -261,7 +257,7 @@
           service="Resource"
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
-          constructor="JtaManaged,TxRecovery"
+          constructor="JtaManaged"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
 
     # Determines wether or not this data source should be JTA managed
@@ -276,10 +272,6 @@
 
     JtaManaged = true
 
-    # Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
-    # to log and recover in doubt transactions.
-    TxRecovery false
-
     # Driver class name
 
     JdbcDriver org.hsqldb.jdbcDriver
@@ -459,12 +451,10 @@
           service="Resource"
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
-          constructor="JtaManaged,TxRecovery"
+          constructor="JtaManaged"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
 
     JtaManaged = false
-    TxRecovery false
-
 
     # Driver class name
 



Mime
View raw message