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

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

Author: tcunning
Date: 2012-04-19 10:27:32 -0400 (Thu, 19 Apr 2012)
New Revision: 38037

Removed:
   labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/hibernate.cfg.xml
Modified:
   labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/persistence.xml
Log:
Fix jbpm5 deployment issues on Mac OS X.


Modified: labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/deployment.xml	2012-04-19 12:25:07 UTC (rev 38036)
+++ labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/deployment.xml	2012-04-19 14:27:32 UTC (rev 38037)
@@ -1,3 +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>
 </jbossesb-deployment>

Modified: labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/persistence.xml	2012-04-19 12:25:07 UTC (rev 38036)
+++ labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/META-INF/persistence.xml	2012-04-19 14:27:32 UTC (rev 38037)
@@ -12,12 +12,11 @@
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
     <jta-data-source>java:jboss/datasources/jbpm5DS</jta-data-source>
 
-    <mapping-file>META-INF/JBPMorm.xml</mapping-file>
     <class>org.jbpm.persistence.processinstance.ProcessInstanceInfo</class>
     <class>org.drools.persistence.info.SessionInfo</class>
     <class>org.drools.persistence.info.WorkItemInfo</class>
     <properties> 
-         <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+         <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
          <property name="hibernate.hbm2ddl.auto" value="update"/>
          <!-- for AS5 -->
          <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />

Deleted: labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/hibernate.cfg.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/hibernate.cfg.xml	2012-04-19 12:25:07 UTC (rev 38036)
+++ labs/jbossesb/tags/JBESB_4_11/product/services/jbpm5/src/main/resources/hibernate.cfg.xml	2012-04-19 14:27:32 UTC (rev 38037)
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC
-        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-
-    <session-factory>
-
-        <!-- Database connection settings -->
-        <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-        <property name="connection.url">jdb:mysql://localhost:3306/jbpm5</property>
-        <!--property name="connection.url">jdbc:h2:file:/NotBackedUp/data/mydb</property-->
-        <property name="connection.username">jbpm5</property>
-        <property name="connection.password">jbpm5</property>
-
-        <!-- JDBC connection pool (use the built-in) -->
-        <property name="connection.pool_size">1</property>
-
-        <!-- SQL dialect -->
-        <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
-
-        <!-- Enable Hibernate's automatic session context management -->
-        <property name="current_session_context_class">thread</property>
-
-        <!-- Disable the second-level cache  -->
-        <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
-
-        <!-- Echo all executed SQL to stdout -->
-        <property name="show_sql">false</property>
-
-        <!-- Drop and re-create the database schema on startup? -->
-        <property name="hbm2ddl.auto">create</property>
-
-        <mapping resource="AuditLog.hbm.xml"/>
-
-    </session-factory>
-
-</hibernate-configuration>