jcscoobyrs 2005/09/19 18:15:12
Modified: modules/core/src/conf default.cmp_local_tx_database.xml
default.cmp_global_tx_database.xml
Log:
Updated for OPENEJB-58. Updated Castor support to 0.9.9M2. Instructions in
the Jira for working around castor-0.9.9.0.jar not being in Maven.
Revision Changes Path
1.2 +48 -43
openejb1/modules/core/src/conf/default.cmp_local_tx_database.xml
Index: default.cmp_local_tx_database.xml
===================================================================
RCS file:
/scm/openejb/openejb1/modules/core/src/conf/default.cmp_local_tx_database.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.cmp_local_tx_database.xml 26 Mar 2004 21:41:19 -0000 1.1
+++ default.cmp_local_tx_database.xml 19 Sep 2005 22:15:12 -0000 1.2
@@ -1,48 +1,53 @@
-<!DOCTYPE databases PUBLIC "-//EXOLAB/Castor JDO Configuration DTD Version
1.0//EN"
+<!DOCTYPE jdo-conf PUBLIC "-//EXOLAB/Castor JDO Configuration DTD Version
1.0//EN"
"http://castor.exolab.org/jdo-conf.dtd";>
-
-
<!--
-======================================================
-Local Transaction Database file for Container-Managed
-Persistence EntityBeans in the Default CMP Container
-======================================================
-
-Referenced By:
- conf/default.service-jar.xml
-
-References To:
- conf/default.cmp_mapping.xml
-
-This is the Local_TX_Database file for the Default CMP
-Container defined in the conf/service-jar.xml file.
-
-Other CMP containers can be configured. Each container
-will need a Local_TX_Database file like this one, plus
-a Global_TX_Database file and a mapping file.
-
-This configuration is used for local or unspecified
-transaction contexts. This will be used when the
-TransactionManager is not managing the transaction,
-such as when the tx attribute is Supports (no client
-tx), NotSupported, or Never.
-
-Specifies the configuration for obtaining database
-connections and the mapping.xml schema which describes
-how beans map to the database.
-
-[The Syntax of this file is defined by Castor JDO]
-
+ ======================================================
+ Local Transaction Database file for Container-Managed
+ Persistence EntityBeans in the Default CMP Container
+ ======================================================
+
+ Referenced By:
+ conf/default.service-jar.xml
+
+ References To:
+ conf/default.cmp_mapping.xml
+
+ This is the Local_TX_Database file for the Default CMP
+ Container defined in the conf/service-jar.xml file.
+
+ Other CMP containers can be configured. Each container
+ will need a Local_TX_Database file like this one, plus
+ a Global_TX_Database file and a mapping file.
+
+ This configuration is used for local or unspecified
+ transaction contexts. This will be used when the
+ TransactionManager is not managing the transaction,
+ such as when the tx attribute is Supports (no client
+ tx), NotSupported, or Never.
+
+ Specifies the configuration for obtaining database
+ connections and the mapping.xml schema which describes
+ how beans map to the database.
+
+ [The Syntax of this file is defined by Castor JDO]
+
-->
-<database name="Local_TX_Database" engine="instantdb" >
-
- <driver class-name="org.enhydra.instantdb.jdbc.idbDriver"
- url="jdbc:idb:conf/default.idb_database.conf">
- <param name="user" value="Admin" />
- <param name="password" value="pass" />
- </driver>
-
- <mapping href="conf/default.cmp_mapping.xml" />
-</database>
+<jdo-conf>
+ <database name="Local_TX_Database" engine="instantdb">
+ <driver class-name="org.enhydra.instantdb.jdbc.idbDriver"
+ url="jdbc:idb:conf/default.idb_database.conf">
+ <param name="user" value="Admin" />
+ <param name="password" value="pass" />
+ </driver>
+
+ <mapping href="conf/default.cmp_mapping.xml" />
+ </database>
+
+ <transaction-demarcation mode="local">
+ <transaction-manager name="jndi">
+ <param name="jndiEnc"
value="java:openejb/TransactionManager" />
+ </transaction-manager>
+ </transaction-demarcation>
+</jdo-conf>
\ No newline at end of file
1.3 +43 -37
openejb1/modules/core/src/conf/default.cmp_global_tx_database.xml
Index: default.cmp_global_tx_database.xml
===================================================================
RCS file:
/scm/openejb/openejb1/modules/core/src/conf/default.cmp_global_tx_database.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.cmp_global_tx_database.xml 26 Aug 2005 21:18:56 -0000
1.2
+++ default.cmp_global_tx_database.xml 19 Sep 2005 22:15:12 -0000
1.3
@@ -1,42 +1,48 @@
-<!DOCTYPE databases PUBLIC "-//EXOLAB/Castor JDO Configuration DTD Version
1.0//EN"
+<!DOCTYPE jdo-conf PUBLIC "-//EXOLAB/Castor JDO Configuration DTD Version
1.0//EN"
"http://castor.exolab.org/jdo-conf.dtd";>
<!--
-======================================================
-Global Transaction Database file for Container-Managed
-Persistence EntityBeans in the Default CMP Container
-======================================================
-
-Referenced By:
- conf/default.service-jar.xml
-
-References To:
- conf/default.cmp_mapping.xml
-
-This is the Global_TX_Database file for the Default CMP
-Container defined in the conf/service-jar.xml file.
-
-Other CMP containers can be configured. Each container
-will need a Global_TX_Database file like this one, plus
-a Local_TX_Database file and a mapping file.
-
-This configuration is used for global or container
-managed transactions. This will be used when the
-TransactionManager is managing the transaction, such
-as when the tx attribute is Supports (client has tx),
-RequiresNew, Required or Manditory.
-
-Specifies the configuration for obtaining database
-connections and the mapping.xml schema which describes
-how beans map to the database.
-
-[The Syntax of this file is defined by Castor JDO]
-
+ ======================================================
+ Global Transaction Database file for Container-Managed
+ Persistence EntityBeans in the Default CMP Container
+ ======================================================
+
+ Referenced By:
+ conf/default.service-jar.xml
+
+ References To:
+ conf/default.cmp_mapping.xml
+
+ This is the Global_TX_Database file for the Default CMP
+ Container defined in the conf/service-jar.xml file.
+
+ Other CMP containers can be configured. Each container
+ will need a Global_TX_Database file like this one, plus
+ a Local_TX_Database file and a mapping file.
+
+ This configuration is used for global or container
+ managed transactions. This will be used when the
+ TransactionManager is managing the transaction, such
+ as when the tx attribute is Supports (client has tx),
+ RequiresNew, Required or Manditory.
+
+ Specifies the configuration for obtaining database
+ connections and the mapping.xml schema which describes
+ how beans map to the database.
+
+ [The Syntax of this file is defined by Castor JDO]
+
-->
-<database name="Global_TX_Database" engine="instantdb">
- <jndi name="java:openejb/connector/Default JDBC Database" />
- <mapping href="conf/default.cmp_mapping.xml" />
-</database>
-
-
+<jdo-conf>
+ <database name="Global_TX_Database" engine="instantdb">
+ <jndi name="java:openejb/connector/Default JDBC Database" />
+ <mapping href="conf/default.cmp_mapping.xml" />
+ </database>
+
+ <transaction-demarcation mode="global">
+ <transaction-manager name="jndi">
+ <param name="jndiEnc"
value="java:openejb/TransactionManager" />
+ </transaction-manager>
+ </transaction-demarcation>
+</jdo-conf>
\ No newline at end of file
