Author: dblevins
Date: Sat Dec 22 17:59:27 2007
New Revision: 606528
URL: http://svn.apache.org/viewvc?rev=606528&view=rev
Log:
updated the tomcat service-jar to use the DataSourceFactory that supports the
JtaManaged flag
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=606528&r1=606527&r2=606528&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
Sat Dec 22 17:59:27 2007
@@ -255,7 +255,21 @@
id="Default JDBC Database"
service="Resource"
types="javax.sql.DataSource, DataSource"
- class-name="org.apache.openejb.resource.jdbc.BasicManagedDataSource">
+ factory-name="create"
+ constructor="JtaManaged"
+ class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
+
+ # Determines wether or not this data source should be JTA managed
+ # or user managed. If set to 'true' it will automatically be enrolled
+ # in any ongoing transactions. Calling begin/commit/rollback or
setAutoCommit
+ # on the datasource or connection will not be allowed. If you need to
perform
+ # these functions yourself, set JtaManaged to 'false'
+ #
+ # In terms of JPA persistence.xml:
+ # "JtaManaged=true" can be used as a 'jta-data-source'
+ # "JtaManaged=false" can be used as a 'non-jta-data-source'
+
+ JtaManaged = true
# Driver class name
@@ -435,7 +449,11 @@
id="Default Unmanaged JDBC Database"
service="Resource"
types="javax.sql.DataSource, DataSource"
- class-name="org.apache.openejb.resource.jdbc.BasicDataSource">
+ factory-name="create"
+ constructor="JtaManaged"
+ class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
+
+ JtaManaged = false
# Driver class name
