[jboss-svn-commits] JBL Code SVN: r38096 - in labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources: META-INF and 1 other directory.

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

Author: tcunning
Date: 2012-05-20 22:35:24 -0400 (Sun, 20 May 2012)
New Revision: 38096

Removed:
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/jBPM-ds.xml
Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/persistence.xml
Log:
JBESB-3799
Use DefaultDS.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/deployment.xml	2012-05-20 18:14:59 UTC (rev 38095)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/deployment.xml	2012-05-21 02:35:24 UTC (rev 38096)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?><jbossesb-deployment>
   <depends>jboss.esb:deployment=jbossesb.esb</depends>
-  <depends>jboss.jca:name=jboss/datasources/jbpm5DS,service=DataSourceBinding</depends>
+  <depends>jboss.jca:name=DefaultDS,service=DataSourceBinding</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/persistence.xml	2012-05-20 18:14:59 UTC (rev 38095)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/META-INF/persistence.xml	2012-05-21 02:35:24 UTC (rev 38096)
@@ -10,7 +10,7 @@
 
   <persistence-unit name="jbpm5Persistence.jpa" transaction-type="JTA">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
-    <jta-data-source>java:jboss/datasources/jbpm5DS</jta-data-source>
+    <jta-data-source>java:/DefaultDS</jta-data-source>
 
     <mapping-file>META-INF/ProcessInstanceInfo.hbm.xml</mapping-file>
     <mapping-file>META-INF/JBPMorm.xml</mapping-file>

Deleted: labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/jBPM-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/jBPM-ds.xml	2012-05-20 18:14:59 UTC (rev 38095)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/resources/jBPM-ds.xml	2012-05-21 02:35:24 UTC (rev 38096)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-   <local-tx-datasource>
-         <jndi-name>jboss/datasources/jbpm5DS</jndi-name>
-         <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}jbpm5DB;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=jbpm5DB</depends>
-   </local-tx-datasource>
-   <mbean code="org.jboss.internal.soa.esb.dependencies.H2Database"
-        name="jboss:service=h2,database=jbpm5DB">
-        <attribute name="Database">jbpm5DB</attribute>
-                <attribute name="DataDir">${jboss.server.data.dir}</attribute>
-   </mbean>
-</datasources>