[jboss-svn-commits] JBL Code SVN: r20253 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product: services/jbpm/src/main/resources and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-06-02 09:59:51 -0400 (Mon, 02 Jun 2008)
New Revision: 20253

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-ds.xml
Log:
Rollback XADataSource: JBESB-1768

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml	2008-06-02 09:03:53 UTC (rev 20252)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml	2008-06-02 13:59:51 UTC (rev 20253)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <datasources>
-   <xa-datasource>
-		<jndi-name>HelloworldTxSqlDB</jndi-name>
-		<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
-		<track-connection-by-tx/>
-		<transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-		<xa-datasource-property name="URL">jdbc:h2:tcp://localhost:9095/;DB_CLOSE_ON_EXIT=FALSE</xa-datasource-property>
-		<xa-datasource-property name="User">sa</xa-datasource-property>
-		<xa-datasource-property name="Password"></xa-datasource-property>
-		<min-pool-size>5</min-pool-size>
-		<max-pool-size>20</max-pool-size>
-		<idle-timeout-minutes>0</idle-timeout-minutes>
-		<prepared-statement-cache-size>32</prepared-statement-cache-size>
-		<depends>jboss:service=HelloworldTxSqlDB</depends>	
-	</xa-datasource>
+   <local-tx-datasource>
+         <jndi-name>HelloworldTxSqlDB</jndi-name>
+         <connection-url>jdbc:h2:tcp://localhost:9095/</connection-url>
+         <driver-class>org.h2.Driver</driver-class>
+         <user-name>sa</user-name>
+         <password/>
+         <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+         <min-pool-size>5</min-pool-size>
+         <max-pool-size>20</max-pool-size>
+         <idle-timeout-minutes>0</idle-timeout-minutes>
+         <prepared-statement-cache-size>32</prepared-statement-cache-size>
+         <depends>jboss:service=HelloworldTxSqlDB</depends>	
+   </local-tx-datasource>
 
    <mbean code="org.jboss.internal.soa.esb.dependencies.H2Database" name="jboss:service=HelloworldTxSqlDB">
         <attribute name="Database">HelloworldTxSqlDB</attribute>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-ds.xml	2008-06-02 09:03:53 UTC (rev 20252)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/jbpm-ds.xml	2008-06-02 13:59:51 UTC (rev 20253)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <datasources>
+<!--
    <xa-datasource>
          <jndi-name>JbpmDS</jndi-name>
          <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
@@ -15,7 +16,20 @@
          <prepared-statement-cache-size>32</prepared-statement-cache-size>
          <depends>jboss:service=h2,database=jbpmDB</depends>
    </xa-datasource>
-
+-->
+   <local-tx-datasource>
+         <jndi-name>JbpmDS</jndi-name>
+         <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}jbpmDB;MVCC=TRUE</connection-url>
+         <driver-class>org.h2.Driver</driver-class>
+         <user-name>sa</user-name>
+         <password/>
+         <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+         <min-pool-size>5</min-pool-size>
+         <max-pool-size>20</max-pool-size>
+         <idle-timeout-minutes>0</idle-timeout-minutes>
+         <prepared-statement-cache-size>32</prepared-statement-cache-size>
+         <depends>jboss:service=h2,database=jbpmDB</depends>
+   </local-tx-datasource>
    <mbean code="org.jboss.internal.soa.esb.dependencies.H2Database"
         name="jboss:service=h2,database=jbpmDB">
         <attribute name="Database">jbpmDB</attribute>