You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/24 22:45:02 UTC
svn commit: r640590 - in /openejb/branches/openejb-3.0:
assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/
container/openejb-core/src/main/resources/META-INF/org.apache.openejb/
Author: dblevins
Date: Mon Mar 24 14:44:43 2008
New Revision: 640590
URL: http://svn.apache.org/viewvc?rev=640590&view=rev
Log:
Merging r639512 - http://svn.apache.org/viewvc?rev=639512&view=rev
svn merge -r 639511:639512 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r639512 | dain | 2008-03-20 18:38:07 -0700 (Thu, 20 Mar 2008) | 1 line
TxRecover is disabled by default for now
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Modified: openejb/branches/openejb-3.0/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/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=640590&r1=640589&r2=640590&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml (original)
+++ openejb/branches/openejb-3.0/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml Mon Mar 24 14:44:43 2008
@@ -195,7 +195,7 @@
# Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
# to log and recover in doubt transactions.
- TxRecovery true
+ TxRecovery false
</ServiceProvider>
@@ -290,7 +290,7 @@
# Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
# to log and recover in doubt transactions.
- TxRecovery true
+ TxRecovery false
# Driver class name
@@ -670,8 +670,7 @@
BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
- # ServerUrl vm://localhost?async=true
- ServerUrl tcp://localhost:61616
+ ServerUrl vm://localhost?async=true
# DataSource for persistence messages
DataSource Default Unmanaged JDBC Database
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=640590&r1=640589&r2=640590&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Mon Mar 24 14:44:43 2008
@@ -191,7 +191,7 @@
# Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
# to log and recover in doubt transactions.
- TxRecovery true
+ TxRecovery false
</ServiceProvider>
@@ -278,7 +278,7 @@
# Specifies whether to use NamedXAResource wrappers to allow the geronimo tm
# to log and recover in doubt transactions.
- TxRecovery true
+ TxRecovery false
# Driver class name
@@ -463,7 +463,7 @@
class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
JtaManaged = false
- TxRecovery true
+ TxRecovery false
# Driver class name
@@ -655,8 +655,7 @@
BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
- # ServerUrl vm://localhost?async=true
- ServerUrl tcp://localhost:61616
+ ServerUrl vm://localhost?async=true
# DataSource for persistence messages
DataSource Default Unmanaged JDBC Database