[jbpm-commits] JBoss JBPM SVN: r4019 - in jbpm4/branches/tbaeyens: modules/config and 16 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-02-25 04:11:22 -0500 (Wed, 25 Feb 2009) New Revision: 4019 Added: jbpm4/branches/tbaeyens/modules/config/src/ jbpm4/branches/tbaeyens/modules/config/src/main/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/db2/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/db2/hibernate.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/config/src/main/resources/logging.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/mysql/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/mysql/hibernate.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/oracle/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/oracle/hibernate.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/postgresql/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/postgresql/hibernate.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/sybase/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/sybase/hibernate.properties jbpm4/branches/tbaeyens/modules/db/scripts/ jbpm4/branches/tbaeyens/modules/db/scripts/build.schema.xml Removed: jbpm4/branches/tbaeyens/modules/db/src/main/ant/build.schema.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/logging.properties Modified: jbpm4/branches/tbaeyens/modules/config/ jbpm4/branches/tbaeyens/modules/db/pom.xml jbpm4/branches/tbaeyens/modules/examples/ jbpm4/branches/tbaeyens/modules/examples/.classpath jbpm4/branches/tbaeyens/modules/examples/pom.xml jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java jbpm4/branches/tbaeyens/modules/test-db/pom.xml jbpm4/branches/tbaeyens/pom.xml jbpm4/branches/tbaeyens/profiles.xml.example Log: new strategy for configuration files Property changes on: jbpm4/branches/tbaeyens/modules/config ___________________________________________________________________ Name: svn:ignore + target Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/db2/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/db2/hibernate.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/db2/hibernate.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,10 @@ +hibernate.dialect=org.hibernate.dialect.DB2Dialect +hibernate.connection.driver_class=com.ibm.db2.jcc.DB2Driver + +hibernate.connection.url=${jdbc.db2.url} +hibernate.connection.username=${jdbc.db2.username} +hibernate.connection.password=${jdbc.db2.password} + +hibernate.format_sql=true +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,21 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 2.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd"> + +<hibernate-configuration> + + <session-factory> + <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.pvm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + </session-factory> + +</hibernate-configuration> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,8 @@ +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 Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/jbpm.cfg.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <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 /> + <history-service /> + <management-service /> + <identity-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration resource="hibernate.cfg.xml"> + <properties resource="hibernate.properties" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <script-manager default-expression-language="juel" + default-script-language="juel" + read-contexts="execution, environment, process-engine" + write-context=""> + <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> + </script-manager> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <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-context> + + <transaction-context> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + <history-session /> + <identity-session realm="realm://jbpm-identity" /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/resources/jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/logging.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/logging.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/logging.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,32 @@ +handlers= java.util.logging.MemoryHandler + +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = INFO +java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter + +java.util.logging.MemoryHandler.level=FINEST +#java.util.logging.MemoryHandler.filter= +java.util.logging.MemoryHandler.size=500 +java.util.logging.MemoryHandler.push=SEVERE +java.util.logging.MemoryHandler.target=org.jbpm.internal.log.ConsoleHandler + +org.jbpm.internal.log.ConsoleHandler.level = FINEST +org.jbpm.internal.log.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter + +# For example, set the com.xyz.foo logger to only log SEVERE messages: +# com.xyz.foo.level = SEVERE + +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.level=INFO +org.hibernate.cfg.HbmBinder.level=SEVERE +org.hibernate.cfg.SettingsFactory.level=SEVERE +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST + Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/mysql/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/mysql/hibernate.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/mysql/hibernate.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,10 @@ +hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect +hibernate.connection.driver_class=com.mysql.jdbc.Driver + +hibernate.connection.url=${jdbc.mysql.url} +hibernate.connection.username=${jdbc.mysql.username} +hibernate.connection.password=${jdbc.mysql.password} + +hibernate.format_sql=true +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/oracle/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/oracle/hibernate.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/oracle/hibernate.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,13 @@ +hibernate.dialect=org.hibernate.dialect.Oracle9Dialect +hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver + +hibernate.connection.url=${jdbc.oracle.url} +hibernate.connection.username=${jdbc.oracle.username} +hibernate.connection.password=${jdbc.oracle.password} + +hibernate.query.substitutions=true 1, false 0 + +hibernate.format_sql=true +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/postgresql/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/postgresql/hibernate.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/postgresql/hibernate.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,11 @@ +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.connection.driver_class=org.postgresql.Driver + +hibernate.connection.url=${jdbc.postgresql.url} +hibernate.connection.username=${jdbc.postgresql.username} +hibernate.connection.password=${jdbc.postgresql.password} + +hibernate.format_sql=true +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/tbaeyens/modules/config/src/main/resources/sybase/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/sybase/hibernate.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/sybase/hibernate.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,11 @@ +hibernate.dialect=org.hibernate.dialect.SybaseDialect +hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver +# hibernate.connection.driver_class=com.sybase.jdbc3.jdbc.SybDriver + +hibernate.connection.url=${jdbc.sybase.url} +hibernate.connection.username=${jdbc.sybase.username} +hibernate.connection.password=${jdbc.sybase.password} + +hibernate.format_sql=true +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/branches/tbaeyens/modules/db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/pom.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/db/pom.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -37,6 +37,11 @@ <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-config</artifactId> + <version>${version}</version> + </dependency> <!-- Database Driver Versions --> <dependency> @@ -60,168 +65,70 @@ <!-- Plugins --> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> <plugins> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>unpack.jbpm.db</id> - <phase>generate-resources</phase> + <id>unpack.jbpm.config</id> + <phase>validate</phase> <goals> - <goal>unpack</goal> + <goal>unpack-dependencies</goal> </goals> <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> + <includeArtifactIds>jbpm-config</includeArtifactIds> <excludeTransitive>true</excludeTransitive> - <outputDirectory>target/jpdl-config</outputDirectory> + <outputDirectory>target/jbpm-config</outputDirectory> </configuration> </execution> </executions> </plugin> + <plugin> - <artifactId>maven-antrun-plugin</artifactId> + <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>install.hibernate.database.properties</id> - <phase>generate-test-resources</phase> + <id>filter.db.properties</id> + <phase>generate-sources</phase> <goals> - <goal>run</goal> + <goal>copy-resources</goal> </goals> <configuration> - <tasks> - <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" - tofile="target/test-classes/hibernate.cfg.xml" - overwrite="true" /> - </tasks> - </configuration> + <outputDirectory>target/jbpm-config-filtered</outputDirectory> + <resources> + <resource> + <directory>target/jbpm-config</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> <execution> <id>generate-db-scripts</id> - <phase>process-resources</phase> + <phase>generate-resources</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <ant antfile="src/main/ant/build.schema.xml" target="create-schema" /> + <ant antfile="scripts/build.schema.xml" target="generate.db.scripts" /> </tasks> </configuration> </execution> </executions> </plugin> + </plugins> </build> - <profiles> - <profile> - <id>drop-tables</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-tables</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <!-- Implicit reference to all command line switches, i.e. -Ddatabase=xyz --> - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - <property name="plugin_classpath" refid="maven.plugin.classpath"/> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <ant antfile="target/test-classes/antrun-create_drop.xml" target="drop-tables" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>create-tables</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-tables</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <!-- Implicit reference to all command line switches, i.e. -Ddatabase=xyz --> - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - <property name="plugin_classpath" refid="maven.plugin.classpath"/> - - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <ant antfile="target/test-classes/antrun-create_drop.xml" target="create-tables" /> - </tasks> - </configuration> - </execution> - </executions> - </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>${oracle.version}</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> - </project> \ No newline at end of file Copied: jbpm4/branches/tbaeyens/modules/db/scripts/build.schema.xml (from rev 4001, jbpm4/trunk/modules/db/src/main/ant/build.schema.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/db/scripts/build.schema.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db/scripts/build.schema.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -0,0 +1,79 @@ +<?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: antrun-jbpmschema.xml 2999 2008-11-19 16:16:01Z thomas.diesler(a)jboss.com $ --> + +<project> + + <!-- ================================================================== --> + <!-- jBPM Database schema --> + <!-- ================================================================== --> + + <target name="generate.db.scripts"> + + <!-- echo message="${maven.runtime.classpath}"/ --> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath path="${maven.runtime.classpath}"/> + </taskdef> + + <mkdir dir="target/classes/create" /> + <mkdir dir="target/classes/drop" /> + + <!-- DB2 --> + <create-ddl db="db2"/> + + <!-- MySQL --> + <create-ddl db="mysql"/> + + <!-- Oracle --> + <create-ddl db="oracle"/> + + <!-- PostgreSQL --> + <create-ddl db="postgresql"/> + + <!-- Sybase --> + <create-ddl db="sybase"/> + + </target> + + <!-- + ============================================ + Macro defs, no need to change anything below + ============================================ + --> + + <macrodef name="create-ddl"> + <attribute name="db"/> + + <sequential> + <echo></echo> + <echo>=====================</echo> + <echo>Create DDL @{db}</echo> + + <schemaexport output=&quot;target/classes/create/jbpm.(a){db}.create.sql&quot; + create="yes" drop="no" + config="target/jbpm-config/hibernate.cfg.xml" + properties=&quot;target/jbpm-config-filtered/(a){db}/hibernate.properties&quot; + text="yes" delimiter=";" + quiet="yes"/> + + <schemaexport output=&quot;target/classes/drop/jbpm.(a){db}.drop.sql&quot; + create="no" drop="yes" + config="target/jbpm-config/hibernate.cfg.xml" + properties=&quot;target/jbpm-config-filtered/(a){db}/hibernate.properties&quot; + text="yes" delimiter=";" + quiet="yes"/> + + <echo>Done.</echo> + <echo>=====================</echo> + </sequential> + </macrodef> + +</project> Property changes on: jbpm4/branches/tbaeyens/modules/db/scripts/build.schema.xml ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/branches/tbaeyens/modules/db/src/main/ant/build.schema.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/ant/build.schema.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/db/src/main/ant/build.schema.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -1,75 +0,0 @@ -<?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: antrun-jbpmschema.xml 2999 2008-11-19 16:16:01Z thomas.diesler(a)jboss.com $ --> - -<project> - - <!-- ================================================================== --> - <!-- jBPM Database schema --> - <!-- ================================================================== --> - - <target name="create-schema"> - <echo message="${maven.runtime.classpath}"/> - - <taskdef name="schemaexport" - classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> - <classpath path="${maven.runtime.classpath}"/> - </taskdef> - - <mkdir dir="target/classes/create"/> - <mkdir dir="target/classes/drop"/> - - <!-- HsqlDB --> - <create-ddl db="hsqldb"/> - - <!-- MySQL --> - <create-ddl db="mysql"/> - - <!-- Oracle --> - <create-ddl db="oracle"/> - - <!-- PostgreSQL --> - <create-ddl db="postgresql"/> - - <!-- Sybase --> - <create-ddl db="sybase"/> - - </target> - - <!-- - ============================================ - Macro defs, no need to change anything below - ============================================ - --> - - <macrodef name="create-ddl"> - <attribute name="db"/> - - <sequential> - <echo></echo> - <echo>=====================</echo> - <echo>Create DDL @{db}</echo> - - <schemaexport output=&quot;target/classes/create/jbpm.(a){db}.create.sql&quot; - create="yes" drop="no" - config=&quot;target/jpdl-config/hibernate.cfg.(a){db}.xml&quot; - text="yes" delimiter=";" - quiet="yes"/> - <schemaexport output=&quot;target/classes/drop/jbpm.(a){db}.drop.sql&quot; - create="no" drop="yes" - config=&quot;target/jpdl-config/hibernate.cfg.(a){db}.xml&quot; - text="yes" delimiter=";" - quiet="yes"/> - - <echo>Done.</echo> - <echo>=====================</echo> - </sequential> - </macrodef> - -</project> Property changes on: jbpm4/branches/tbaeyens/modules/examples ___________________________________________________________________ Name: svn:ignore - *.iml target + *.iml target .settings Modified: jbpm4/branches/tbaeyens/modules/examples/.classpath =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/.classpath 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/examples/.classpath 2009-02-25 09:11:22 UTC (rev 4019) @@ -2,7 +2,7 @@ <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.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/test-classes"/> </classpath> Modified: jbpm4/branches/tbaeyens/modules/examples/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -30,24 +30,20 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-config</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> <scope>test</scope> - <!--exclusions> TODO: Re-enable when JBPM-1997 is done. - <exclusion> - <artifactId>org.jbpm.jbpm4</artifactId> - <groupId>jbpm-pvm</groupId> - </exclusion> - </exclusions--> </dependency> <dependency> <groupId>org.jbpm.jbpm4.dependencies.esb</groupId> @@ -61,53 +57,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack.jbpm.db</id> - <phase>generate-test-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - <excludeTransitive>true</excludeTransitive> - <outputDirectory>target/jpdl-config</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>install.hibernate.database.properties</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" - tofile="target/test-classes/examples-hibernate.cfg.xml" - overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> </project> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-25 09:11:22 UTC (rev 4019) @@ -22,6 +22,7 @@ package org.jbpm.examples.end.multiple; import org.jbpm.Execution; +import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.test.JbpmTestCase; Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine-context> - - <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 /> - <history-service /> - <management-service /> - <task-service /> - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration resource="examples-hibernate.cfg.xml"> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> - </script-manager> - - <job-executor auto-start="false" /> - <job-test-helper /> - - <id-generator /> - <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-context> - - <transaction-context> - <hibernate-session /> - <transaction /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - </transaction-context> - -</jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -1,28 +0,0 @@ -handlers= java.util.logging.ConsoleHandler -# to add the error triggered file handler -# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler - -redirect.commons.logging = enabled - -java.util.logging.ConsoleHandler.level = FINEST -java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter - -# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 -# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF -# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log - -# For example, set the com.xyz.foo logger to only log SEVERE messages: -# com.xyz.foo.level = SEVERE - -org.jbpm.level=INFO -org.jbpm.pvm.internal.tx.level=FINE -org.jbpm.pvm.internal.wire.level=FINE -org.jbpm.pvm.internal.util.level=FINE - -org.hibernate.level=INFO -org.hibernate.cfg.HbmBinder.level=SEVERE -org.hibernate.cfg.SettingsFactory.level=SEVERE -# org.hibernate.SQL.level=FINEST -# org.hibernate.type.level=FINEST -# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST -# org.hibernate.transaction.level=FINEST Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -60,51 +60,6 @@ <testClassesDirectory>target/classes</testClassesDirectory> </configuration> </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack.jbpm.db</id> - <phase>generate-test-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - <excludeTransitive>true</excludeTransitive> - <outputDirectory>target/jpdl-config</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>install.hibernate.database.properties</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="target/jpdl-config/hibernate.cfg.${database}.xml" - tofile="target/classes/testDb-hibernate.cfg.xml" - overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine-context> - - <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 /> - <history-service /> - <management-service /> - <identity-service /> - <task-service /> - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration resource="testDb-hibernate.cfg.xml"> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> - </script-manager> - - <job-executor auto-start="false" /> - <job-test-helper /> - - <id-generator /> - <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-context> - - <transaction-context> - <hibernate-session /> - <transaction /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - </transaction-context> - -</jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/logging.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/logging.properties 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/modules/test-db/src/main/resources/logging.properties 2009-02-25 09:11:22 UTC (rev 4019) @@ -1,32 +0,0 @@ -handlers= java.util.logging.MemoryHandler - -redirect.commons.logging = enabled - -java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter - -java.util.logging.MemoryHandler.level=FINEST -#java.util.logging.MemoryHandler.filter= -java.util.logging.MemoryHandler.size=500 -java.util.logging.MemoryHandler.push=SEVERE -java.util.logging.MemoryHandler.target=org.jbpm.internal.log.ConsoleHandler - -org.jbpm.internal.log.ConsoleHandler.level = FINEST -org.jbpm.internal.log.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter - -# For example, set the com.xyz.foo logger to only log SEVERE messages: -# com.xyz.foo.level = SEVERE - -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.level=FINE -org.hibernate.cfg.HbmBinder.level=SEVERE -org.hibernate.cfg.SettingsFactory.level=SEVERE -org.hibernate.SQL.level=FINEST -# org.hibernate.type.level=FINEST -# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST -# org.hibernate.transaction.level=FINEST - Modified: jbpm4/branches/tbaeyens/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/pom.xml 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/pom.xml 2009-02-25 09:11:22 UTC (rev 4019) @@ -82,6 +82,11 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-config</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-log</artifactId> <version>${version}</version> </dependency> @@ -97,6 +102,11 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-db</artifactId> <version>${version}</version> </dependency> @@ -281,12 +291,6 @@ <!-- Plugins --> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -299,6 +303,23 @@ </configuration> </plugin> <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.config</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <includeArtifactIds>jbpm-config</includeArtifactIds> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/test-classes</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -453,6 +474,125 @@ </dependency> </dependencies> </profile> + + <profile> + <id>database</id> + <activation> + <property> + <name>database</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>filter.db.properties</id> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target/test-classes</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>target/test-classes/${database}</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>validate</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>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}" + userid="${hibernate.connection.username}" + password="${hibernate.connection.password}" + onerror="continue"> + <classpath> + <path refid="maven.test.classpath" /> + </classpath> + </sql> + <sql src="target/jbpm-db/create/jbpm.${database}.create.sql" + driver="${hibernate.connection.driver_class}" + url="${hibernate.connection.url}" + userid="${hibernate.connection.username}" + password="${hibernate.connection.password}" + onerror="continue"> + <classpath> + <path refid="maven.test.classpath" /> + </classpath> + </sql> + </tasks> + </configuration> + </execution> + <execution> + <id>drop.schema</id> + <phase>prepare-package</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}" + userid="${hibernate.connection.username}" + password="${hibernate.connection.password}"> + <classpath> + <path refid="maven.test.classpath" /> + </classpath> + </sql> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + <!-- Name: hsqldb Modified: jbpm4/branches/tbaeyens/profiles.xml.example =================================================================== --- jbpm4/branches/tbaeyens/profiles.xml.example 2009-02-25 09:10:05 UTC (rev 4018) +++ jbpm4/branches/tbaeyens/profiles.xml.example 2009-02-25 09:11:22 UTC (rev 4019) @@ -26,35 +26,28 @@ <!-- DEFAULT CONNECTION SETTINGS FOR THE JBPM QA ENV --> - <jdbc.mysql.server>localhost</jdbc.mysql.server> - <jdbc.mysql.port>3306</jdbc.mysql.port> - <jdbc.mysql.database>jbpm4</jdbc.mysql.database> - <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> + + <jdbc.db2.url>jdbc:db2://[server]:50000/[dbname]</jdbc.db2.url> + <jdbc.db2.username>jbpmtest</jdbc.db2.username> + <jdbc.db2.username>jbpmtest</jdbc.db2.username> + + <jdbc.mysql.url>jdbc:mysql://[server]:3306/[dbname]</jdbc.mysql.url> <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> - <jdbc.mysql.password></jdbc.mysql.password> + <jdbc.mysql.password>jbpmtest</jdbc.mysql.password> - <jdbc.postgresql.server>localhost</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm4</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> + <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> + <jdbc.oracle.url>jdbc:oracle:thin:@[server]:1521:[dbname]</jdbc.oracle.url> + + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.server}/${jdbc.dbname}</jdbc.postgresql.url> <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> <jdbc.postgresql.password></jdbc.postgresql.password> - <jdbc.sybase.server>localhost</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpm4</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> + <jdbc.sybase.url>jdbc:jtds:sybase://[server]/[dbname]</jdbc.sybase.url> <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + <!-- jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource --> - <jdbc.oracle.server>localhost</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>XE</jdbc.oracle.database> - <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> - <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> - <jdbc.oracle.url>jdbc:oracle:thin:${jdbc.oracle.username}/${jdbc.oracle.password}@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> </properties> </profile>