[jbpm-commits] JBoss JBPM SVN: r3400 - in jbpm4/trunk: modules and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Dec 16 08:57:21 EST 2008
Author: tom.baeyens at jboss.com
Date: 2008-12-16 08:57:21 -0500 (Tue, 16 Dec 2008)
New Revision: 3400
Added:
jbpm4/trunk/modules/config/
jbpm4/trunk/modules/config/src/
jbpm4/trunk/modules/config/src/main/
jbpm4/trunk/modules/config/src/main/resources/
jbpm4/trunk/modules/config/src/main/resources/hibernate.properties
jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml
jbpm4/trunk/modules/config/src/main/resources/logging.properties
jbpm4/trunk/modules/test-load/src/main/
jbpm4/trunk/modules/test-load/src/main/scripts/
jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml
Modified:
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties
jbpm4/trunk/modules/examples/src/eclipse/.classpath
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java
jbpm4/trunk/modules/test-load/.classpath
jbpm4/trunk/modules/test-load/pom.xml
jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties
jbpm4/trunk/pom.xml
jbpm4/trunk/profiles.xml.example
Log:
added db configurability
Added: jbpm4/trunk/modules/config/src/main/resources/hibernate.properties
===================================================================
--- jbpm4/trunk/modules/config/src/main/resources/hibernate.properties (rev 0)
+++ jbpm4/trunk/modules/config/src/main/resources/hibernate.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,12 @@
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:.
+hibernate.connection.username=sa
+hibernate.connection.password=
+hibernate.hbm2ddl.auto=create-drop
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
+# hibernate.show_sql=true
+# hibernate.format_sql=true
+# hibernate.use_sql_comments=true
Added: jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+ <process-engine>
+
+ <deployer-manager>
+ <assign-file-type>
+ <file extension=".jpdl.xml" type="jpdl" />
+ </assign-file-type>
+ <parse-jpdl />
+ <check-process />
+ <check-problems />
+ <save />
+ </deployer-manager>
+
+ <process-service />
+ <execution-service />
+ <management-service />
+
+ <command-service>
+ <retry-interceptor />
+ <environment-interceptor />
+ <standard-transaction-interceptor />
+ </command-service>
+
+ <hibernate-configuration>
+ <properties resource="hibernate.properties" />
+ <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
+ <mapping resource="jbpm.pvm.wire.hbm.xml" />
+ <mapping resource="jbpm.pvm.definition.hbm.xml" />
+ <mapping resource="jbpm.pvm.execution.hbm.xml" />
+ <mapping resource="jbpm.pvm.variable.hbm.xml" />
+ <mapping resource="jbpm.pvm.job.hbm.xml" />
+ <mapping resource="jbpm.jpdl.hbm.xml" />
+ <cache-configuration resource="jbpm.pvm.cache.xml"
+ usage="nonstrict-read-write" />
+ </hibernate-configuration>
+
+ <hibernate-session-factory />
+
+ <job-executor auto-start="false" />
+ <job-test-helper />
+
+ <id-generator />
+ <variable-types resource="jbpm.pvm.types.xml" />
+
+ <business-calendar>
+ <monday hours="9:00-12:00 and 12:30-17:00"/>
+ <tuesday hours="9:00-12:00 and 12:30-17:00"/>
+ <wednesday hours="9:00-12:00 and 12:30-17:00"/>
+ <thursday hours="9:00-12:00 and 12:30-17:00"/>
+ <friday hours="9:00-12:00 and 12:30-17:00"/>
+ <holiday period="01/07/2008 - 31/08/2008"/>
+ </business-calendar>
+
+ </process-engine>
+
+ <environment>
+ <hibernate-session />
+ <transaction />
+ <pvm-db-session />
+ <job-db-session />
+ <message-session />
+ <timer-session />
+ </environment>
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/config/src/main/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/config/src/main/resources/logging.properties (rev 0)
+++ jbpm4/trunk/modules/config/src/main/resources/logging.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,20 @@
+handlers= java.util.logging.ConsoleHandler
+
+java.util.logging.ConsoleHandler.level = ERROR
+java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+
+redirect.commons.logging = enabled
+
+
+org.jbpm.level=FINEST
+org.jbpm.pvm.internal.tx.level=FINE
+org.jbpm.pvm.internal.wire.level=FINE
+org.jbpm.pvm.internal.util.level=FINE
+
+org.hibernate.cfg.HbmBinder.level=SEVERE
+org.hibernate.cfg.SettingsFactory.level=SEVERE
+# org.hibernate.level=FINE
+# org.hibernate.SQL.level=FINEST
+# org.hibernate.type.level=FINEST
+# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
+# org.hibernate.transaction.level=FINEST
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -80,7 +80,7 @@
<executions>
<execution>
<id>generate-db-scripts</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
===================================================================
--- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -24,42 +24,42 @@
<property name="cfg" value="src/main/resources/hibernate.cfg.xml" />
- <mkdir dir="target/create"/>
- <mkdir dir="target/drop"/>
+ <mkdir dir="target/classes/create"/>
+ <mkdir dir="target/classes/drop"/>
<schemaexport properties="src/main/resources/db.properties/hsqldb.properties"
- output="target/create/jbpm.hsqldb.create.sql"
+ output="target/classes/create/jbpm.hsqldb.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/hsqldb.properties"
- output="target/drop/jbpm.hsqldb.drop.sql"
+ output="target/classes/drop/jbpm.hsqldb.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/mysql.properties"
- output="target/create/jbpm.mysql.create.sql"
+ output="target/classes/create/jbpm.mysql.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/mysql.properties"
- output="target/drop/jbpm.mysql.drop.sql"
+ output="target/classes/drop/jbpm.mysql.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/oracle.properties"
- output="target/create/jbpm.oracle.create.sql"
+ output="target/classes/create/jbpm.oracle.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/oracle.properties"
- output="target/drop/jbpm.oracle.drop.sql"
+ output="target/classes/drop/jbpm.oracle.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/postgresql.properties"
- output="target/create/jbpm.postgresql.create.sql"
+ output="target/classes/create/jbpm.postgresql.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/postgresql.properties"
- output="target/drop/jbpm.postgresql.drop.sql"
+ output="target/classes/drop/jbpm.postgresql.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/sybase.properties"
- output="target/create/jbpm.sybase.create.sql"
+ output="target/classes/create/jbpm.sybase.create.sql"
create="yes" drop="no" config="${cfg}" text="yes" />
<schemaexport properties="src/main/resources/db.properties/sybase.properties"
- output="target/drop/jbpm.sybase.drop.sql"
+ output="target/classes/drop/jbpm.sybase.drop.sql"
create="no" drop="yes" config="${cfg}" text="yes" />
</target>
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=jdbc:db2://localhost:50000/jbpm
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=jdbc:derby:build/derby/jbpmtest;create=true
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=jdbc:firebirdsql:localhost:jbpmtest
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -3,3 +3,6 @@
hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.hsqldb.server}/${jdbc.hsqldb.dbname}
hibernate.connection.username=${jdbc.hsqldb.username}
hibernate.connection.password=${jdbc.hsqldb.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,6 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,4 +4,7 @@
hibernate.connection.url=jdbc:jtds:sqlserver://localhost:1433/jbpmtest
hibernate.connection.username=username
hibernate.connection.password=password
-hibernate.query.substitutions=true 1, false 0
\ No newline at end of file
+hibernate.query.substitutions=true 1, false 0
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -3,3 +3,7 @@
hibernate.connection.url=jdbc:mysql://${jdbc.mysql.server}/${jdbc.mysql.dbname}
hibernate.connection.username=${jdbc.mysql.username}
hibernate.connection.password=${jdbc.mysql.password}
+
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,10 +1,13 @@
hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
+# for Oracle 8 compatibility use
+#hibernate.dialect=org.hibernate.dialect.OracleDialect
+
# fetch driver from http://www.oracle.com
hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
-hibernate.connection.url=jdbc:oracle:thin:@${jdbc.oracle.server}:1521:${jdbc.oracle.dbname}
-hibernate.connection.username=${jdbc.oracle.username}
-hibernate.connection.password=${jdbc.oracle.password}
+hibernate.connection.url=jdbc:oracle:thin:@[hibernate.property.server]:1521:[hibernate.property.dbname]
+hibernate.connection.username=[hibernate.property.username]
+hibernate.connection.password=[hibernate.property.password]
hibernate.query.substitutions=true 1, false 0
-# for Oracle 8 compatibility use
-#hibernate.dialect=org.hibernate.dialect.OracleDialect
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,7 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,6 +1,10 @@
hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
# fetch driver from http://jdbc.postgresql.org/
hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.url=jdbc:postgresql://${jdbc.postgreql.server}/${jdbc.postgreql.dbname}
-hibernate.connection.username=${jdbc.postgreql.username}
-hibernate.connection.password=${jdbc.postgreql.password}
+hibernate.connection.url=jdbc:postgresql://${hibernate.property.server}/${hibernate.property.dbname}
+hibernate.connection.username=${hibernate.property.username}
+hibernate.connection.password=${hibernate.property.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,7 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -4,3 +4,7 @@
hibernate.connection.url=
hibernate.connection.username=username
hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -3,3 +3,7 @@
hibernate.connection.url=jdbc:jtds:sybase://${jdbc.sybase.server}/${jdbc.sybase.dbname}
hibernate.connection.username=${jdbc.sybase.username}
hibernate.connection.password=${jdbc.sybase.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
Modified: jbpm4/trunk/modules/examples/src/eclipse/.classpath
===================================================================
--- jbpm4/trunk/modules/examples/src/eclipse/.classpath 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/examples/src/eclipse/.classpath 2008-12-16 13:57:21 UTC (rev 3400)
@@ -2,26 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/commons-collections-2.1.1.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/hibernate-3.2.6.ga.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/hsqldb-1.8.0.7.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/jboss-j2ee-4.2.1.GA.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/juel-2.1.0.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/juel-engine-2.1.0.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/juel-impl-2.1.0.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/livetribe-jsr223-2.0.3.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/lib/spring-2.5.4.jar"/>
- <classpathentry kind="var" path="JBPM_HOME/jbpm.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jBPM Libraries"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -56,13 +56,13 @@
Collection<JobImpl<?>> acquiredJobs = new ArrayList<JobImpl<?>>();
JobDbSession jobDbSession = environment.get(JobDbSession.class);
- log.debug("start querying first acquirable jobImpl...");
+ log.debug("start querying first acquirable job...");
JobImpl<?> job = jobDbSession.findFirstAcquirableJob();
if (job!=null) {
if (job.isExclusive()) {
- log.trace("exclusive acquirable jobImpl found ("+job+"). querying for other exclusive jobs to lock them all in one tx...");
+ log.trace("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx...");
List<JobImpl<?>> otherExclusiveJobs = jobDbSession.findExclusiveJobs(job.getProcessInstance());
acquiredJobs.addAll(otherExclusiveJobs);
} else {
@@ -78,7 +78,7 @@
}
} else {
- log.trace("no acquirable jobs in jobImpl table");
+ log.trace("no acquirable jobs in job table");
}
log.debug("locking jobs "+acquiredJobDbids);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -28,7 +28,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.log.Log;
-/** this thread is responsible for acquiring jobs in the jobImpl that need to be
+/** this thread is responsible for acquiring jobs in the job that need to be
* executed and then let the JobExecutor dispatch the acquired ids to one of the
* JobExecutorThreads in the pool. There is only one dispatcher thread per
* JobExecutor.
@@ -88,9 +88,9 @@
}
} catch (InterruptedException e) {
- log.info((isActive ? "active" : "inactivated") + " jobImpl dispatcher thread '" + getName() + "' got interrupted");
+ log.info((isActive ? "active" : "inactivated") + " job dispatcher thread '" + getName() + "' got interrupted");
} catch (Exception e) {
- log.error("exception in jobImpl executor thread. waiting " + currentIdleInterval + " milliseconds", e);
+ log.error("exception in job executor thread. waiting " + currentIdleInterval + " milliseconds", e);
try {
synchronized (semaphore) {
semaphore.wait(currentIdleInterval);
@@ -118,7 +118,7 @@
log.trace("jobs "+acquiredJobDbids+" were put on the queue");
acquiredJobDbids = null;
} catch (InterruptedException e) {
- log.trace("putting acquired jobImpl dbids got interrupted. retrying...");
+ log.trace("putting acquired job dbids got interrupted. retrying...");
}
}
}
@@ -176,7 +176,7 @@
}
public void jobWasAdded() {
- log.trace("notifying jobImpl executor dispatcher thread of new jobImpl");
+ log.trace("notifying job executor dispatcher thread of new job");
synchronized (semaphore) {
checkForNewJobs = true;
semaphore.notify();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -57,7 +57,7 @@
}
JobImpl<?> job = (JobImpl<?>) session.get(JobImpl.class, jobDbid);
- // in case of exclusive jobs, the jobImpl might have been deleted
+ // in case of exclusive jobs, the job might have been deleted
// before we execute it (they are in a list)
if (job != null) {
try {
@@ -88,8 +88,8 @@
}
/** This transaction will be marked for rollback. A command will be associated with the
- * Transaction.EVENT_AFTERCOMPLETION (after the jobImpl locks of the current transaction are
- * released). Then the command will update the JobImpl with the exception details in a separate
+ * Transaction.EVENT_AFTERCOMPLETION (after the job locks of the current transaction are
+ * released). Then the command will update the job with the exception details in a separate
* transaction. */
protected void handleJobExecutionException(Environment environment, JobImpl<?> job, Throwable exception) {
Transaction transaction = environment.get(Transaction.class);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobAddedNotification.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -26,7 +26,7 @@
import org.jbpm.log.Log;
/** listener that can be registered as a listener to the transaction
- * to notify the jobImpl executor of added jobs so that the dispatcher
+ * to notify the job executor of added jobs so that the dispatcher
* thread can wake up.
*
* @author Tom Baeyens
@@ -42,7 +42,7 @@
}
public void afterCompletion(int arg0) {
- log.trace("notifying jobImpl executor of added message");
+ log.trace("notifying job executor of added message");
jobExecutor.jobWasAdded();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobDbSession.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -7,7 +7,7 @@
import org.jbpm.session.DbSession;
import org.jbpm.session.MessageSession;
-/** internal interface used by the jobImpl executor and the
+/** internal interface used by the job executor and the
* implementations of {@link MessageSession} and {@link TimerSession}.
*
* So this session is only needed in case the {@link JobExecutor} is
@@ -17,15 +17,15 @@
*/
public interface JobDbSession extends DbSession {
- /** the jobImpl with the given id or null if none */
+ /** the job with the given id or null if none */
public JobImpl<?> getJob(long jobId);
- /** the first jobImpl to finish among eligible and non-locked jobs or null if none */
+ /** the first job to finish among eligible and non-locked jobs or null if none */
public JobImpl<?> findFirstAcquirableJob();
/** the list of jobs of the process instance that mustn't be concurrent */
public List<JobImpl<?>> findExclusiveJobs(Execution processInstance);
- /** the first jobImpl to finish among non-owned jobs or null if none */
+ /** the first job to finish among non-owned jobs or null if none */
public JobImpl<?> findFirstDueJob();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -66,9 +66,9 @@
}
public Object execute(Environment environment) throws Exception {
- log.debug("handling jobImpl "+jobDbid+" exception: "+exception.getMessage());
+ log.debug("handling job "+jobDbid+" exception: "+exception.getMessage());
- // load the jobImpl from the db
+ // load the job from the db
JobDbSession session = environment.get(JobDbSession.class);
if (session==null) {
throw new JbpmException("no job-session configured to handle job");
@@ -87,7 +87,7 @@
job.setLockOwner(null);
job.setLockExpirationTime(null);
- // notify the jobImpl executor after the transaction is completed
+ // notify the job executor after the transaction is completed
Transaction transaction = environment.get(Transaction.class);
JobExecutor jobExecutor = environment.get(JobExecutor.class);
if ( (transaction!=null)
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -36,7 +36,7 @@
import org.jbpm.log.Log;
-/** manager for jobImpl execution threads and their configuration.
+/** manager for job execution threads and their configuration.
*
* @author Tom Baeyens, Guillaume Porcher
*/
@@ -72,10 +72,10 @@
List<JobHistoryEntry> history = new ArrayList<JobHistoryEntry>();
- /** starts the {@link DispatcherThread} and {@link JobExecutorThread}s for this jobImpl executor */
+ /** starts the {@link DispatcherThread} and {@link JobExecutorThread}s for this job executor */
public synchronized void start() {
if (commandService==null) {
- throw new JbpmException("no command executor available in jobImpl executor");
+ throw new JbpmException("no command executor available in job executor");
}
if (! isActive) {
acquireJobsCommand = new AcquireJobsCmd(this);
@@ -86,16 +86,16 @@
jobDbidsQueue = new ArrayBlockingQueue<Collection<Long>>(nbrOfThreads, true);
isActive = true;
- log.trace("starting jobImpl executor threads for jobImpl executor '"+name+"'...");
+ log.trace("starting job executor threads for job executor '"+name+"'...");
jobExecutorThreadPool = new JobExecutorThreadPool(this);
jobExecutorThreadPool.start();
- log.trace("starting dispatcher thread for jobImpl executor '"+name+"'...");
+ log.trace("starting dispatcher thread for job executor '"+name+"'...");
dispatcherThread = new DispatcherThread(this);
dispatcherThread.start();
} else {
- log.trace("ignoring start: jobImpl executor '"+name+"' is already started'");
+ log.trace("ignoring start: job executor '"+name+"' is already started'");
}
}
@@ -105,32 +105,32 @@
stop(false);
}
- /** signals to all threads managed by this jobImpl executor to stop. Stopping the
+ /** signals to all threads managed by this job executor to stop. Stopping the
* dispatcher thread is blocking till the dispatcher is no more alive. If join is set to true,
- * this method will block until all jobImpl executor threads
- * are joined and actually dead. If join is false, the jobImpl executor threads are only told to
- * stop, without waiting till they are actually stopped. It may be that jobImpl executor threads
- * are in the middle of executing a jobImpl and they may finish after this method returned.
+ * this method will block until all job executor threads
+ * are joined and actually dead. If join is false, the job executor threads are only told to
+ * stop, without waiting till they are actually stopped. It may be that job executor threads
+ * are in the middle of executing a job and they may finish after this method returned.
*/
public synchronized void stop(boolean join) {
- log.debug("stopping jobImpl executor");
+ log.debug("stopping job executor");
if (isActive) {
isActive = false;
dispatcherThread.deactivate(true);
waitTillQueueEmpty();
jobExecutorThreadPool.deactivate(join);
} else {
- log.trace("ignoring stop: jobImpl executor '"+name+"' not started");
+ log.trace("ignoring stop: job executor '"+name+"' not started");
}
}
protected void waitTillQueueEmpty() {
while (! jobDbidsQueue.isEmpty()) {
- log.trace("waiting for jobImpl-id-queue to become empty");
+ log.trace("waiting for job-id-queue to become empty");
try {
Thread.sleep(200);
} catch (InterruptedException e) {
- log.trace("waiting for jobImpl-id-queue to become empty got interrupted");
+ log.trace("waiting for job-id-queue to become empty got interrupted");
}
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -35,9 +35,9 @@
import org.jbpm.env.EnvironmentFactory;
/**
- * starts the jobImpl executor on init and closes the
+ * starts the job executor on init and closes the
* jbpm configuration upon destroy. The closing of the
- * jbpm configuration will also shut down the jobImpl executor
+ * jbpm configuration will also shut down the job executor
* thread pool.
* <h1>Config parameters</h1>
* <table>
@@ -86,7 +86,7 @@
EnvironmentFactory environmentFactory = (EnvironmentFactory) new Configuration().setResource(configurationResource).buildProcessEngine();
jobExecutor = environmentFactory.get(JobExecutor.class);
if (jobExecutor==null) {
- throw new JbpmException("no jobImpl executor configured in resource "+configurationResource);
+ throw new JbpmException("no job executor configured in resource "+configurationResource);
}
jobExecutor.start();
}
@@ -95,7 +95,7 @@
PrintWriter out = response.getWriter();
out.println("<html>");
out.println("<body>");
- out.println("<h2>JBoss jBPM JobImpl Executor Servlet</h2><hr />");
+ out.println("<h2>JBoss jBPM job Executor Servlet</h2><hr />");
/* TODO
Iterator<Thread> iter = jobExecutor.getJobExecutorThreads().values().iterator();
while (iter.hasNext()) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobHistoryEntry.java 2008-12-16 13:57:21 UTC (rev 3400)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.util.Date;
-/** one entry in the jobImpl execution history.
+/** one entry in the job execution history.
* @author Tom Baeyens
*/
public class JobHistoryEntry implements Serializable {
Modified: jbpm4/trunk/modules/test-load/.classpath
===================================================================
--- jbpm4/trunk/modules/test-load/.classpath 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/test-load/.classpath 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/test-classes"/>
Modified: jbpm4/trunk/modules/test-load/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-load/pom.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/test-load/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -45,7 +45,6 @@
<version>${version}</version>
</dependency>
-
<!-- TODO remove PVM dependency for compilation (keep it for test)-->
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -53,17 +52,15 @@
<version>${version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-db</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<!-- Plugins -->
- <build>
- <plugins>
- </plugins>
- </build>
- <!-- Profiles -->
- <profiles>
- </profiles>
-
</project>
\ No newline at end of file
Added: jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml
===================================================================
--- jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml (rev 0)
+++ jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project default="configure.db.properties">
+
+ <target name="configure.db.properties">
+
+ <echo message="installing properties for db: ${database}" />
+
+ <copy file="target/test-classes/hibernate.properties"
+ token="hibernate.dialect=org.hibernate.dialect.HSQLDialect"
+ value="hibernate.dialect=${hibernate.property.dialect}" />
+
+ <replace file="target/test-classes/hibernate.properties"
+ token="hibernate.connection.driver_class=org.hsqldb.jdbcDriver"
+ value="hibernate.dialect=${hibernate.property.driver}" />
+ </target>
+
+</project>
Property changes on: jbpm4/trunk/modules/test-load/src/main/scripts/ant.properties.ant.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,11 +1,14 @@
-hibernate.dialect org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class org.hsqldb.jdbcDriver
-hibernate.connection.url jdbc:hsqldb:mem:.
-hibernate.connection.username sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:.
+hibernate.connection.username=sa
+hibernate.connection.password=
+
+hibernate.hbm2ddl.auto=create-drop
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+
# hibernate.show_sql true
-hibernate.format_sql true
-hibernate.use_sql_comments true
+# hibernate.format_sql true
+# hibernate.use_sql_comments true
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/pom.xml 2008-12-16 13:57:21 UTC (rev 3400)
@@ -253,6 +253,17 @@
<version>2.0.2.SP1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.1</version>
@@ -306,6 +317,206 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>database</id>
+ <activation>
+ <property>
+ <name>database</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack.jbpm.db</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>jbpm-db</includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>target/jbpm-db</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install.hibernate.database.properties</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="target/jbpm-db/db.properties/${database}.properties"
+ tofile="target/test-classes/hibernate.properties"
+ overwrite="true"/>
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.username]"
+ value="${hibernate.property.username}" />
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.password]"
+ value="${hibernate.property.password}" />
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.server]"
+ value="${hibernate.property.server}" />
+ <replace file="target/test-classes/hibernate.properties"
+ token="[hibernate.property.dbname]"
+ value="${hibernate.property.dbname}" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create.schema</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property file="target/test-classes/hibernate.properties" />
+ <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql"
+ driver="${hibernate.connection.driver_class}"
+ url="${hibernate.connection.url}"
+ username="${hibernate.connection.username}"
+ password="${hibernate.connection.password}" />
+ <sql src="target/jbpm-db/create/jbpm.${database}.create.sql"
+ driver="${hibernate.connection.driver_class}"
+ url="${hibernate.connection.url}"
+ username="${hibernate.connection.username}"
+ password="${hibernate.connection.password}" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <trimStackTrace>false</trimStackTrace>
+ <systemProperties>
+ <property>
+ <name>hibernate.property.username</name>
+ <value>${hibernate.property.username}</value>
+ </property>
+ <property>
+ <name>hibernate.property.pwd</name>
+ <value>${hibernate.property.pwd}</value>
+ </property>
+ <property>
+ <name>hibernate.property.server</name>
+ <value>${hibernate.property.server}</value>
+ </property>
+ <property>
+ <name>hibernate.property.dbname</name>
+ <value>${hibernate.property.dbname}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- -Ddatabase=oracle -->
+ <profile>
+ <id>oracle</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>oracle</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.0.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- -Ddatabase=mysql -->
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- -Ddatabase=postgresql -->
+ <profile>
+ <id>postgresql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>postgresql</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- -Ddatabase=sybase -->
+ <profile>
+ <id>sybase</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>sybase</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
+ </repositories>
+ </profile>
+
</profiles>
Modified: jbpm4/trunk/profiles.xml.example
===================================================================
--- jbpm4/trunk/profiles.xml.example 2008-12-16 12:14:33 UTC (rev 3399)
+++ jbpm4/trunk/profiles.xml.example 2008-12-16 13:57:21 UTC (rev 3400)
@@ -1,21 +1,43 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
+<profilesXml xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
+
<profiles>
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
+
<profile>
- <id>jboss-home-profile</id>
+ <id>oracle-private-properties</id>
<activation>
<property>
- <name>user.name</name>
+ <name>database</name>
+ <value>oracle</value>
</property>
</activation>
<properties>
- <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
+ <hibernate.property.username>oracleuser</hibernate.property.username>
+ <hibernate.property.password>oraclepwd</hibernate.property.password>
+ <hibernate.property.server>ORASERVER</hibernate.property.server>
+ <hibernate.property.dbname>JBPM</hibernate.property.dbname>
</properties>
</profile>
+
+ <profile>
+ <id>mysql-private-properties</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+ <properties>
+ <hibernate.property.username>mysqluser</hibernate.property.username>
+ <hibernate.property.password>mysqlpwd</hibernate.property.password>
+ <hibernate.property.server>localhost</hibernate.property.server>
+ <hibernate.property.dbname>JBPM</hibernate.property.dbname>
+ </properties>
+ </profile>
</profiles>
+
</profilesXml>
More information about the jbpm-commits
mailing list