[jbpm-commits] JBoss JBPM SVN: r2065 - in jbpm3/trunk/modules/jpdl/core: scripts and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Sep 2 06:14:40 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-02 06:14:40 -0400 (Tue, 02 Sep 2008)
New Revision: 2065
Added:
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
Modified:
jbpm3/trunk/modules/jpdl/core/pom.xml
jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.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
Log:
Add hibernate.common.xml
Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -158,6 +158,65 @@
<profiles>
<!--
+ Name: no-database
+ Descr: Setup the default database
+ -->
+ <profile>
+ <id>no-database</id>
+ <activation>
+ <property>
+ <name>!database</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!--
+ Cleanup stale tests from the testsuite
+ http://jira.jboss.org/jira/browse/JBPM-1205
+ -->
+ <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+ <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+ <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+ <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+ <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+ <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+ <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+ <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+ <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+ <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+ <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+ <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+ <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+ <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+ <exclude>org/jbpm/mail/MailTest.java</exclude>
+ <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+ <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+ <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+ <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+ <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+ <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+ <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+ <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: hsqldb
Descr: Hypersonic Database Setup
-->
Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -36,6 +36,7 @@
<hibernate-configuration>
<session-factory>
]]></header>
+ <fileset file="${project.resources.directory}/hibernate.common.xml" />
<fileset file="${project.resources.directory}/hibernate.properties.@{database}.xml" />
<fileset file="${project.resources.directory}/hibernate.mapping.xml" />
<fileset file="${project.resources.directory}/hibernate.cache.xml" />
Added: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -0,0 +1,28 @@
+
+ <!-- ################################### -->
+ <!-- # common settings # -->
+ <!-- ################################### -->
+
+ <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+ <!-- 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) -->
+
+ <!-- logging properties
+ <property name="hibernate.show_sql">true</property>
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
+ -->
+
+
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -10,24 +10,3 @@
<property name="hibernate.hbm2ddl.auto">create</property>
<!-- JDBC connection properties (end) -->
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
- <!-- 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) -->
-
- <!-- logging properties
- <property name="hibernate.show_sql">true</property>
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
- -->
\ No newline at end of file
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-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.mysql.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -8,7 +8,6 @@
<property name="hibernate.connection.username">jbpmtest</property>
<property name="hibernate.connection.password"></property>
<property name="hibernate.query.substitutions">true 1, false 0</property>
-
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
<property name="hibernate.hbm2ddl.auto">create</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-02 10:00:32 UTC (rev 2064)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.properties.postgresql.xml 2008-09-02 10:14:40 UTC (rev 2065)
@@ -7,7 +7,6 @@
<property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/jbpmtest</property>
<property name="hibernate.connection.username">jbpmtest</property>
<property name="hibernate.connection.password"></property>
-
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
<property name="hibernate.hbm2ddl.auto">create</property>
+ <!-- JDBC connection properties (end) -->
+
\ No newline at end of file
More information about the jbpm-commits
mailing list