January 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3717 - jbpm4/branches/hbraun.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 08:44:13 -0500 (Fri, 23 Jan 2009) New Revision: 3717 Modified: jbpm4/branches/hbraun/pom.xml Log: Exclude db module Modified: jbpm4/branches/hbraun/pom.xml =================================================================== --- jbpm4/branches/hbraun/pom.xml 2009-01-23 13:43:45 UTC (rev 3716) +++ jbpm4/branches/hbraun/pom.xml 2009-01-23 13:44:13 UTC (rev 3717) @@ -37,9 +37,9 @@ <module>modules/log</module> <module>modules/pvm</module> <module>modules/task</module> -  +  </modules>  @@ -318,8 +318,7 @@ <profiles> <profile> <id>distro</id> - <modules> - <module>modules/db</module> + <modules> <module>modules/devguide</module> <module>modules/distro</module> <module>modules/userguide</module> @@ -338,8 +337,7 @@ <profile> <id>load</id> - <modules> - <module>modules/db</module> + <modules> <module>modules/test-load</module> </modules> </profile>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3716 - in jbpm4/branches/hbraun/modules: jpdl/src/main/resources/db.properties and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 08:43:45 -0500 (Fri, 23 Jan 2009) New Revision: 3716 Modified: jbpm4/branches/hbraun/modules/examples/pom.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties jbpm4/branches/hbraun/modules/test-db/pom.xml Log: Fix dep's on hibernate.properties Modified: jbpm4/branches/hbraun/modules/examples/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/examples/pom.xml 2009-01-23 13:32:34 UTC (rev 3715) +++ jbpm4/branches/hbraun/modules/examples/pom.xml 2009-01-23 13:43:45 UTC (rev 3716) @@ -39,4 +39,52 @@ </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/database-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/database-config/db.properties/${database}.properties" + tofile="target/test-classes/hibernate.properties" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties 2009-01-23 13:32:34 UTC (rev 3715) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties 2009-01-23 13:43:45 UTC (rev 3716) @@ -6,6 +6,6 @@ hibernate.connection.url=${jdbc.hsql.url} hibernate.connection.username=${jdbc.hsql.username} hibernate.connection.password=${jdbc.hsql.password} - +hibernate.hbm2ddl.auto=create-drop hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/branches/hbraun/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/test-db/pom.xml 2009-01-23 13:32:34 UTC (rev 3715) +++ jbpm4/branches/hbraun/modules/test-db/pom.xml 2009-01-23 13:43:45 UTC (rev 3716) @@ -27,54 +27,79 @@  <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - <version>${version}</version> - </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> </dependency> - + <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-task</artifactId> + <artifactId>jbpm-test-base</artifactId> <version>${version}</version> - <scope>test</scope> </dependency> - -  - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - + </dependencies> - +  <build> <plugins> - <plugin> + <plugin>  <artifactId>maven-surefire-plugin</artifactId> <configuration> <testSourceDirectory>src/main/java</testSourceDirectory> <classesDirectory>target/classes</classesDirectory> - <testClassesDirectory>target/classes</testClassesDirectory> + <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/database-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/database-config/db.properties/${database}.properties" + tofile="target/classes/hibernate.properties" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - + </project> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3715 - in jbpm4/branches/hbraun/modules/pvm/src: test/resources and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 08:32:34 -0500 (Fri, 23 Jan 2009) New Revision: 3715 Added: jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties Removed: jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties Log: Exclude hibernate.properties from pvm.jar Deleted: jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties 2009-01-23 12:08:52 UTC (rev 3714) +++ jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties 2009-01-23 13:32:34 UTC (rev 3715) @@ -1,8 +0,0 @@ -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/hbraun/modules/pvm/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties (rev 0) +++ jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties 2009-01-23 13:32:34 UTC (rev 3715) @@ -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

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3714 - jbpm4/branches/hbraun/modules/pvm.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 07:08:52 -0500 (Fri, 23 Jan 2009) New Revision: 3714 Modified: jbpm4/branches/hbraun/modules/pvm/pom.xml Log: Reenable JUELExpressionTest Modified: jbpm4/branches/hbraun/modules/pvm/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/pvm/pom.xml 2009-01-23 12:07:39 UTC (rev 3713) +++ jbpm4/branches/hbraun/modules/pvm/pom.xml 2009-01-23 12:08:52 UTC (rev 3714) @@ -107,8 +107,7 @@ <exclude>**/*TestCase.java</exclude>  - <exclude>**/NormalMessageTest.java</exclude> - <exclude>org/jbpm/pvm/internal/expr/JuelExpressionTest.java</exclude> + <exclude>**/NormalMessageTest.java</exclude> </excludes> </configuration> </plugin>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3713 - in jbpm4/branches/hbraun: modules/db and 5 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 07:07:39 -0500 (Fri, 23 Jan 2009) New Revision: 3713 Modified: jbpm4/branches/hbraun/modules/db/jbpm4-db.iml jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml jbpm4/branches/hbraun/modules/examples/pom.xml jbpm4/branches/hbraun/modules/pvm/pom.xml jbpm4/branches/hbraun/modules/task/pom.xml jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml jbpm4/branches/hbraun/pom.xml Log: Fix JBPM-1980: Failed to initialze ScriptEngineManager on JDK 1.5 Modified: jbpm4/branches/hbraun/modules/db/jbpm4-db.iml =================================================================== --- jbpm4/branches/hbraun/modules/db/jbpm4-db.iml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/db/jbpm4-db.iml 2009-01-23 12:07:39 UTC (rev 3713) @@ -3,9 +3,218 @@ <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> - <content url="file://$MODULE_DIR$" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module" module-name="jbpm4-pvm" /> + <orderEntry type="module" module-name="jbpm4-api" /> + <orderEntry type="module" module-name="jbpm4-task" /> + <orderEntry type="module" module-name="jbpm4-jpdl" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml 2009-01-23 12:07:39 UTC (rev 3713) @@ -24,214 +24,236 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test"> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test"> + <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime"> + <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <library name="M2 Dep: rhino:js:jar:1.5R4.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <library name="M2 Dep: ant:ant:jar:1.5.4:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: httpunit:httpunit:jar:1.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.3:compile"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.3/livetribe-jsr223-2.0.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: rhino:js:jar:1.5R4.1:test"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> @@ -264,26 +286,15 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: ant:ant:jar:1.5.4:test"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> @@ -293,17 +304,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: httpunit:httpunit:jar:1.6:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> @@ -314,15 +314,6 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml =================================================================== --- jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml 2009-01-23 12:07:39 UTC (rev 3713) @@ -4,10 +4,245 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-pvm" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module" module-name="jbpm4-api" /> + <orderEntry type="module" module-name="jbpm4-task" /> + <orderEntry type="module" module-name="jbpm4-jpdl" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/modules/examples/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/examples/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/examples/pom.xml 2009-01-23 12:07:39 UTC (rev 3713) @@ -29,29 +29,14 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> + <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </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> - </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - </dependencies> </project> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/pvm/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/pvm/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/pvm/pom.xml 2009-01-23 12:07:39 UTC (rev 3713) @@ -59,11 +59,11 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -127,7 +127,6 @@ <configuration> <quiet>true</quiet> <source>1.5</source> - <target>1.5</target> <verbose>false</verbose> <noqualifier>all</noqualifier> <excludePackageNames>*.internal:*.test</excludePackageNames> Modified: jbpm4/branches/hbraun/modules/task/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/task/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/task/pom.xml 2009-01-23 12:07:39 UTC (rev 3713) @@ -50,18 +50,18 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> + <dependency> <groupId>juel</groupId> <artifactId>juel</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> - </dependency> + <artifactId>juel-engine</artifactId> + </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> Modified: jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml =================================================================== --- jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml 2009-01-23 12:07:39 UTC (rev 3713) @@ -5,9 +5,244 @@ <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-pvm" exported="" /> + <orderEntry type="module" module-name="jbpm4-toplevel" exported="" /> + <orderEntry type="module" module-name="jbpm4-api" exported="" /> + <orderEntry type="module" module-name="jbpm4-task" exported="" /> + <orderEntry type="module" module-name="jbpm4-jpdl" exported="" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: stax:stax:jar:1.2.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/branches/hbraun/pom.xml =================================================================== --- jbpm4/branches/hbraun/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) +++ jbpm4/branches/hbraun/pom.xml 2009-01-23 12:07:39 UTC (rev 3713) @@ -29,22 +29,22 @@ </organization>  - <modules> + <modules> <module>modules/api</module> -  + <module>modules/examples</module> +  <module>modules/jpdl</module> <module>modules/log</module> <module>modules/pvm</module> -  </modules>  <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> <hibernate.version>3.2.6.ga</hibernate.version> @@ -53,7 +53,7 @@ <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jbossesb.version>4.4.0.GA</jbossesb.version> <jboss.client.version>4.2.2.GA</jboss.client.version> - <jsr233.version>2.0.3</jsr233.version> + <jsr233.version>2.0.5</jsr233.version> <juel.version>2.1.0</juel.version> <junit.version>3.8.1</junit.version> <log4j.version>1.2.14</log4j.version> @@ -69,7 +69,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-log</artifactId> @@ -90,6 +90,11 @@ <artifactId>jbpm-db</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.livetribe</groupId> + <artifactId>livetribe-jsr223</artifactId> + <version>${jsr233.version}</version> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -151,12 +156,12 @@ </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <artifactId>juel-impl</artifactId> <version>${juel.version}</version> </dependency> <dependency> <groupId>juel</groupId> - <artifactId>juel-impl</artifactId> + <artifactId>juel-engine</artifactId> <version>${juel.version}</version> </dependency> <dependency> @@ -165,11 +170,6 @@ <version>${junit.version}</version> </dependency> <dependency> - <groupId>org.livetribe</groupId> - <artifactId>livetribe-jsr223</artifactId> - <version>${jsr233.version}</version> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3712 - in jbpm4/branches/hbraun: modules/config/src/main/resources and 23 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 05:07:54 -0500 (Fri, 23 Jan 2009) New Revision: 3712 Added: jbpm4/branches/hbraun/modules/db/jbpm4-db.iml jbpm4/branches/hbraun/modules/distro/scripts/ jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml Removed: jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties Modified: jbpm4/branches/hbraun/modules/db/pom.xml jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties jbpm4/branches/hbraun/modules/distro/pom.xml jbpm4/branches/hbraun/modules/enterprise/pom.xml jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml jbpm4/branches/hbraun/modules/jpdl/pom.xml jbpm4/branches/hbraun/modules/pvm/pom.xml jbpm4/branches/hbraun/pom.xml jbpm4/branches/hbraun/profiles.xml.example Log: Clean up config and test coverage, first cut Deleted: jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,12 +0,0 @@ -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/branches/hbraun/modules/db/jbpm4-db.iml =================================================================== --- jbpm4/branches/hbraun/modules/db/jbpm4-db.iml (rev 0) +++ jbpm4/branches/hbraun/modules/db/jbpm4-db.iml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/branches/hbraun/modules/db/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/db/pom.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/db/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -24,7 +24,7 @@ <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - +  <dependencies> <dependency> @@ -51,6 +51,12 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties =================================================================== --- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,8 +1,11 @@ +## +## jbpm-db hsqldb config +## hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.hsql.url} +hibernate.connection.username=${jdbc.hsql.username} +hibernate.connection.password=${jdbc.hsql.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties =================================================================== --- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,8 +1,11 @@ +## +## jbpm-db mysql config +## hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect hibernate.connection.driver_class=com.mysql.jdbc.Driver -hibernate.connection.url=jdbc:mysql://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.mysql.url} +hibernate.connection.username=${jdbc.mysql.username} +hibernate.connection.password=${jdbc.mysql.password} hibernate.cache.use_second_level_cache=true Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties =================================================================== --- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,9 +1,9 @@ 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.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.postgresql.url} +hibernate.connection.username=${jdbc.postgresql.username} +hibernate.connection.password=${jdbc.postgresql.password} hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties =================================================================== --- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,8 +1,8 @@ hibernate.dialect=org.hibernate.dialect.SybaseDialect hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -hibernate.connection.url=jdbc:jtds:sybase://${jdbc.server}/${jdbc.dbname} -hibernate.connection.username=${jdbc.username} -hibernate.connection.password=${jdbc.password} +hibernate.connection.url=${jdbc.ybase.url} +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/branches/hbraun/modules/distro/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/pom.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/distro/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -11,7 +11,7 @@  <project 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/maven-v4_0_0.xsd"> - + <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Distro</name> <groupId>org.jbpm.jbpm4</groupId> @@ -28,18 +28,13 @@  <properties> </properties> - -  - <dependencyManagement> - </dependencyManagement> - +  <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-gpd</artifactId> <type>zip</type> - <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -63,6 +58,12 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-db</artifactId> <version>${version}</version> </dependency> @@ -76,8 +77,19 @@ <artifactId>jbpm-test-db</artifactId> <version>${version}</version> </dependency> -  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + </dependency> + +  </dependencies> - +  <build> <plugins> @@ -123,8 +135,57 @@ </descriptors> </configuration> </execution> + +  + + <execution> + <id>create-installer</id> + <phase>process-resources</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>deploy-artifacts</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>izpack</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="database" value="${database}" /> + <property name="jboss.home" value="${jboss.home}" /> + <property name="jboss422.home" value="${jboss422.home}" /> + <property name="jboss423.home" value="${jboss423.home}" /> + <property name="jboss500.home" value="${jboss500.home}" /> + <property name="jbpm.target.container" value="${jbpm.target.container}" /> + <property name="product.name" value="${project.name}" /> + <property name="product.short.name" value="${artifactId}" /> + <property name="product.version" value="${project.version}" /> + <property name="user.home" value="${user.home}" /> + <ant antfile="scripts/antrun-installer.xml" target="build-installer" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> Added: jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[]]></replacevalue> + </replace> + </sequential> + </macrodef> + +  +  +  + <property name="output.dir" value="${basedir}/target" /> + <property name="resources.dir" value="${basedir}/src/main/resources" /> + <property name="filtered.resources.dir" value="${output.dir}/resources" /> + <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" /> + <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" /> + <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" /> + +  +  +  + <target name="init"> + + </target> + +  +  +  + <target name="configure" depends="init"> + +  + + <condition property="database.is.hsqldb" value="true" else="false"> + <equals arg1="${database}" arg2="hsqldb"/> + </condition> + <condition property="database.is.mysql" value="true" else="false"> + <equals arg1="${database}" arg2="mysql"/> + </condition> + <condition property="database.is.postgresql" value="true" else="false"> + <equals arg1="${database}" arg2="postgresql"/> + </condition> + <condition property="database.is.sybase" value="true" else="false"> + <equals arg1="${database}" arg2="sybase"/> + </condition> + + </target> + +  +  +  + <target name="build-installer" depends="configure"> + + <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true"> + <fileset dir="${resources.dir}/installer" /> + <filterset> + <filter token="database" value="${database}" /> + <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> + <filter token="database.is.mysql" value="${database.is.mysql}" /> + <filter token="database.is.postgresql" value="${database.is.postgresql}" /> + <filter token="database.is.sybase" value="${database.is.sybase}" /> + <filter token="jbpm.target.container" value="${jbpm.target.container}" /> + <filter token="jboss.home" value="${jboss.home}" /> + <filter token="product.version" value="${product.version}" /> + <filter token="user.home" value="${user.home}" /> + </filterset> + </copy> + +  + <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask"> + <classpath> + <pathelement path="${maven.runtime.classpath}" /> + </classpath> + </taskdef> + <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> + <mkdir dir="${izpack.temp.dir}" /> + +  + <echo message="Running IzPack to build the installer..." /> + <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar" + installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" /> + +  + <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" /> + </target> +</project> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,155 @@ +<assembly 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/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>compile</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>test</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> + </includes> + <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> + <outputDirectory>gpd</outputDirectory> + </dependencySet> + </dependencySets> + +  + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>jboss.eula.txt</include> + <include>license.txt</include> + <include>readme.html</include> + <include>release.notes.html</include> + </includes> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/site/apidocs</directory> + <outputDirectory>doc/javadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/schemadoc</directory> + <outputDirectory>doc/schemadoc</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target/create</directory> + <outputDirectory>db/create</outputDirectory> + </fileSet> + <fileSet> + <directory>../db/target/drop</directory> + <outputDirectory>db/drop</outputDirectory> + </fileSet> + <fileSet> + <directory>../devguide/target/docbook/publish/en</directory> + <outputDirectory>doc/devguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../userguide/target/docbook/publish/en</directory> + <outputDirectory>doc/userguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../log/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../test-base/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/java</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/resources</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/eclipse</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,14 @@ +<antactions> + <pack name="Download JBoss-5.0.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-jboss"/> + </antcall> + </pack> + <pack name="Download Eclipse-3.4.0"> + <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml"> + <property name="install.path" value="$INSTALL_PATH"/> + <target name="download-eclipse"/> + </antcall> + </pack> +</antactions> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,34 @@ +<AutomatedInstallation langpack="eng"> + <com.izforge.izpack.panels.HelloPanel /> + <com.izforge.izpack.panels.TargetPanel> + <installpath>@user.home@/jbpm-jpdl-(a)product.version@</installpath> + </com.izforge.izpack.panels.TargetPanel> + <com.izforge.izpack.panels.TreePacksPanel> + <pack name="jBPM4 Standalone" index="0" selected="true"/> + <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> + <pack name="JSF-Console" index="2" selected="true"/> + <pack name="GWT-Console" index="3" selected="true"/> + <pack name="Optional Components" index="4" selected="false"/> + <pack name="Download JBoss-5.0.0" index="5" selected="false"/> + <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> + </com.izforge.izpack.panels.TreePacksPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossTargetServer" value="default" /> + <entry key="jbossSelection" value="@jbpm.target.container@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="dbSelection" value="@database@"/> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> + <entry key="jbossInstallPath" value="@jboss.home@" /> + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.SummaryPanel /> + <com.izforge.izpack.panels.InstallPanel /> + <com.izforge.izpack.panels.FinishPanel /> +</AutomatedInstallation> Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project> + + <target name="download-jboss"> + <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip?modtime=1228452..." dest="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" usetimestamp="true"/> + <unzip src="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" dest="${install.path}"/> + </target> + <target name="download-eclipse"> + <get src="http://download.eclipse.org/technology/epp/downloads/release/ganymede/R/e..." + dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/> + <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/> + </target> + +</project> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,262 @@ +<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> +<installation version="1.0"> +  + <info> + <appname>@{product.name}</appname> + <appversion>@{product.version}</appversion> + <uninstaller name="remove.task" write="yes" /> + </info> + <guiprefs width="600" height="440" resizable="yes"> +  + </guiprefs> + <locale> + <langpack iso3="eng" /> + </locale> + +  + <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> + <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> + +  + <listeners> + <listener installer="AntActionInstallerListener" /> + </listeners> + +  + <resources> + <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" /> + <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" /> + <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" /> + </resources> + +  + <variables> + <variable name="jboss422.home" value="@{jboss422.home}" /> + <variable name="jboss423.home" value="@{jboss423.home}" /> + <variable name="jboss500.home" value="@{jboss500.home}" /> + </variables> + +  + <dynamicvariables> + <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" /> + <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" /> + <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" /> + </dynamicvariables> + +  + <conditions> +  + <condition type="variable" id="isJBoss422"> + <name>jbossSelection</name> + <value>jboss422</value> + </condition> + <condition type="variable" id="isJBoss423"> + <name>jbossSelection</name> + <value>jboss423</value> + </condition> + <condition type="variable" id="isJBoss500"> + <name>jbossSelection</name> + <value>jboss500</value> + </condition> + +  + <condition type="variable" id="isHypersonic"> + <name>dbSelection</name> + <value>hsqldb</value> + </condition> + <condition type="variable" id="isMySQL"> + <name>dbSelection</name> + <value>mysql</value> + </condition> + <condition type="variable" id="isPostgreSQL"> + <name>dbSelection</name> + <value>postgresql</value> + </condition> + <condition type="variable" id="isSybase"> + <name>dbSelection</name> + <value>sybase</value> + </condition> + </conditions> + +  + <panels> + <panel classname="HelloPanel" /> + <panel classname="TargetPanel" /> + <panel classname="TreePacksPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> + <panel classname="SummaryPanel" /> + <panel classname="InstallPanel" /> + <panel classname="FinishPanel" /> + </panels> + +  + <packs> + +  + + <pack name="jBPM4 Standalone" required="yes" preselected="yes"> + <description>The jBPM4 Standalone Components</description> + +  + <file src="@{deploy.artifacts.dir}/release.notes.html" targetdir="$INSTALL_PATH" override="true" /> + <file src="@{deploy.artifacts.dir}/jboss.eula.txt" targetdir="$INSTALL_PATH" override="true" /> + +  + <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" + unpack="true" override="true" /> + +  + <file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database" + unpack="true" override="true" /> + +  +  + +  + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> + <include name="*.jar" /> + </fileset> + </pack> + +  + + <pack name="jbpm4 JBoss Integration" required="no" preselected="yes"> + + <description>The jbpm4 JBoss Integration</description> + +  +  + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="jbpm-db.jar" /> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-jpdl-config.jar" /> + <include name="jbpm-log.jar" /> + <include name="jbpm-pvm.jar" /> + <include name="jbpm-task.jar" /> + </fileset> + +  +  + + +  +  + +  +  + +  +  + +  + +  + + </pack> + +  + +  + +  + + <pack name="Optional Components" required="no" preselected="no"> + <description>Optional jbpm4 Components</description> + </pack> + +  + <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no"> + <description>Download and Install JBoss-5.0.0</description> +  + <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + +  +  + + </packs> +</installation> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1 @@ +$USER_HOME/jbpm-(a)product.version@ Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,34 @@ +<userInput> + <panel order="0"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="radio" variable="jbossSelection"> + <description align="left" txt="Please choose your target server" /> + <spec> + <choice txt="JBoss-5.0.0" value="jboss500" set="true"/> + <choice txt="JBoss-4.2.3" value="jboss423"/> + <choice txt="JBoss-4.2.2" value="jboss422"/> + </spec> + </field> + <field type="text" variable="jbossTargetServer"> + <spec txt="Server:" size="15" set="default" /> + </field> + </panel> + <panel order="1"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="radio" variable="dbSelection"> + <description align="left" txt="Please choose your target database" /> + <spec> + <choice txt="Hypersonic" value="hsqldb"/> +  +  +  + </spec> + </field> + </panel> + <panel order="2"> + <createForPack name="jBPM4 JBoss Integration" /> + <field type="dir" align="left" variable="jbossInstallPath"> + <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> + </field> + </panel> +</userInput> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html (rev 0) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,87 @@ +<body><h1>jBPM-4.0.0-SNAPSHOT Release Notes</h1> +</p><p><exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude></p></pre> +<p> </p> +<p><strong>Core tests - MySQL</strong></p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p><br /><exclude>org/jbpm/seam/JobExecutorCustomizationTest.java</exclude><br /><br /><exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude></p></pre> +<p> </p> +<p><strong>Core test, Sybase</strong></p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p><br /><exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude></p></pre> +<p> </p> +<p><strong>Enterprise tests - HSQLDB</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p></p><p><exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude></p></pre> +<p> </p> +<p><strong>Enterprise tests, Sybase</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p><br /><exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude><br /><exclude>org/jbpm/persistence/jta/JtaDbPersistenceTest.java</exclude><br /><exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude></p></pre> +<p> </p> +<p> </p> +<p><strong>Examples tests, Sybase</strong></p> +<p> </p> +<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p></p><p><exclude>org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java</exclude></p></pre> +<p> </p--> + +</body> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml (rev 0) +++ jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,329 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module" module-name="jbpm4-pvm" /> + <orderEntry type="module" module-name="jbpm4-api" /> + <orderEntry type="module-library"> + <library name="M2 Dep: cargo:cargo:jar:0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cargo/cargo/0.5/cargo-0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.3/livetribe-jsr223-2.0.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: rhino:js:jar:1.5R4.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: ant:ant:jar:1.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: httpunit:httpunit:jar:1.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: jbpm4/branches/hbraun/modules/enterprise/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -34,7 +34,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> Modified: jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -16,9 +16,9 @@ <include>aspectj:aspectjrt:jar</include> <include>cactus:cactus</include> <include>junit:junit</include> - <include>org.jbpm.jbpm4:jbpm-api</include> +  </includes> <unpack>false</unpack> <scope>test</scope> Deleted: jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,6 +0,0 @@ -hibernate.connection.datasource java\:comp/env/jdbc/JbpmDataSource -hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory -hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -hibernate.format_sql true -hibernate.use_sql_comments true Added: jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml =================================================================== --- jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml (rev 0) +++ jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> +</module> + Deleted: jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,11 +0,0 @@ -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 Modified: jbpm4/branches/hbraun/modules/jpdl/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <project 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/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,6 +35,8 @@  <dependencies> + +  <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> @@ -45,6 +47,8 @@ <artifactId>jbpm-task</artifactId> <version>${version}</version> </dependency> + +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -61,16 +65,83 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-db-scripts</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <ant antfile="scripts/build.schema.xml" target="create-schema" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes>  - <exclude>**/*.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionExpressionTest.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/ProcessParsingTest.java</exclude> + <exclude>org/jbpm/jpdl/parsing/TransitionParsingTest.java</exclude> </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </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/classes/db.properties/${database}.properties" + tofile="target/classes/hibernate.properties" + overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Added: jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,20 @@ +<assembly 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/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm.cfg.xml</include> + <include>logging.properties</include> + <include>hibernate.cfg.xml</include> + <include>db.properties/*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="create-schema"> + <echo message="${maven.runtime.classpath}"/> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath path="${maven.runtime.classpath}"/> + </taskdef> + + <property name="cfg" value="target/classes/hibernate.cfg.xml" /> + + <mkdir dir="target/classes/create"/> + <mkdir dir="target/classes/drop"/> + + <schemaexport properties="target/classes/db.properties/hsqldb.properties" + output="target/classes/create/jbpm.hsqldb.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/hsqldb.properties" + output="target/classes/drop/jbpm.hsqldb.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/mysql.properties" + output="target/classes/create/jbpm.mysql.create.sql" + delimiter=";" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/mysql.properties" + output="target/classes/drop/jbpm.mysql.drop.sql" + delimiter=";" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/oracle.properties" + output="target/classes/create/jbpm.oracle.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" + delimiter=";" /> + <schemaexport properties="target/classes/db.properties/oracle.properties" + output="target/classes/drop/jbpm.oracle.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" + delimiter=";" /> + + <schemaexport properties="target/classes/db.properties/postgresql.properties" + output="target/classes/create/jbpm.postgresql.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/postgresql.properties" + output="target/classes/drop/jbpm.postgresql.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + <schemaexport properties="target/classes/db.properties/sybase.properties" + output="target/classes/create/jbpm.sybase.create.sql" + create="yes" drop="no" config="${cfg}" text="yes" /> + <schemaexport properties="target/classes/db.properties/sybase.properties" + output="target/classes/drop/jbpm.sybase.drop.sql" + create="no" drop="yes" config="${cfg}" text="yes" /> + + </target> + +</project> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.DB2Dialect +# fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc/ +hibernate.connection.driver_class=com.ibm.db2.jcc.DB2Driver +hibernate.connection.url=jdbc:db2://${jdbc.server}:50000/${jdbc.dbname} +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.DerbyDialect +# fetch driver from http://db.apache.org/derby +hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver +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 Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.FirebirdDialect +# fetch driver from http://firebird.sourceforge.net/ +hibernate.connection.driver_class=org.firebirdsql.jdbc.FBDriver +hibernate.connection.url=jdbc:firebirdsql:${jdbc.server}:${jdbc.dbname} +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.FrontbaseDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,11 @@ +## +## jbpm-db hsqldb config +## +hibernate.dialect=org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class=org.hsqldb.jdbcDriver +hibernate.connection.url=${jdbc.hsql.url} +hibernate.connection.username=${jdbc.hsql.username} +hibernate.connection.password=${jdbc.hsql.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect= org.hibernate.dialect.InformixDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.IngresDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.InterbaseDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect= org.hibernate.dialect.MckoiDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,10 @@ +hibernate.dialect=org.hibernate.dialect.SQLServerDialect +# fetch driver from http://msdn.microsoft.com/data/jdbc +hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver +hibernate.connection.url=jdbc:jtds:sqlserver://${jdbc.server}:1433/${jdbc.dbname} +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} +hibernate.query.substitutions=true 1, false 0 + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,12 @@ +## +## jbpm-db mysql config +## +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.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,14 @@ +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.server}:1521:${jdbc.dbname} +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} +hibernate.query.substitutions=true 1, false 0 + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,10 @@ +hibernate.dialect=org.hibernate.dialect.PointbaseDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +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.url} +hibernate.connection.username=${jdbc.postgresql.username} +hibernate.connection.password=${jdbc.postgresql.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,10 @@ +hibernate.dialect=org.hibernate.dialect.ProgressDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,10 @@ +hibernate.dialect=org.hibernate.dialect.SAPDBDialect +# fetch driver from http://google.com +hibernate.connection.driver_class= +hibernate.connection.url= +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} + +hibernate.cache.use_second_level_cache=true +hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,9 @@ +hibernate.dialect=org.hibernate.dialect.SybaseDialect +hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver +hibernate.connection.url=${jdbc.ybase.url} +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 + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,20 @@ +<?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.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + </session-factory> + +</hibernate-configuration> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,71 @@ +<?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 /> + <task-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" /> + <mapping resource="jbpm.task.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 /> + <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 /> + <task-db-session /> + <message-session /> + <timer-session /> + </environment> + +</jbpm-configuration> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,28 @@ +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.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=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=FINEST +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 Deleted: jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,11 +0,0 @@ -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 Modified: jbpm4/branches/hbraun/modules/pvm/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/pvm/pom.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/pvm/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <project 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/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - PVM</name> @@ -31,7 +31,7 @@  <properties> <table.prefix>JBPM_</table.prefix> - <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> +  </properties>  @@ -48,7 +48,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> </dependency> - + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -108,6 +108,7 @@  <exclude>**/NormalMessageTest.java</exclude> + <exclude>org/jbpm/pvm/internal/expr/JuelExpressionTest.java</exclude> </excludes> </configuration> </plugin> @@ -117,7 +118,7 @@  <profiles> </profiles> - + <reporting> <plugins> <plugin> @@ -126,11 +127,13 @@ <configuration> <quiet>true</quiet> <source>1.5</source> + <target>1.5</target> <verbose>false</verbose> - <noqualifier>all</noqualifier> + <noqualifier>all</noqualifier> <excludePackageNames>*.internal:*.test</excludePackageNames> </configuration> </plugin> + </plugins> </reporting> Added: jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties (rev 0) +++ jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -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 Deleted: jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,11 +0,0 @@ -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 Deleted: jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,11 +0,0 @@ -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/branches/hbraun/modules/test-db/jpm4-test-db.iml =================================================================== --- jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml (rev 0) +++ jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml 2009-01-23 10:07:54 UTC (rev 3712) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> +</module> + Deleted: jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,11 +0,0 @@ -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 Deleted: jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties =================================================================== --- jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,16 +0,0 @@ -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.jdbc.batch_size=1 - -# hibernate.show_sql true -# hibernate.format_sql true -# hibernate.use_sql_comments true Modified: jbpm4/branches/hbraun/pom.xml =================================================================== --- jbpm4/branches/hbraun/pom.xml 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/pom.xml 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <project 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/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -29,24 +29,27 @@ </organization>  - <modules> + <modules> <module>modules/api</module> - <module>modules/examples</module> - <module>modules/enterprise</module> +  <module>modules/jpdl</module> <module>modules/log</module> <module>modules/pvm</module> - <module>modules/task</module> +  </modules>  <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> <hibernate.version>3.2.6.ga</hibernate.version> <hsqldb.version>1.8.0.7</hsqldb.version> + <izpack.version>4.1.0</izpack.version> <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jbossesb.version>4.4.0.GA</jbossesb.version> <jboss.client.version>4.2.2.GA</jboss.client.version> @@ -66,7 +69,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-log</artifactId> @@ -82,9 +85,26 @@ <artifactId>jbpm-pvm</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-gpd</artifactId> + <type>zip</type> + <version>${version}</version> + </dependency> +  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + <dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> <version>${cactus.version}</version> @@ -100,6 +120,11 @@ <version>${hsqldb.version}</version> </dependency> <dependency> + <groupId>izpack</groupId> + <artifactId>standalone-compiler</artifactId> + <version>${izpack.version}</version> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> <version>${jboss.j2ee.version}</version> @@ -184,6 +209,12 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -229,6 +260,17 @@ </systemProperties> </configuration> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins>  @@ -316,134 +358,51 @@ </build> </profile> +  <profile> - <id>database</id> + <id>no-database</id> <activation> <property> - <name>database</name> + <name>!database</name> </property> </activation> + <properties> + <database>hsqldb</database> + </properties> <dependencies> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - <version>${version}</version> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> + </profile> - <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-resources-plugin</artifactId> - <executions> - <execution> - <id>resolve props</id> - <phase>compile</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target/resolved.properties</outputDirectory> - <resources> - <resource> - <directory>target/jbpm-db/db.properties</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>install.hibernate.database.properties</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <mkdir dir="target/test-classes" /> - <copy file="target/resolved.properties/${database}.properties" - tofile="target/test-classes/hibernate.properties" - overwrite="true" /> - </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}" - 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> + <id>hsqldb</id> + <activation> + <property> + <name>database</name> + <value>hsqldb</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </profile> +  <profile> <id>oracle</id> Modified: jbpm4/branches/hbraun/profiles.xml.example =================================================================== --- jbpm4/branches/hbraun/profiles.xml.example 2009-01-23 10:04:27 UTC (rev 3711) +++ jbpm4/branches/hbraun/profiles.xml.example 2009-01-23 10:07:54 UTC (rev 3712) @@ -1,43 +1,90 @@ -<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> - -  - - <profile> - <id>oracle-private-properties</id> - <activation> - <property> - <name>database</name> - <value>oracle</value> - </property> - </activation> - <properties> - <jdbc.username>xxxx</jdbc.username> - <jdbc.password>xxxx</jdbc.password> - <jdbc.server>localhost</jdbc.server> - <jdbc.dbname>XE</jdbc.dbname> - </properties> - </profile> + <profiles> - <profile> - <id>mysql-private-properties</id> - <activation> - <property> - <name>database</name> - <value>mysql</value> - </property> - </activation> - <properties> - <jdbc.username>xxxx</jdbc.username> - <jdbc.password>xxxx</jdbc.password> - <jdbc.server>localhost</jdbc.server> - <jdbc.dbname>JBPM</jdbc.dbname> - </properties> - </profile> - - </profiles> +  -</profilesXml> + <profile> + <id>jboss-home-profile</id> + <activation> + <property> + <name>user.name</name> + </property> + </activation> + <properties> + <jboss422.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> + + <jdbc.hsql.server>localhost</jdbc.hsql.server> + <jdbc.hsql.port>3306</jdbc.hsql.port> + <jdbc.hsql.database>jbpmtest</jdbc.hsql.database> +  + <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url> + <jdbc.hsql.username>sa</jdbc.hsql.username> + <jdbc.hsql.password></jdbc.hsql.password> + +  + </properties> + </profile> + + <profile> + <id>oracle-private-properties</id> + <activation> + <property> + <name>database</name> + <value>oracle</value> + </property> + </activation> + <properties> + <jdbc.username>xxxx</jdbc.username> + <jdbc.password>xxxx</jdbc.password> + <jdbc.server>localhost</jdbc.server> + <jdbc.dbname>XE</jdbc.dbname> + </properties> + </profile> + + <profile> + <id>mysql-private-properties</id> + <activation> + <property> + <name>database</name> + <value>mysql</value> + </property> + </activation> + <properties> + <jdbc.username>xxxx</jdbc.username> + <jdbc.password>xxxx</jdbc.password> + <jdbc.server>localhost</jdbc.server> + <jdbc.dbname>JBPM</jdbc.dbname> + </properties> + </profile> + + </profiles> + + </profilesXml>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3711 - jbpm4/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 05:04:27 -0500 (Fri, 23 Jan 2009) New Revision: 3711 Added: jbpm4/branches/hbraun/ Log: Create user branch from trunk Copied: jbpm4/branches/hbraun (from rev 3710, jbpm4/trunk)

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3710 - jbpm4/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 05:03:46 -0500 (Fri, 23 Jan 2009) New Revision: 3710 Removed: jbpm4/branches/hbraun/ Log: Start over

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3709 - jbpm4/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-23 05:01:21 -0500 (Fri, 23 Jan 2009) New Revision: 3709 Added: jbpm4/branches/hbraun/ Log: cReate user branch

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3708 - in jbpm3/trunk/modules: core/src/test/java/org/jbpm/db and 8 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-01-23 03:05:52 -0500 (Fri, 23 Jan 2009) New Revision: 3708 Added: jbpm3/trunk/modules/examples/src/test/resources/taskinstance/CustomTaskInstance.hbm.xml Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/businesstrip/BusinessTripRequestTest.java jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/raise/RaiseRequestTest.java jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java jbpm3/trunk/modules/examples/src/test/resources/hibernate.extra.hbm.xml jbpm3/trunk/modules/examples/src/test/resources/taskinstance/jbpm.cfg.xml Log: JBPM-1812 leverage AbstractDbTestCase to clean up examples prevent create-drop cycle at each test run Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml 2009-01-23 08:05:52 UTC (rev 3708) @@ -17,6 +17,10 @@   +  + <property name="hibernate.hbm2ddl.auto">create</property> +  +  <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml 2009-01-23 08:05:52 UTC (rev 3708) @@ -8,7 +8,3 @@ <property name="hibernate.connection.username">sa</property> <property name="hibernate.connection.password"></property>  - -  - <property name="hibernate.hbm2ddl.auto">create</property> -  Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -21,7 +21,6 @@ */ package org.jbpm.db; -import java.util.Iterator; import java.util.List; import org.jbpm.context.exe.ContextInstance; @@ -154,18 +153,18 @@ newTransaction(); try { - List allProcessDefinitions = graphSession.findAllProcessDefinitions(); + List<ProcessDefinition> allProcessDefinitions = graphSession.findAllProcessDefinitions(); assertEquals(5, allProcessDefinitions.size()); - assertEquals(3, ((ProcessDefinition) allProcessDefinitions.get(0)).getVersion()); - assertEquals("auction", ((ProcessDefinition) allProcessDefinitions.get(0)).getName()); - assertEquals(2, ((ProcessDefinition) allProcessDefinitions.get(1)).getVersion()); - assertEquals("auction", ((ProcessDefinition) allProcessDefinitions.get(1)).getName()); - assertEquals(1, ((ProcessDefinition) allProcessDefinitions.get(2)).getVersion()); - assertEquals("auction", ((ProcessDefinition) allProcessDefinitions.get(2)).getName()); - assertEquals(2, ((ProcessDefinition) allProcessDefinitions.get(3)).getVersion()); - assertEquals("bake cake", ((ProcessDefinition) allProcessDefinitions.get(3)).getName()); - assertEquals(1, ((ProcessDefinition) allProcessDefinitions.get(4)).getVersion()); - assertEquals("bake cake", ((ProcessDefinition) allProcessDefinitions.get(4)).getName()); + assertEquals(3, allProcessDefinitions.get(0).getVersion()); + assertEquals("auction", allProcessDefinitions.get(0).getName()); + assertEquals(2, allProcessDefinitions.get(1).getVersion()); + assertEquals("auction", allProcessDefinitions.get(1).getName()); + assertEquals(1, allProcessDefinitions.get(2).getVersion()); + assertEquals("auction", allProcessDefinitions.get(2).getName()); + assertEquals(2, allProcessDefinitions.get(3).getVersion()); + assertEquals("bake cake", allProcessDefinitions.get(3).getName()); + assertEquals(1, allProcessDefinitions.get(4).getVersion()); + assertEquals("bake cake", allProcessDefinitions.get(4).getName()); newTransaction(); } @@ -213,21 +212,21 @@ newTransaction(); try { - List allProcessDefinitionVersions = graphSession.findAllProcessDefinitionVersions("auction"); + List<ProcessDefinition> allProcessDefinitionVersions = graphSession.findAllProcessDefinitionVersions("auction"); assertEquals(3, allProcessDefinitionVersions.size()); - assertEquals(3, ((ProcessDefinition) allProcessDefinitionVersions.get(0)).getVersion()); - assertEquals("auction", ((ProcessDefinition) allProcessDefinitionVersions.get(0)).getName()); - assertEquals(2, ((ProcessDefinition) allProcessDefinitionVersions.get(1)).getVersion()); - assertEquals("auction", ((ProcessDefinition) allProcessDefinitionVersions.get(1)).getName()); - assertEquals(1, ((ProcessDefinition) allProcessDefinitionVersions.get(2)).getVersion()); - assertEquals("auction", ((ProcessDefinition) allProcessDefinitionVersions.get(2)).getName()); + assertEquals(3, allProcessDefinitionVersions.get(0).getVersion()); + assertEquals("auction", allProcessDefinitionVersions.get(0).getName()); + assertEquals(2, allProcessDefinitionVersions.get(1).getVersion()); + assertEquals("auction", allProcessDefinitionVersions.get(1).getName()); + assertEquals(1, allProcessDefinitionVersions.get(2).getVersion()); + assertEquals("auction", allProcessDefinitionVersions.get(2).getName()); allProcessDefinitionVersions = graphSession.findAllProcessDefinitionVersions("bake cake"); assertEquals(2, allProcessDefinitionVersions.size()); - assertEquals(2, ((ProcessDefinition) allProcessDefinitionVersions.get(0)).getVersion()); - assertEquals("bake cake", ((ProcessDefinition) allProcessDefinitionVersions.get(0)).getName()); - assertEquals(1, ((ProcessDefinition) allProcessDefinitionVersions.get(1)).getVersion()); - assertEquals("bake cake", ((ProcessDefinition) allProcessDefinitionVersions.get(1)).getName()); + assertEquals(2, allProcessDefinitionVersions.get(0).getVersion()); + assertEquals("bake cake", allProcessDefinitionVersions.get(0).getName()); + assertEquals(1, allProcessDefinitionVersions.get(1).getVersion()); + assertEquals("bake cake", allProcessDefinitionVersions.get(1).getName()); newTransaction(); } @@ -303,14 +302,12 @@ newTransaction(); - List processInstances = graphSession.findProcessInstances(processDefinition.getId()); + List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDefinition.getId()); assertEquals(3, processInstances.size()); // process instances should be ordered from recent to old long previousStart = System.currentTimeMillis(); - Iterator iter = processInstances.iterator(); - while (iter.hasNext()) { - ProcessInstance processInstance = (ProcessInstance) iter.next(); + for (ProcessInstance processInstance : processInstances) { long processStart = processInstance.getStart().getTime(); assertTrue(previousStart >= processStart); previousStart = processStart; @@ -381,7 +378,7 @@ newTransaction(); - List processInstances = graphSession.findProcessInstances(processDefinition.getId()); + List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDefinition.getId()); assertEquals(0, processInstances.size()); newTransaction(); @@ -430,7 +427,7 @@ newTransaction(); - List latestProcessDefinitions = graphSession.findLatestProcessDefinitions(); + List<ProcessDefinition> latestProcessDefinitions = graphSession.findLatestProcessDefinitions(); assertEquals(2, latestProcessDefinitions.size()); assertEquals(3, getVersionOfProcess("websale", latestProcessDefinitions)); assertEquals(2, getVersionOfProcess("change nappy", latestProcessDefinitions)); @@ -443,25 +440,22 @@ } private void ensureCleanProcessDefinitionTable() { - List processDefinitions = session.createCriteria(ProcessDefinition.class).list(); + List<ProcessDefinition> processDefinitions = graphSession.findAllProcessDefinitions(); if (!processDefinitions.isEmpty()) { System.err.println("FIXME: "+ getClass().getName() + "." + getName() + " found " + processDefinitions.size() + " process definitions left over"); - for (Iterator i = processDefinitions.iterator(); i.hasNext();) { - ProcessDefinition processDefinition = (ProcessDefinition) i.next(); + for (ProcessDefinition processDefinition : processDefinitions) { graphSession.deleteProcessDefinition(processDefinition); } } } - private int getVersionOfProcess(String name, List latestProcessDefinitions) { - Iterator iter = latestProcessDefinitions.iterator(); - while (iter.hasNext()) { - ProcessDefinition processDefinition = (ProcessDefinition) iter.next(); + private int getVersionOfProcess(String name, List<ProcessDefinition> latestProcessDefinitions) { + for (ProcessDefinition processDefinition : latestProcessDefinitions) { if (name.equals(processDefinition.getName())) { return processDefinition.getVersion(); } } - return -2; + return -1; } } Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java =================================================================== --- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/assignment/RulesAssignmentTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -21,167 +21,114 @@ */ package org.jbpm.examples.assignment; -import java.util.Date; -import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; - -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.context.exe.ContextInstance; +import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.graph.exe.Token; import org.jbpm.identity.Entity; +import org.jbpm.identity.Membership; import org.jbpm.identity.hibernate.IdentitySession; import org.jbpm.identity.xml.IdentityXmlParser; -import org.jbpm.persistence.db.DbPersistenceServiceFactory; -import org.jbpm.svc.Services; import org.jbpm.taskmgmt.exe.TaskInstance; /** * This example shows how to invoke JBoss Rules from an AssignmentHandler. */ -public class RulesAssignmentTest extends TestCase -{ - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); +public class RulesAssignmentTest extends AbstractDbTestCase { - DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); + private long processDefinitionId; + private Entity[] entities; - JbpmContext jbpmContext; - long processInstanceId; - - public void setUp() - { - dbPersistenceServiceFactory.createSchema(); - + protected void setUp() throws Exception { + super.setUp(); loadIdentities(); deployProcess(); - jbpmContext = jbpmConfiguration.createJbpmContext(); } - protected void tearDown() - { - jbpmContext.close(); - dbPersistenceServiceFactory.dropSchema(); - jbpmContext = null; + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + deleteIdentities(); + super.tearDown(); } - public void deployProcess() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("assignment/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); - } - finally - { - jbpmContext.close(); - } + @Override + protected String getJbpmTestConfig() { + return null; // use default configuration } - public void loadIdentities() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - Entity[] entities = IdentityXmlParser.parseEntitiesResource("assignment/identity.db.xml"); - IdentitySession identitySession = new IdentitySession(jbpmContext.getSession()); - for (int i = 0; i < entities.length; i++) - { - identitySession.saveEntity(entities[i]); - } + void deployProcess() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("assignment/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); + } + + void loadIdentities() { + IdentitySession identitySession = new IdentitySession(jbpmContext.getSession()); + entities = IdentityXmlParser.parseEntitiesResource("assignment/identity.db.xml"); + for (Entity entity : entities) { + if (entity instanceof Membership) continue; + identitySession.saveEntity(entity); } - finally - { - jbpmContext.close(); - } } - public void newTransaction() - { - jbpmContext.close(); - jbpmContext = jbpmConfiguration.createJbpmContext(); + void deleteIdentities() { + for (Entity entity : entities) { + if (entity instanceof Membership) continue; + session.load(entity, entity.getId()); + session.delete(entity); + } } - public void testRulesAssignment() - { + public void testRulesAssignment() { // start process newTransaction(); - processInstanceId = createNewProcessInstance(); - assertNotNull(processInstanceId); + long processInstanceId = createNewProcessInstance(); + assertFalse("ProcessInstanceId is 0", processInstanceId == 0); // perform task newTransaction(); long taskInstanceId = acquireTask("tom"); - assertNotNull(taskInstanceId); + assertFalse("TaskInstanceId is 0", taskInstanceId == 0); newTransaction(); completeTask(taskInstanceId); newTransaction(); TaskInstance taskInstance = jbpmContext.loadTaskInstance(taskInstanceId); - Date end = taskInstance.getEnd(); - assertNotNull(end); + assertTrue("TaskInstance has not ended", taskInstance.hasEnded()); // complete process newTransaction(); - ProcessInstance processInstance = getProcessInstance(processInstanceId); - Date processEnd = processInstance.getEnd(); - assertNotNull(processEnd); - + ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId); + assertTrue("ProcessInstance has not ended", processInstance.hasEnded()); } - public long createNewProcessInstance() - { + long createNewProcessInstance() { String processDefinitionName = "RulesAssignment"; ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate(processDefinitionName); - long id = processInstance.getId(); + ContextInstance contextInstance = processInstance.getContextInstance(); contextInstance.setVariable("processDefinitionName", processDefinitionName); - Order order = new Order(300); - contextInstance.setVariable("order", order); - Token token = processInstance.getRootToken(); - token.signal(); - return id; + contextInstance.setVariable("order", new Order(300)); + + processInstance.signal(); + return processInstance.getId(); } - public long acquireTask(String actorId) - { - List<TaskInstance> tasklist = getTaskList(actorId); - Iterator taskIterator = tasklist.iterator(); + long acquireTask(String actorId) { + List<TaskInstance> taskList = jbpmContext.getTaskList(actorId); + assertEquals(1, taskList.size()); - TaskInstance taskInstance = null; - long taskInstanceId = 0; - while (taskIterator.hasNext()) - { - taskInstance = (TaskInstance)taskIterator.next(); - - taskInstanceId = taskInstance.getId(); - taskInstance.start(); - } - return taskInstanceId; + TaskInstance taskInstance = taskList.get(0); + taskInstance.start(); + return taskInstance.getId(); } - public void completeTask(long taskInstanceId) - { + void completeTask(long taskInstanceId) { TaskInstance taskInstance = jbpmContext.getTaskInstance(taskInstanceId); taskInstance.end(); } - public List<TaskInstance> getTaskList(String actorId) - { - newTransaction(); - List<TaskInstance> taskList = jbpmContext.getTaskList(actorId); - return taskList; - } - - public ProcessInstance getProcessInstance(long processInstanceId) - { - ProcessInstance processInstance = jbpmContext.loadProcessInstanceForUpdate(processInstanceId); - return processInstance; - } - } Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/businesstrip/BusinessTripRequestTest.java =================================================================== --- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/businesstrip/BusinessTripRequestTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/businesstrip/BusinessTripRequestTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -4,131 +4,101 @@ import java.util.List; import java.util.Map; -import junit.framework.TestCase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.context.exe.ContextInstance; +import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.persistence.db.DbPersistenceServiceFactory; -import org.jbpm.svc.Services; import org.jbpm.taskmgmt.exe.TaskInstance; import org.jbpm.taskmgmt.exe.TaskMgmtInstance; -public class BusinessTripRequestTest extends TestCase -{ - Log log = LogFactory.getLog(this.getClass()); +public class BusinessTripRequestTest extends AbstractDbTestCase { - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); - DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); + private long processDefinitionId; - JbpmContext jbpmContext; - - ProcessInstance processInstance; - ContextInstance contextInstance; - TaskMgmtInstance taskMgmtInstance; - long processInstanceId = -1; - - public void setUp() - { - dbPersistenceServiceFactory.createSchema(); + protected void setUp() throws Exception { + super.setUp(); deployProcess(); - jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() - { - jbpmContext.close(); - dbPersistenceServiceFactory.dropSchema(); - jbpmContext = null; + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + super.tearDown(); } - private void newTransaction() - { - jbpmContext.close(); - jbpmContext = jbpmConfiguration.createJbpmContext(); + @Override + protected String getJbpmTestConfig() { + return null; // use default configuration } - private void deployProcess() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("businesstrip/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); - } - finally - { - jbpmContext.close(); - } + void deployProcess() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("businesstrip/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); } - private TaskInstance createNewProcessInstance() - { - processInstance = jbpmContext.newProcessInstanceForUpdate("business trip request"); - processInstanceId = processInstance.getId(); - contextInstance = processInstance.getContextInstance(); - taskMgmtInstance = processInstance.getTaskMgmtInstance(); + TaskInstance createNewProcessInstance() { + ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("business trip request"); return processInstance.getTaskMgmtInstance().createStartTaskInstance(); } - public void testTaskParameters() - { + public void testTaskParameters() { TaskInstance taskInstance = createNewProcessInstance(); assertEquals("submit business trip request", taskInstance.getName()); assertEquals(0, taskInstance.getVariables().size()); + + newTransaction(); } - public void testSubmitRaiseRequestTask() - { + public void testSubmitRaiseRequestTask() { jbpmContext.setActorId("employee"); TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("purpose", "Conference in MIT"); - taskVariables.put("description", "This conference is mainly to highlight to impact of ESB technologies on the current industries"); + taskVariables.put("description", + "Highlight to impact of ESB technologies on the current industries"); taskVariables.put("allocated budget", 3000); taskVariables.put("start date", "8/12/2009"); taskVariables.put("end date", "8/21/2009"); taskInstance.addVariables(taskVariables); taskInstance.end(); + newTransaction(); + ProcessInstance processInstance = jbpmContext.loadProcessInstance(taskInstance.getProcessInstance() + .getId()); + ContextInstance contextInstance = processInstance.getContextInstance(); assertEquals("Conference in MIT", contextInstance.getVariable("purpose")); - assertEquals("This conference is mainly to highlight to impact of ESB technologies on the current industries", contextInstance.getVariable("description")); + assertEquals("Highlight to impact of ESB technologies on the current industries", + contextInstance.getVariable("description")); assertEquals(3000, contextInstance.getVariable("allocated budget")); assertEquals("8/12/2009", contextInstance.getVariable("start date")); assertEquals("8/21/2009", contextInstance.getVariable("end date")); + + TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance(); assertEquals("employee", taskMgmtInstance.getSwimlaneInstance("employee").getActorId()); } - @SuppressWarnings("unchecked") - public void testRejectBusinessTripRequest() - { + public void testRejectBusinessTripRequest() { // Employee submits a business trip request jbpmContext.setActorId("employee"); TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("purpose", "Conference in MIT"); - taskVariables.put("description", "This conference is mainly to highlight to impact of ESB technologies on the current industries"); + taskVariables.put("description", + "This conference is mainly to highlight to impact of ESB technologies on the current industries"); taskVariables.put("allocated budget", 3000); taskVariables.put("start date", "8/12/2009"); taskVariables.put("end date", "8/21/2009"); taskInstance.addVariables(taskVariables); taskInstance.end(); - jbpmContext.save(processInstance); - processInstanceId = processInstance.getId(); // Manager rejects the raise request newTransaction(); - log.info(jbpmContext.getTaskMgmtSession().findTaskInstancesByProcessInstance(processInstance).size()); - - List<TaskInstance> managerTasksList = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); + List<TaskInstance> managerTasksList = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager"); assertEquals(1, managerTasksList.size()); TaskInstance managerTask = managerTasksList.get(0); @@ -137,16 +107,15 @@ assertEquals("manager", managerTask.getActorId()); } - @SuppressWarnings("unchecked") - public void testAcceptBusinessTripRequest() - { + public void testAcceptBusinessTripRequest() { // Employee submits a raise request jbpmContext.setActorId("employee"); TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("purpose", "Conference in MIT"); - taskVariables.put("description", "This conference is mainly to highlight to impact of ESB technologies on the current industries"); + taskVariables.put("description", + "This conference is mainly to highlight to impact of ESB technologies on the current industries"); taskVariables.put("allocated budget", 3000); taskVariables.put("start date", "8/12/2009"); taskVariables.put("end date", "8/21/2009"); @@ -154,12 +123,11 @@ taskVariables.put("city", "Kansas"); taskInstance.addVariables(taskVariables); taskInstance.end(); - jbpmContext.save(processInstance); - processInstanceId = processInstance.getId(); // Manager rejects the raise request newTransaction(); - List<TaskInstance> managerTasksList = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); + List<TaskInstance> managerTasksList = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager"); assertEquals(1, managerTasksList.size()); TaskInstance managerTask = managerTasksList.get(0); @@ -169,7 +137,8 @@ jbpmContext.save(managerTask); newTransaction(); - List<TaskInstance> accountantTasksList = jbpmContext.getTaskMgmtSession().findTaskInstances("accountant"); + List<TaskInstance> accountantTasksList = jbpmContext.getTaskMgmtSession().findTaskInstances( + "accountant"); assertEquals(1, accountantTasksList.size()); TaskInstance accountantTask = accountantTasksList.get(0); accountantTask.end(); Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/raise/RaiseRequestTest.java =================================================================== --- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/raise/RaiseRequestTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/raise/RaiseRequestTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -4,86 +4,54 @@ import java.util.List; import java.util.Map; -import junit.framework.TestCase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.context.exe.ContextInstance; +import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.persistence.db.DbPersistenceServiceFactory; -import org.jbpm.svc.Services; import org.jbpm.taskmgmt.exe.TaskInstance; import org.jbpm.taskmgmt.exe.TaskMgmtInstance; -public class RaiseRequestTest extends TestCase -{ - Log log = LogFactory.getLog(this.getClass()); +public class RaiseRequestTest extends AbstractDbTestCase { - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); - DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); + private long processDefinitionId; - JbpmContext jbpmContext; - - ProcessInstance processInstance = null; - ContextInstance contextInstance = null; - TaskMgmtInstance taskMgmtInstance = null; - long processInstanceId = -1; - - public void setUp() - { - dbPersistenceServiceFactory.createSchema(); + @Override + protected void setUp() throws Exception { + super.setUp(); deployProcess(); - jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() - { - jbpmContext.close(); - dbPersistenceServiceFactory.dropSchema(); - jbpmContext = null; + @Override + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + super.tearDown(); } - private void newTransaction() - { - jbpmContext.close(); - jbpmContext = jbpmConfiguration.createJbpmContext(); + @Override + protected String getJbpmTestConfig() { + return null; // use default configuration } - private void deployProcess() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("raise/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); - } - finally - { - jbpmContext.close(); - } + void deployProcess() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("raise/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); } - private TaskInstance createNewProcessInstance() - { - processInstance = jbpmContext.newProcessInstanceForUpdate("raise request"); - processInstanceId = processInstance.getId(); - contextInstance = processInstance.getContextInstance(); - taskMgmtInstance = processInstance.getTaskMgmtInstance(); + TaskInstance createNewProcessInstance() { + ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("raise request"); return processInstance.getTaskMgmtInstance().createStartTaskInstance(); } - public void testTaskParameters() - { + public void testTaskParameters() { TaskInstance taskInstance = createNewProcessInstance(); assertEquals("submit raise request", taskInstance.getName()); assertEquals(0, taskInstance.getVariables().size()); + + newTransaction(); } - public void testSubmitRaiseRequestTask() - { + public void testSubmitRaiseRequestTask() { jbpmContext.setActorId("employee"); TaskInstance taskInstance = createNewProcessInstance(); @@ -94,23 +62,26 @@ taskInstance.addVariables(taskVariables); taskInstance.end(); + newTransaction(); + ProcessInstance processInstance = jbpmContext.loadProcessInstance(taskInstance.getProcessInstance() + .getId()); + ContextInstance contextInstance = processInstance.getContextInstance(); assertEquals("I need to buy a jet", contextInstance.getVariable("reason")); assertEquals(600, contextInstance.getVariable("amount")); + + TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance(); assertEquals("employee", taskMgmtInstance.getSwimlaneInstance("employee").getActorId()); } - @SuppressWarnings("unchecked") - public void testManagerEvaluationReject() - { + public void testManagerEvaluationReject() { TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("reason", "I need to buy a jet"); taskVariables.put("amount", 600); taskInstance.addVariables(taskVariables); taskInstance.end(); - jbpmContext.save(processInstance); - newTransaction(); + newTransaction(); List<TaskInstance> managerTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); assertEquals(1, managerTasks.size()); @@ -121,18 +92,15 @@ assertEquals(0, foTasks.size()); } - @SuppressWarnings("unchecked") - public void testManagerEvaluationAcceptFOReject() - { + public void testManagerEvaluationAcceptFOReject() { TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("reason", "I need to buy a jet"); taskVariables.put("amount", 600); taskInstance.addVariables(taskVariables); taskInstance.end(); - jbpmContext.save(processInstance); - newTransaction(); + newTransaction(); List<TaskInstance> managerTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); assertEquals(1, managerTasks.size()); TaskInstance managerTask = managerTasks.get(0); @@ -152,18 +120,15 @@ assertEquals(0, managerTasks.size()); } - @SuppressWarnings("unchecked") - public void testManagerEvaluationAcceptFOAccpet() - { + public void testManagerEvaluationAcceptFOAccpet() { TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("reason", "I need to buy a jet"); taskVariables.put("amount", 600); taskInstance.addVariables(taskVariables); taskInstance.end(); - jbpmContext.save(processInstance); - newTransaction(); + newTransaction(); List<TaskInstance> managerTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); assertEquals(1, managerTasks.size()); TaskInstance managerTask = managerTasks.get(0); @@ -180,7 +145,8 @@ foTask.end("accept"); newTransaction(); - List<TaskInstance> accountantTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("accountant"); + List<TaskInstance> accountantTasks = jbpmContext.getTaskMgmtSession().findTaskInstances( + "accountant"); assertEquals(1, accountantTasks.size()); TaskInstance accountantTask = accountantTasks.get(0); @@ -189,18 +155,15 @@ accountantTask.end("terminate"); } - @SuppressWarnings("unchecked") - public void testManagerEvaluationAcceptFOMultipleIterationsAccpet() - { + public void testManagerEvaluationAcceptFOMultipleIterationsAccpet() { TaskInstance taskInstance = createNewProcessInstance(); Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("reason", "I need to buy a jet"); taskVariables.put("amount", 600); taskInstance.addVariables(taskVariables); taskInstance.end(); - jbpmContext.save(processInstance); - newTransaction(); + newTransaction(); List<TaskInstance> managerTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); assertEquals(1, managerTasks.size()); TaskInstance managerTask = managerTasks.get(0); @@ -235,7 +198,8 @@ foTask.end("accept"); newTransaction(); - List<TaskInstance> accountantTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("accountant"); + List<TaskInstance> accountantTasks = jbpmContext.getTaskMgmtSession().findTaskInstances( + "accountant"); assertEquals(1, accountantTasks.size()); TaskInstance accountantTask = accountantTasks.get(0); Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java =================================================================== --- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesaction/RulesActionTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -21,104 +21,68 @@ */ package org.jbpm.examples.rulesaction; -import java.util.Date; - -import junit.framework.TestCase; - -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.context.exe.ContextInstance; +import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.persistence.db.DbPersistenceServiceFactory; -import org.jbpm.svc.Services; -import org.jbpm.graph.exe.Token; /** * This example shows how to invoke JBoss Drools from an ActionHandler. */ -public class RulesActionTest extends TestCase -{ +public class RulesActionTest extends AbstractDbTestCase { - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); + private long processDefinitionId; - DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); - - JbpmContext jbpmContext; - long processInstanceId; - - public void setUp() - { - dbPersistenceServiceFactory.createSchema(); + @Override + protected void setUp() throws Exception { + super.setUp(); deployProcess(); - jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() - { - jbpmContext.close(); - dbPersistenceServiceFactory.dropSchema(); - jbpmContext = null; + @Override + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + super.tearDown(); } - public void newTransaction() - { - jbpmContext.close(); - jbpmContext = jbpmConfiguration.createJbpmContext(); + @Override + protected String getJbpmTestConfig() { + return null; // use default configuration } - public void deployProcess() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("rulesaction/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); - } - finally - { - jbpmContext.close(); - } + void deployProcess() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("rulesaction/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); } - public void testRulesAssignment() - { + public void testRulesAssignment() { // start process newTransaction(); - processInstanceId = createNewProcessInstance(); - assertNotNull(processInstanceId); + long processInstanceId = createNewProcessInstance(); + assertFalse("ProcessInstanceId is 0", processInstanceId == 0); newTransaction(); - ProcessInstance processInstance = getProcessInstance(processInstanceId); + ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId); + assertTrue("ProcessInstance has not ended", processInstance.hasEnded()); - assertNotNull(processInstance); - - Date processEnd = processInstance.getEnd(); - assertNotNull(processEnd); - String shipper = (String)processInstance.getContextInstance().getVariable("shipper"); - assertEquals("shipper is FEDX", shipper, "FEDX"); - + String shipper = (String) processInstance.getContextInstance().getVariable("shipper"); + assertEquals("FEDX", shipper); } - public long createNewProcessInstance() - { + long createNewProcessInstance() { String processDefinitionName = "RulesAction"; ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate(processDefinitionName); - long id = processInstance.getId(); + ContextInstance contextInstance = processInstance.getContextInstance(); contextInstance.setVariable("processDefinitionName", processDefinitionName); + Order order = new Order(300); Customer customer = new Customer("Fred", new Integer(5), new Integer(25), new Long(100000)); contextInstance.setVariable("order", order); contextInstance.setVariable("customer", customer); - Token token = processInstance.getRootToken(); - token.signal(); - return id; - } - public ProcessInstance getProcessInstance(long processInstanceId) - { - ProcessInstance processInstance = jbpmContext.loadProcessInstanceForUpdate(processInstanceId); - return processInstance; + processInstance.signal(); + return processInstance.getId(); } } Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java =================================================================== --- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -21,112 +21,73 @@ */ package org.jbpm.examples.taskinstance; -import java.util.Date; import java.util.List; -import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.Session; +import org.hibernate.cfg.Configuration; import org.hibernate.criterion.Restrictions; import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.context.exe.ContextInstance; +import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.graph.exe.Token; -import org.jbpm.identity.Entity; -import org.jbpm.identity.hibernate.IdentitySession; -import org.jbpm.identity.xml.IdentityXmlParser; import org.jbpm.persistence.db.DbPersistenceServiceFactory; import org.jbpm.svc.Services; import org.jbpm.taskmgmt.exe.TaskInstance; +import org.jbpm.util.CollectionUtil; /** * This example shows how to extend the TaskInstance by adding a custom property. */ -public class CustomTaskInstanceTest extends TestCase { +public class CustomTaskInstanceTest extends AbstractDbTestCase { - JbpmConfiguration jbpmConfiguration = null; - // JbpmConfiguration.getInstance(); + private long processDefinitionId; - DbPersistenceServiceFactory dbPersistenceServiceFactory; - - JbpmContext jbpmContext; - - ProcessInstance processInstance = null; - - ContextInstance contextInstance = null; - - protected void setUp() { - // the jbpm.cfg.xml file is modified to add the CustomTaskInstanceFactory - // so we will read in the file from the config directory of this example - jbpmConfiguration = JbpmConfiguration.parseResource("taskinstance/jbpm.cfg.xml"); - - dbPersistenceServiceFactory = (DbPersistenceServiceFactory) jbpmConfiguration - .getServiceFactory(Services.SERVICENAME_PERSISTENCE); - - // the CustomTaskInstance mapping file reference - // <mapping resource="org/jbpm/taskinstance/CustomTaskInstance.hbm.xml"/> - // has been added to to the bottom of the hibernate.cfg.xml file in the config directory - - // now create the schema - // this is also a step that typically would be performed as an independent step - // using the jbpm schema created from the jbpm mapping files - - dbPersistenceServiceFactory.createSchema(); + protected void setUp() throws Exception { + super.setUp(); deployProcess(); - jbpmContext = jbpmConfiguration.createJbpmContext(); } - protected void tearDown() { - jbpmContext.close(); - dbPersistenceServiceFactory.dropSchema(); - jbpmContext = null; + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + super.tearDown(); + jbpmConfiguration.close(); } - void newTransaction() { - jbpmContext.close(); - jbpmContext = jbpmConfiguration.createJbpmContext(); - } + @Override + protected JbpmConfiguration getJbpmConfiguration() { + if (jbpmConfiguration == null) { + // the jbpm.cfg.xml file is modified to add the CustomTaskInstanceFactory + // so we will read in the file from the config directory of this example + jbpmConfiguration = JbpmConfiguration.parseResource("taskinstance/jbpm.cfg.xml"); + DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); - void deployProcess() { - jbpmContext = jbpmConfiguration.createJbpmContext(); - try { - ProcessDefinition processDefinition = ProcessDefinition - .parseXmlResource("taskinstance/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); + Configuration configuration = factory.getConfiguration(); + configuration.addResource("taskinstance/CustomTaskInstance.hbm.xml"); + + // TODO https://jira.jboss.org/jira/browse/JBPM-1812 + // JbpmSchema jbpmSchema = new JbpmSchema(configuration); + // jbpmSchema.updateTable("JBPM_TASKINSTANCE"); } - finally { - jbpmContext.close(); - } + return jbpmConfiguration; } - void loadIdentities() { - jbpmContext = jbpmConfiguration.createJbpmContext(); - try { - Entity[] entities = IdentityXmlParser.parseEntitiesResource("identity.db.xml"); - IdentitySession identitySession = new IdentitySession(jbpmContext.getSession()); - for (int i = 0; i < entities.length; i++) { - identitySession.saveEntity(entities[i]); - } - } - finally { - jbpmContext.close(); - } + void deployProcess() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("taskinstance/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); } public void testCustomTaskInstance() { // create processInstance newTransaction(); long processInstanceId = createNewProcessInstance(); - assertNotNull(processInstanceId); assertFalse("ProcessInstanceId is 0", processInstanceId == 0); // perform the task newTransaction(); long taskInstanceId = acquireTask(); - assertNotNull(taskInstanceId); assertFalse("TaskInstanceId is 0", taskInstanceId == 0); newTransaction(); @@ -134,27 +95,24 @@ newTransaction(); TaskInstance taskInstance = jbpmContext.loadTaskInstance(taskInstanceId); - Date end = taskInstance.getEnd(); - assertNotNull(end); + assertTrue("TaskInstance has not ended", taskInstance.hasEnded()); // check process is completed newTransaction(); - Date processEnd = null; - processInstance = jbpmContext.getProcessInstance(processInstanceId); - processEnd = processInstance.getEnd(); - assertNotNull(processEnd); + ProcessInstance processInstance = jbpmContext.getProcessInstance(processInstanceId); + assertTrue("ProcessInstance has not ended", processInstance.hasEnded()); } long createNewProcessInstance() { String processDefinitionName = "CustomTaskInstance"; - processInstance = jbpmContext.newProcessInstanceForUpdate(processDefinitionName); - long processInstanceId = processInstance.getId(); - contextInstance = processInstance.getContextInstance(); + ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate(processDefinitionName); + + ContextInstance contextInstance = processInstance.getContextInstance(); contextInstance.setVariable("processDefinitionName", processDefinitionName); contextInstance.setVariable("customId", "abc"); - Token token = processInstance.getRootToken(); - token.signal(); - return processInstanceId; + + processInstance.signal(); + return processInstance.getId(); } long acquireTask() { @@ -171,22 +129,21 @@ } void completeTask(long taskInstanceId) { - CustomTaskInstance taskInstance = (CustomTaskInstance) jbpmContext.getSession() - .load(CustomTaskInstance.class, new Long(taskInstanceId)); + CustomTaskInstance taskInstance = (CustomTaskInstance) jbpmContext.getSession().load( + CustomTaskInstance.class, new Long(taskInstanceId)); taskInstance.end(); } List<CustomTaskInstance> findPooledTaskListByCustomId(String actorId, String customId) { Session session = jbpmContext.getSession(); - return session.createCriteria(CustomTaskInstance.class) - // .setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY) + Criteria criteria = session.createCriteria(CustomTaskInstance.class) .add(Restrictions.isNull("actorId")) .add(Restrictions.isNull("end")) .add(Restrictions.eq("isCancelled", false)) .add(Restrictions.eq("customId", customId)) .createCriteria("pooledActors") - .add(Restrictions.eq("actorId", actorId)) - .list(); + .add(Restrictions.eq("actorId", actorId)); + return CollectionUtil.checkList(criteria.list(), CustomTaskInstance.class); } } Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java =================================================================== --- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java 2009-01-23 08:05:52 UTC (rev 3708) @@ -25,115 +25,57 @@ import java.util.List; import java.util.Map; -import junit.framework.TestCase; - -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.context.exe.ContextInstance; +import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.identity.Entity; -import org.jbpm.identity.hibernate.IdentitySession; -import org.jbpm.identity.xml.IdentityXmlParser; -import org.jbpm.persistence.db.DbPersistenceServiceFactory; -import org.jbpm.svc.Services; import org.jbpm.taskmgmt.exe.TaskInstance; import org.jbpm.taskmgmt.exe.TaskMgmtInstance; -public class WebsaleTest extends TestCase -{ - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); - DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); +public class WebsaleTest extends AbstractDbTestCase { - JbpmContext jbpmContext; + private long processDefinitionId; - ProcessInstance processInstance; - ContextInstance contextInstance; - TaskMgmtInstance taskMgmtInstance; - long processInstanceId = -1; - - public void setUp() - { - dbPersistenceServiceFactory.createSchema(); + protected void setUp() throws Exception { + super.setUp(); deployProcess(); - jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() - { - jbpmContext.close(); - dbPersistenceServiceFactory.dropSchema(); - jbpmContext = null; + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + super.tearDown(); } - public void newTransaction() - { - jbpmContext.close(); - jbpmContext = jbpmConfiguration.createJbpmContext(); + @Override + protected String getJbpmTestConfig() { + return null; // use default configuration } - public void deployProcess() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("websale/jpdl/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); - } - finally - { - jbpmContext.close(); - } + void deployProcess() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("websale/jpdl/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); } - public void loadIdentities() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - Entity[] entities = IdentityXmlParser.parseEntitiesResource("assignment/identity.db.xml"); - IdentitySession identitySession = new IdentitySession(jbpmContext.getSession()); - for (int i = 0; i < entities.length; i++) - { - identitySession.saveEntity(entities[i]); - } - } - finally - { - jbpmContext.close(); - } - } - - public TaskInstance createNewProcessInstance() - { - processInstance = jbpmContext.newProcessInstanceForUpdate("websale"); - processInstanceId = processInstance.getId(); - contextInstance = processInstance.getContextInstance(); - taskMgmtInstance = processInstance.getTaskMgmtInstance(); + TaskInstance createNewProcessInstance() { + ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("websale"); return processInstance.getTaskMgmtInstance().createStartTaskInstance(); } - public void reloadProcessInstance() - { - processInstance = jbpmContext.loadProcessInstanceForUpdate(processInstanceId); - contextInstance = processInstance.getContextInstance(); - taskMgmtInstance = processInstance.getTaskMgmtInstance(); - } - - public void testWebSaleOrderTaskParameters() - { + public void testWebSaleOrderTaskParameters() { TaskInstance taskInstance = createNewProcessInstance(); assertEquals("Create new web sale order", taskInstance.getName()); assertEquals(0, taskInstance.getVariables().size()); + + newTransaction(); } - public void testPerformWebSaleOrderTask() - { + public void testPerformWebSaleOrderTask() { jbpmContext.setActorId("user"); // create a task to start the websale process TaskInstance taskInstance = createNewProcessInstance(); - Map taskVariables = new HashMap(); + Map<String, Object> taskVariables = new HashMap<String, Object>(); taskVariables.put("item", "cookies"); taskVariables.put("quantity", "lots of them"); taskVariables.put("address", "46 Main St."); @@ -141,28 +83,32 @@ taskInstance.addVariables(taskVariables); taskInstance.end(); + newTransaction(); + ProcessInstance processInstance = jbpmContext.loadProcessInstance(taskInstance.getProcessInstance() + .getId()); + ContextInstance contextInstance = processInstance.getContextInstance(); assertEquals("cookies", contextInstance.getVariable("item")); assertEquals("lots of them", contextInstance.getVariable("quantity")); assertEquals("46 Main St.", contextInstance.getVariable("address")); + + TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance(); assertEquals("user", taskMgmtInstance.getSwimlaneInstance("buyer").getActorId()); } - public void testEvaluateAssignment() - { + public void testEvaluateAssignment() { jbpmContext.setActorId("user"); + // create a task to start the websale process TaskInstance taskInstance = createNewProcessInstance(); taskInstance.setVariable("item", "cookies"); taskInstance.end(); - jbpmContext.save(processInstance); - processInstanceId = processInstance.getId(); newTransaction(); - - List sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); + List<TaskInstance> sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager"); assertEquals(1, sampleManagersTasks.size()); - TaskInstance evaluateTaskInstance = (TaskInstance)sampleManagersTasks.get(0); + TaskInstance evaluateTaskInstance = sampleManagersTasks.get(0); assertEquals("manager", evaluateTaskInstance.getActorId()); assertEquals("Evaluate web order", evaluateTaskInstance.getName()); assertNotNull(evaluateTaskInstance.getToken()); @@ -171,24 +117,21 @@ assertNull(evaluateTaskInstance.getEnd()); } - public void testEvaluateOk() - { + public void testEvaluateOk() { TaskInstance taskInstance = createNewProcessInstance(); taskInstance.end(); - jbpmContext.save(processInstance); newTransaction(); - - TaskInstance evaluateTaskInstance = (TaskInstance)jbpmContext.getTaskMgmtSession().findTaskInstances("manager").get(0); + TaskInstance evaluateTaskInstance = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager").get(0); evaluateTaskInstance.end("OK"); - jbpmContext.save(evaluateTaskInstance); newTransaction(); - - List sampleShippersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("shipper"); + List<TaskInstance> sampleShippersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances( + "shipper"); assertEquals(1, sampleShippersTasks.size()); - TaskInstance waitForMoneyTaskInstance = (TaskInstance)sampleShippersTasks.get(0); + TaskInstance waitForMoneyTaskInstance = sampleShippersTasks.get(0); assertEquals("shipper", waitForMoneyTaskInstance.getActorId()); assertEquals("Wait for money", waitForMoneyTaskInstance.getName()); assertNotNull(waitForMoneyTaskInstance.getToken()); @@ -197,63 +140,60 @@ assertNull(waitForMoneyTaskInstance.getEnd()); } - public void testUnwritableVariableException() - { + public void testUnwritableVariableException() { testEvaluateAssignment(); + newTransaction(); - List sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); - TaskInstance evaluateTaskInstance = (TaskInstance)sampleManagersTasks.get(0); + List<TaskInstance> sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager"); + TaskInstance evaluateTaskInstance = sampleManagersTasks.get(0); evaluateTaskInstance.end(); newTransaction(); - - processInstance = jbpmContext.getGraphSession().loadProcessInstance(processInstanceId); - contextInstance = processInstance.getContextInstance(); + ProcessInstance processInstance = jbpmContext.getGraphSession().loadProcessInstance( + evaluateTaskInstance.getProcessInstance().getId()); + ContextInstance contextInstance = processInstance.getContextInstance(); // so the cookies should still be in the item process variable. assertEquals("cookies", contextInstance.getVariable("item")); } - public void testEvaluateNok() - { + public void testEvaluateNok() { testEvaluateAssignment(); - newTransaction(); - List sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager"); - TaskInstance evaluateTaskInstance = (TaskInstance)sampleManagersTasks.get(0); + newTransaction(); + List<TaskInstance> sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager"); + TaskInstance evaluateTaskInstance = sampleManagersTasks.get(0); evaluateTaskInstance.setVariable("comment", "wtf"); evaluateTaskInstance.end("More info needed"); jbpmContext.save(evaluateTaskInstance); newTransaction(); - - List sampleUserTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("user"); + List<TaskInstance> sampleUserTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("user"); assertEquals(1, sampleUserTasks.size()); - TaskInstance fixWebOrderDataTaskInstance = (TaskInstance)sampleUserTasks.get(0); + TaskInstance fixWebOrderDataTaskInstance = sampleUserTasks.get(0); assertEquals("user", fixWebOrderDataTaskInstance.getActorId()); assertEquals("wtf", fixWebOrderDataTaskInstance.getVariable("comment")); } - public void testMoreInfoNeeded() - { + public void testMoreInfoNeeded() { jbpmContext.setActorId("user"); // create a task to start the websale process TaskInstance taskInstance = createNewProcessInstance(); taskInstance.end(); - jbpmContext.save(processInstance); newTransaction(); - - TaskInstance evaluateTaskInstance = (TaskInstance)jbpmContext.getTaskMgmtSession().findTaskInstances("manager").get(0); + TaskInstance evaluateTaskInstance = jbpmContext.getTaskMgmtSession().findTaskInstances( + "manager").get(0); evaluateTaskInstance.end("More info needed"); jbpmContext.save(evaluateTaskInstance); newTransaction(); - - List sampleUserTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("user"); + List<TaskInstance> sampleUserTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("user"); assertEquals(1, sampleUserTasks.size()); - TaskInstance fixWebOrderDataTaskInstance = (TaskInstance)sampleUserTasks.get(0); + TaskInstance fixWebOrderDataTaskInstance = sampleUserTasks.get(0); assertEquals("user", fixWebOrderDataTaskInstance.getActorId()); assertEquals("Fix web order data", fixWebOrderDataTaskInstance.getName()); assertNotNull(fixWebOrderDataTaskInstance.getToken()); Modified: jbpm3/trunk/modules/examples/src/test/resources/hibernate.extra.hbm.xml =================================================================== --- jbpm3/trunk/modules/examples/src/test/resources/hibernate.extra.hbm.xml 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/resources/hibernate.extra.hbm.xml 2009-01-23 08:05:52 UTC (rev 3708) @@ -1,5 +1,4 @@ <?xml version="1.0"?> - <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> @@ -9,11 +8,5 @@    - - <subclass name="org.jbpm.examples.taskinstance.CustomTaskInstance" - extends="org.jbpm.taskmgmt.exe.TaskInstance" - discriminator-value="C"> - <property name="customId" column="CUSTOMID_" /> - </subclass> - + </hibernate-mapping> Added: jbpm3/trunk/modules/examples/src/test/resources/taskinstance/CustomTaskInstance.hbm.xml =================================================================== --- jbpm3/trunk/modules/examples/src/test/resources/taskinstance/CustomTaskInstance.hbm.xml (rev 0) +++ jbpm3/trunk/modules/examples/src/test/resources/taskinstance/CustomTaskInstance.hbm.xml 2009-01-23 08:05:52 UTC (rev 3708) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + + <subclass name="org.jbpm.examples.taskinstance.CustomTaskInstance" + extends="org.jbpm.taskmgmt.exe.TaskInstance" discriminator-value="C"> + <property name="customId" column="CUSTOMID_" /> + </subclass> + +</hibernate-mapping> Modified: jbpm3/trunk/modules/examples/src/test/resources/taskinstance/jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/examples/src/test/resources/taskinstance/jbpm.cfg.xml 2009-01-23 07:14:34 UTC (rev 3707) +++ jbpm3/trunk/modules/examples/src/test/resources/taskinstance/jbpm.cfg.xml 2009-01-23 08:05:52 UTC (rev 3708) @@ -1,49 +1,3 @@ <jbpm-configuration> - -  - - <jbpm-context> - <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" /> - <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> - <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> - <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> - <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> - <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> - </jbpm-context> - -  - <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" /> - -  - <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" /> - <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" /> - <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" /> - <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" /> - <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" /> - <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" /> - <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" /> - <string name="resource.mail.templates" value="jbpm.mail.templates.xml" /> - - <int name="jbpm.byte.block.size" value="1024" singleton="true" /> - <string name="jbpm.mail.smtp.host" value="localhost" /> -  <bean name="jbpm.task.instance.factory" class="org.jbpm.examples.taskinstance.CustomTaskInstanceFactoryImpl" singleton="true" /> - <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" /> - <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" /> - - <bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor"> - <field name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></field> - <field name="name"><string value="JbpmJobExector" /></field> - <field name="nbrOfThreads"><int value="1" /></field> - <field name="idleInterval"><int value="2500" /></field> - <field name="maxIdleInterval"><int value="3600000" /></field> - <field name="historyMaxSize"><int value="20" /></field> - </bean> - </jbpm-configuration>

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits January 2009