[jbpm-commits] JBoss JBPM SVN: r2113 - in jbpm3/trunk/modules/jpdl/core/src: test/java/org/jbpm/job/executor and 1 other directory.

Author: alex.guizar(a)jboss.com Date: 2008-09-04 13:40:29 -0400 (Thu, 04 Sep 2008) New Revision: 2113 Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java Log: JBPM-1708: removed hbm2ddl.auto property, added back data source and jta transaction properties Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-04 16:11:14 UTC (rev 2112) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-04 17:40:29 UTC (rev 2113) @@ -1,4 +1,18 @@ + <!-- DataSource properties (begin) === + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property> + ==== DataSource properties (end) --> + + <!-- JTA transaction properties (begin) === + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + ==== JTA transaction properties (end) --> + + <!-- CMT transaction properties (begin) === + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + ==== CMT transaction properties (end) --> + <!-- ################################### --> <!-- # common settings # --> <!-- ################################### --> @@ -6,9 +20,6 @@ <!-- Simple memory-only cache --> <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <!-- Automatic schema creation --> - <property name="hibernate.hbm2ddl.auto">create</property> - <!-- logging properties --> <property name="hibernate.format_sql">true</property> <property name="hibernate.use_sql_comments">true</property> Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-04 16:11:14 UTC (rev 2112) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-04 17:40:29 UTC (rev 2113) @@ -8,4 +8,3 @@ <property name="hibernate.connection.username">sa</property> <property name="hibernate.connection.password"></property> <!-- JDBC connection properties (end) --> - Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-04 16:11:14 UTC (rev 2112) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-04 17:40:29 UTC (rev 2113) @@ -9,4 +9,3 @@ <property name="hibernate.connection.password"></property> <property name="hibernate.query.substitutions">true 1, false 0</property> <!-- JDBC connection properties (end) --> - \ No newline at end of file Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-04 16:11:14 UTC (rev 2112) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-04 17:40:29 UTC (rev 2113) @@ -8,4 +8,3 @@ <property name="hibernate.connection.username">jbpmtest</property> <property name="hibernate.connection.password"></property> <!-- JDBC connection properties (end) --> - \ No newline at end of file Modified: jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java 2008-09-04 16:11:14 UTC (rev 2112) +++ jbpm3/trunk/modules/jpdl/core/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java 2008-09-04 17:40:29 UTC (rev 2113) @@ -42,11 +42,13 @@ "</jbpm-configuration>"); public void setUp() throws Exception { + jbpmConfiguration.createSchema(); jbpmContext = jbpmConfiguration.createJbpmContext(); } public void tearDown() throws Exception { jbpmContext.close(); + jbpmConfiguration.dropSchema(); } public void testJobExecutorDoesNotExist() {