jbpm-commits July 2010

jbpm-commits@lists.jboss.org

1 participants
94 discussions

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-07-02 18:39:17 -0400 (Fri, 02 Jul 2010) New Revision: 6450 Modified: jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/hudson-jbpm4-parsers.sh Log: JBPM-2893: revive hudson tomcat job Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-07-02 08:05:29 UTC (rev 6449) +++ jbpm4/trunk/qa/build.xml 2010-07-02 22:39:17 UTC (rev 6450) @@ -21,7 +21,7 @@ <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <property name="tomcat.version" value="6.0.20" /> + <property name="tomcat.version" value="6.0.26" /> <property name="tomcat.parent.dir" value="${jbpm.home}" /> <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> @@ -80,6 +80,14 @@ <fileset dir="cactus.webapp.cfg" /> </copy> +  + <copy todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/classes" overwrite="true"> + <fileset dir="jboss.jbpm.cfg" excludes="jbpm.cfg.xml" /> + <filterset> + <filter token="bind.address" value="${bind.address}" /> + </filterset> + </copy> +  <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" /> <copy file="${jbpm.home}/examples/target/examples.jar" Modified: jbpm4/trunk/qa/hudson-jbpm4-parsers.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-parsers.sh 2010-07-02 08:05:29 UTC (rev 6449) +++ jbpm4/trunk/qa/hudson-jbpm4-parsers.sh 2010-07-02 22:39:17 UTC (rev 6450) @@ -2,4 +2,4 @@ # # runs the jpdl parser backwards compatibility tests -mvn -U -Djpdlparser=$JPDL_VERSION clean install +mvn -U -Djpdlparser=$JPDL_VERSION -Dmaven.test.failure.ignore=true clean install

13 years, 12 months

1
0
0 / 0

JBoss JBPM SVN: r6449 - in jbpm4/trunk: modules/distro/src/main/files/install and 13 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-07-02 04:05:29 -0400 (Fri, 02 Jul 2010) New Revision: 6449 Added: jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.mail.templates.xml jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml Removed: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.examples.xml jbpm4/trunk/modules/test-cactus/src/main/resources/ jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.properties jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.templates.examples.xml jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/test-cactus/.classpath jbpm4/trunk/modules/test-cactus/pom.xml jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.cfg.xml jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.hibernate.cfg.xml jbpm4/trunk/qa/hudson-jbpm4-cfg.sh jbpm4/trunk/qa/hudson-jbpm4-db.sh jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh jbpm4/trunk/qa/hudson-jbpm4-jboss.sh jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties Log: JBPM-2893: revive hudson enterprise and jboss jobs delete redundant artifacts Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -56,7 +56,7 @@ <exclude name="jbpm.cfg.xml" /> <exclude name="jbpm.hibernate.cfg.xml" /> <exclude name="jbpm.mail.properties" /> - <exclude name="jbpm.mail.templates.examples.xml" /> + <exclude name="jbpm.mail.templates.xml" /> <exclude name="logging.properties" /> <exclude name="org/jbpm/examples/task/swimlane/process.jpdl.xml" /> <exclude name="org/jbpm/examples/task/candidates/process.jpdl.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -297,7 +297,8 @@  <copy file="${jbpm.home}/install/src/jboss/datasources/jbpm-${database}-ds.xml" - todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + todir="${jboss.server.config.dir}/deploy/jbpm" + overwrite="true"> <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> </copy> <replace file="${jboss.server.config.dir}/deploy/jbpm/jbpm-${database}-ds.xml" @@ -398,8 +399,9 @@  <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> - <exec executable="${jboss.home}/bin/run.bat" spawn="yes" - os="Windows 7,Windows Vista,Windows XP,Windows 2000"> + <exec executable="${jboss.home}/bin/run.bat" + os="Windows 7,Windows Vista,Windows XP,Windows 2000" + spawn="yes"> <arg value="-b" /> <arg value="${bind.address}" /> </exec> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,24 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> - <session-factory> - - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">@jdbc.driver@</property> <property name="hibernate.connection.url">@jdbc.url@</property> <property name="hibernate.connection.username">@jdbc.username@</property> <property name="hibernate.connection.password">@jdbc.password@</property> <property name="hibernate.format_sql">true</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -8,6 +8,5 @@ <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.mail.templates.examples.xml" /> </jbpm-configuration> Deleted: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.tx.spring.cfg.xml" /> - <import resource="jbpm.jpdl.cfg.xml" /> - <import resource="jbpm.bpmn.cfg.xml" /> - <import resource="jbpm.identity.cfg.xml" /> - <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.console.cfg.xml" /> - <import resource="jbpm.mail.templates.examples.xml" /> - - <process-engine-context> - <string name="spring.cfg" value="applicationContext.xml" /> - </process-engine-context> - -</jbpm-configuration> Deleted: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.tx.hibernate.cfg.xml" /> - <import resource="jbpm.jpdl.cfg.xml" /> - <import resource="jbpm.bpmn.cfg.xml" /> - <import resource="jbpm.identity.cfg.xml" /> - <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.mail.templates.examples.xml" /> - -</jbpm-configuration> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,4 +1,3 @@ mail.smtp.host=(a)bind.address@ mail.smtp.port=2525 mail.from=noreply(a)jbpm.org - Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/examples/pom.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -127,7 +127,7 @@ <fileset dir="${user.home}/.jbpm4/jdbc" /> </copy> <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg"> - <property name="tx" value="standalone.testsuite.examples" /> + <property name="tx" value="standalone.testsuite" /> <property name="mail.cfg" value="testsuite" /> <property name="database" value="${database}" /> <property name="cfg.dest.dir" value="target/test-classes" /> @@ -162,7 +162,7 @@ <configuration> <tasks> <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg"> - <property name="tx" value="spring.testsuite.examples" /> + <property name="tx" value="spring.testsuite" /> <property name="hibernate.connection.type" value="spring" /> <property name="database" value="hsqldb.inmem" /> <property name="mail.cfg" value="testsuite" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -15,6 +15,4 @@ <import resource="jbpm.jobexecutor.cfg.xml" /> --> - <import resource="jbpm.mail.templates.examples.xml" /> - </jbpm-configuration> Deleted: jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.examples.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.examples.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.examples.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <process-engine-context> - - <mail-template name="rectify-template"> - <to addresses="${addressee}" /> - <cc users="bb" groups="innerparty" /> - <bcc groups="thinkpol" /> - <subject>rectify ${newspaper}</subject> - <text>${newspaper} ${date} ${details}</text> - </mail-template> - - </process-engine-context> - -</jbpm-configuration> Copied: jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.xml (from rev 6438, jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.examples.xml) =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.mail.templates.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <process-engine-context> + + <mail-template name='task-notification'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hi ${task.assignee}, +Task "${task.name}" has been assigned to you. +${task.description} + +Sent by jBPM]]></text> + </mail-template> + + <mail-template name='task-reminder'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hey ${task.assignee}, +Do not forget about task "${task.name}". +${task.description} + +Sent by jBPM]]></text> + </mail-template> + + <mail-template name="rectify-template"> + <to addresses="${addressee}" /> + <cc users="bb" groups="innerparty" /> + <bcc groups="thinkpol" /> + <subject>rectify ${newspaper}</subject> + <text>${newspaper} ${date} ${details}</text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -3,6 +3,7 @@ <jbpm-configuration> <import resource="jbpm.default.scriptmanager.xml" /> + <import resource="jbpm.mail.templates.xml" /> <process-engine-context> @@ -25,27 +26,7 @@ <types resource="jbpm.variable.types.xml" /> <address-resolver /> - - <mail-template name='task-notification'> - <to users="${task.assignee}"/> - <subject>${task.name}</subject> - <text><![CDATA[Hi ${task.assignee}, -Task "${task.name}" has been assigned to you. -${task.description} - -Sent by jBPM]]></text> - </mail-template> - - <mail-template name='task-reminder'> - <to users="${task.assignee}"/> - <subject>${task.name}</subject> - <text><![CDATA[Hey ${task.assignee}, -Do not forget about task "${task.name}". -${task.description} - -Sent by jBPM]]></text> - </mail-template> - + </process-engine-context> <transaction-context> Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.mail.templates.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.mail.templates.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.mail.templates.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <process-engine-context> + + <mail-template name='task-notification'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hi ${task.assignee}, +Task "${task.name}" has been assigned to you. +${task.description} + +Sent by jBPM]]></text> + </mail-template> + + <mail-template name='task-reminder'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hey ${task.assignee}, +Do not forget about task "${task.name}". +${task.description} + +Sent by jBPM]]></text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.mail.templates.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,24 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> <session-factory> - - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password" /> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> </session-factory> </hibernate-configuration> Modified: jbpm4/trunk/modules/test-cactus/.classpath =================================================================== --- jbpm4/trunk/modules/test-cactus/.classpath 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/test-cactus/.classpath 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> Modified: jbpm4/trunk/modules/test-cactus/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/pom.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/test-cactus/pom.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -151,7 +151,8 @@ <goal>copy</goal> </goals> <configuration> - <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory> + <outputDirectory>${project.build.directory}/jbpm.test.webapp.libs + </outputDirectory> <artifactItems> <artifactItem> <groupId>aspectj</groupId> @@ -258,11 +259,12 @@ </goals> <configuration> <tasks> - <echo>Bind address: ${bind.address}</echo> - <java classname="org.jbpm.cactustool.CactusTestGenerator" classpathref="maven.test.classpath"> + <java classname="org.jbpm.cactustool.CactusTestGenerator" + classpathref="maven.test.classpath"> <arg file="${project.build.testSourceDirectory}" /> <arg file="${basedir}/../examples/src/test/java" /> <arg file="${basedir}/../test-db/src/test/java" /> + <sysproperty key="excluded.tests" value="SQLStmtTest.java AttachmentTest.java" /> </java> </tasks> </configuration> @@ -277,7 +279,8 @@ <configuration> <tasks> <delete> - <fileset dir="src/test/java" includes="org/jbpm/test/AllIntegrationTests.java" /> + <fileset dir="${project.build.testSourceDirectory}" + includes="org/jbpm/test/AllIntegrationTests.java" /> </delete> </tasks> </configuration> Modified: jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2010-07-02 08:05:29 UTC (rev 6449) @@ -23,86 +23,87 @@ import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.PrintWriter; - /** * @author Tom Baeyens */ public class CactusTestGenerator { - static String testFilter = System.getProperty("test.filter"); + private static final String excludedTests = System.getProperty("excluded.tests"); + private static final String suiteTests = System.getProperty("suite.tests"); - public static void main(String[] args) { - try { - if (args==null) { - log("syntax: java -cp ... org.jbpm.cactustool.CactusTestGenerator testdestroot testsrcroot1 testsrcroot2 ..."); - } - - if (testFilter!=null) { - log("################################################################################################"); - log("# test.filter: "+testFilter); - log("################################################################################################"); - } - - String testPackageSourceDir = args[0]+"/org/jbpm/test"; - new File(testPackageSourceDir).mkdirs(); - - String testFileName = testPackageSourceDir+"/AllIntegrationTests.java"; - File testFile = new File(testFileName); - FileOutputStream fos = new FileOutputStream(testFile); - PrintWriter out = new PrintWriter(fos); - log("generating java class "+testFile.getCanonicalPath()); - - out.println("package org.jbpm.test;"); - out.println(); - out.println("import junit.framework.Test;"); - out.println("import junit.framework.TestCase;"); - out.println("import org.apache.cactus.ServletTestSuite;"); - out.println(); - out.println("public class AllIntegrationTests extends TestCase {"); - out.println(); - out.println(" public static Test suite() {"); - out.println(" ServletTestSuite suite = new ServletTestSuite();"); - - for (int i=1; i<args.length; i++) { - String testSrcRoot = args[i]; - scanForTestClasses(testSrcRoot, "", out); - } + public static void main(String[] args) throws IOException { + if (args == null) { + log("syntax: java -cp ... org.jbpm.cactustool.CactusTestGenerator testdestroot testsrcroot1 testsrcroot2 ..."); + } - out.println(" return suite;"); - out.println(" }"); - out.println("}"); - - out.close(); - - } catch (Exception e) { - e.printStackTrace(); + if (excludedTests != null) { + log("################################################################################################"); + log("# excluded tests: " + excludedTests); + log("################################################################################################"); } + + String testPackageSourceDir = args[0] + "/org/jbpm/test"; + new File(testPackageSourceDir).mkdirs(); + + String testFileName = testPackageSourceDir + "/AllIntegrationTests.java"; + File testFile = new File(testFileName); + FileOutputStream fos = new FileOutputStream(testFile); + PrintWriter out = new PrintWriter(fos); + log("generating java class " + testFile); + + out.println("package org.jbpm.test;"); + out.println(); + out.println("import junit.framework.Test;"); + out.println("import junit.framework.TestCase;"); + out.println("import org.apache.cactus.ServletTestSuite;"); + out.println(); + out.println("public class AllIntegrationTests extends TestCase {"); + out.println(); + out.println(" public static Test suite() {"); + out.println(" ServletTestSuite suite = new ServletTestSuite();"); + + for (int i = 1; i < args.length; i++) { + String testSrcRoot = args[i]; + scanForTestClasses(testSrcRoot, "", out); + } + + out.println(" return suite;"); + out.println(" }"); + out.println("}"); + + out.close(); } - private static void scanForTestClasses(String dirPath, String packageName, PrintWriter out) throws Exception { + private static void scanForTestClasses(String dirPath, String packageName, PrintWriter out) + throws IOException { File dirFile = new File(dirPath); - if (".svn".equals(dirFile.getName())) { + if (".svn".equals(dirFile.getName())) return; - } - log("scanning dir "+dirFile.getCanonicalPath()); + + log("scanning dir " + dirFile.getAbsolutePath()); File[] dirContentFiles = dirFile.listFiles(); - if (dirContentFiles!=null) { + if (dirContentFiles != null) { for (File file : dirContentFiles) { String fileName = file.getName(); - if ( file.isFile() - && fileName.endsWith("Test.java") - && (! fileName.endsWith("SQLStmtTest.java")) - && (testFilter==null || (fileName.indexOf(testFilter)!=-1)) - ) { - String className = packageName + "." + fileName.substring(0, fileName.length()-5)+".class"; - log(" adding "+className); - out.println(" suite.addTestSuite(" + className + ");"); - } else if (file.isDirectory()) { - String subDirPath = dirPath+"/"+fileName; - String subPackageName = ("".equals(packageName) ? fileName : packageName+"."+fileName); + if (file.isFile() && fileName.endsWith("Test.java") + && (excludedTests == null || !excludedTests.contains(fileName))) { + String className = packageName + "." + fileName.substring(0, fileName.length() - 5); + log(" adding " + className); + if (suiteTests == null || !suiteTests.contains(fileName)) { + out.println(" suite.addTestSuite(" + className + ".class);"); + } + else { + out.println(" suite.addTest(" + className + ".suite());"); + } + } + else if (file.isDirectory()) { + String subDirPath = dirPath + "/" + fileName; + String subPackageName = "".equals(packageName) ? fileName : packageName + "." + + fileName; scanForTestClasses(subDirPath, subPackageName, out); } } Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/build.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="jbpm.qa"> - +  <property file="${user.home}/.jbpm4/build.properties" /> - + <fail message="property jbpm.parent.dir must be specified" unless="jbpm.parent.dir" />  @@ -18,14 +18,13 @@ <property name="jboss.parent.dir" value="${jbpm.home}" /> <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> <property name="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <property name="jboss.server.config.dir" + value="${jboss.home}/server/${jboss.server.configuration}" /> <property name="tomcat.version" value="6.0.20" /> <property name="tomcat.parent.dir" value="${jbpm.home}" /> <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> - <property name="mail.cfg" value="testsuite" /> -  <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> <property name="jbpm.distro.dir" value="../modules/distro/target" /> @@ -46,10 +45,9 @@    - +  - <target name="testsuite.db.setup" - depends="reinstall.jbpm"> + <target name="testsuite.db.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> </target> @@ -64,8 +62,7 @@   - <target name="testsuite.tomcat.setup" - depends="reinstall.jbpm"> + <target name="testsuite.tomcat.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" /> <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" /> @@ -75,7 +72,7 @@  <mkdir dir="${tomcat.home}/webapps/jbpm-test-webapp" /> <copy todir="${tomcat.home}/webapps/jbpm-test-webapp"> - <fileset dir="${jbpm.home}/install/generated/user-webapp"/> + <fileset dir="${jbpm.home}/install/generated/user-webapp" /> </copy>  @@ -85,10 +82,12 @@  <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" /> - <copy file="${jbpm.home}/examples/target/examples.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" /> - + <copy file="${jbpm.home}/examples/target/examples.jar" + todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" /> +  - <copy file="${jbpm.home}/lib/junit.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" /> + <copy file="${jbpm.home}/lib/junit.jar" + todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" />  <copy todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib"> @@ -96,7 +95,8 @@ </copy>  - <copy file="${jbpm.home}/lib/bsh.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" /> + <copy file="${jbpm.home}/lib/bsh.jar" + todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" />  <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" /> @@ -108,13 +108,13 @@ <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> </target> - +     - <target name="testsuite.jboss.setup" + <target name="testsuite.jboss.setup" depends="internal.jboss.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> @@ -123,15 +123,14 @@ </target>  - <target name="testsuite.jboss.teardown" - description="drops the jbpm schema and stops jboss"> + <target name="testsuite.jboss.teardown" description="drops the jbpm schema and stops jboss"> <ant antfile="${jbpm.home}/install/build.xml" target="stop.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> </target>  - <target name="testsuite.jboss.setup.for.debug" + <target name="testsuite.jboss.setup.for.debug" depends="internal.jboss.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> @@ -140,8 +139,7 @@ </target>  - <target name="internal.jboss.test.setup.base" - depends="reinstall.jbpm"> + <target name="internal.jboss.test.setup.base" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" /> @@ -150,29 +148,34 @@  <mkdir dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" /> <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war"> - <fileset dir="${jbpm.home}/install/generated/user-webapp"/> + <fileset dir="${jbpm.home}/install/generated/user-webapp" /> </copy>  <copy todir="${jboss.home}/server/default/deploy/jbpm/jbpm-service.sar" overwrite="true"> <fileset dir="jboss.jbpm.cfg" /> + <filterset> + <filter token="bind.address" value="${bind.address}" /> + </filterset> </copy>  <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true"> <fileset dir="cactus.webapp.cfg" /> </copy> - +  <delete dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/classes" /> <delete file="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib/jta.jar" />  <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" /> - <copy file="${jbpm.home}/examples/target/examples.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" /> - + <copy file="${jbpm.home}/examples/target/examples.jar" + todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" /> +  - <copy file="${jbpm.home}/lib/junit.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" /> + <copy file="${jbpm.home}/lib/junit.jar" + todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />  <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib"> @@ -186,7 +189,7 @@   - <target name="testsuite.enterprise.setup" + <target name="testsuite.enterprise.setup" depends="internal.enterprise.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> @@ -197,13 +200,13 @@  <target name="testsuite.enterprise.teardown" - description="drops the jbpm schema and stops jboss"> + description="drops the jbpm schema and stops jboss"> <ant antfile="${jbpm.home}/install/build.xml" target="stop.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> </target> - - <target name="testsuite.enterprise.setup.for.debug" + + <target name="testsuite.enterprise.setup.for.debug" depends="internal.enterprise.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> @@ -211,40 +214,39 @@ <ant antfile="${jbpm.home}/install/build.xml" target="enable.jboss.debug" /> </target> - <target name="internal.enterprise.test.setup.base" + <target name="internal.enterprise.test.setup.base" depends="internal.jboss.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">  <copy file="enterprise/jbpm-test-destinations-service.xml" todir="${jboss.home}/server/default/deploy/jbpm-test" /> - +  - <copy file="../modules/test-enterprise/test-enterprise-ejb/target/jbpm-test-enterprise-ejb-${jbpm.version}.jar" - todir="${jboss.home}/server/default/deploy/jbpm-test"/> + <copy file="../modules/test-enterprise/test-enterprise-ejb/target/jbpm-test-enterprise-ejb-${jbpm.version}.jar" + todir="${jboss.home}/server/default/deploy/jbpm-test" />  - <copy file="../modules/test-enterprise/test-enterprise-suite/target/jbpm-test-enterprise-suite-${jbpm.version}-tests.jar" + <copy file="../modules/test-enterprise/test-enterprise-suite/target/jbpm-test-enterprise-suite-${jbpm.version}-tests.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" /> </target> -    <property name="old.jbpm.home" value="${jbpm.parent.dir}/jbpm-${old.jbpm.version}" /> <target name="testsuite.upgrade.setup" depends="reinstall.jbpm"> <fail message="old.jbpm.version is a mandatory property" unless="old.jbpm.version" /> - +  <delete dir="${old.jbpm.home}" /> <unzip src="upgrade/target/jbpm-distro-${old.jbpm.version}.jar" dest="${jbpm.parent.dir}" /> - +  <antcall target="copy.oracle.driver" /> - +  <delete dir="upgrade/target/jdbc" /> - <mkdir dir="upgrade/target/jdbc" /> + <mkdir dir="upgrade/target/jdbc" /> <copy todir="upgrade/target/jdbc"> <fileset dir="jdbc" /> </copy> @@ -256,15 +258,15 @@ <copy todir="upgrade/target/jdbc" overwrite="true" failonerror="false"> <fileset dir="${user.home}/.jbpm4/jdbc" /> </copy> - +  <delete dir="upgrade/target/jbpm-test-upgrade" /> <mkdir dir="upgrade/target/jbpm-test-upgrade" /> <unzip dest="upgrade/target/jbpm-test-upgrade" src="upgrade/target/jbpm-test-upgrade.jar" /> <delete file="upgrade/target/jbpm-test-upgrade/hibernate.properties" /> - + <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" /> - <antcall target="start.hsqldb" /> + <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />  @@ -273,7 +275,7 @@ </condition> <antcall target="create.jbpm.schema.in.jbpm.40" /> <antcall target="create.jbpm.schema.in.jbpm.41plus" /> - +  <copy todir="upgrade/target/jbpm-test-upgrade" overwrite="true"> <fileset dir="upgrade/cfg" /> @@ -282,19 +284,21 @@ <classpath> <pathelement location="upgrade/target/jbpm-test-upgrade" /> <fileset dir="${old.jbpm.home}"> - <include name="jbpm.jar"/> + <include name="jbpm.jar" /> </fileset> <fileset dir="${old.jbpm.home}/lib"> - <include name="*.jar"/> + <include name="*.jar" /> </fileset> </classpath> </java> - +  <copy todir="${jbpm.home}/install/jdbc" overwrite="true"> <fileset dir="upgrade/target/jdbc" /> </copy> - <ant antfile="${jbpm.home}/install/build.xml" target="upgrade.jbpm.schema" inheritall="false"> + <ant antfile="${jbpm.home}/install/build.xml" + target="upgrade.jbpm.schema" + inheritall="false"> <property name="database" value="${database}" /> <property name="tx" value="standalone.testsuite" />  @@ -306,11 +310,10 @@ <copy file="upgrade/target/ojdbc14.jar" todir="${jbpm.home}/lib" /> </target> - <target name="start.hsqldb" if="is.hsqldb"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> </target> - + <target name="stop.hsqldb" if="is.hsqldb"> <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> </target> @@ -323,64 +326,66 @@ </copy> <replace file="upgrade/target/jbpm-test-upgrade/jbpm.cfg.xml"> <replacetoken><![CDATA[<import resource="jbpm.businesscalendar.cfg.xml" />]]></replacetoken> - <replacevalue></replacevalue> + <replacevalue /> </replace> <ant antfile="${old.jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false"> <property name="database" value="${database}" /> </ant> - <copy file="${old.jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" - tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" + <copy file="${old.jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" + tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" overwrite="true"> <filterset filtersfile="upgrade/target/jdbc/${database}.properties" /> </copy> </target> <target name="create.jbpm.schema.in.jbpm.41plus" unless="is.old.jbpm.40"> - <echo message="creating schema in jbpm 4.1+" /> + <echo message="creating schema in jbpm 4.1+" />  <copy todir="${old.jbpm.home}/install/jdbc"> <fileset dir="upgrade/target/jdbc" /> </copy> - <ant antfile="${old.jbpm.home}/install/build.xml" target="create.jbpm.schema" inheritall="false"> + <ant antfile="${old.jbpm.home}/install/build.xml" + target="create.jbpm.schema" + inheritall="false"> <property name="database" value="${database}" /> </ant> - <copy file="${old.jbpm.home}/install/src/cfg/hibernate/jdbc/${database}.hibernate.cfg.xml" - tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" + <copy file="${old.jbpm.home}/install/src/cfg/hibernate/jdbc/${database}.hibernate.cfg.xml" + tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" overwrite="true"> <filterset filtersfile="upgrade/target/jdbc/${database}.properties" /> </copy> </target> - + <target name="testsuite.upgrade.teardown"> - <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" inheritall="false" /> + <ant antfile="${jbpm.home}/install/build.xml" + target="drop.jbpm.schema" + inheritall="false" /> <antcall target="stop.hsqldb" /> </target> -      - <target name="reinstall.jbpm" + <target name="reinstall.jbpm" description="deletes the jbpm installation and then reinstalls jbpm"> <delete dir="${jbpm.home}" /> <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" />  - <copy file="jdbc/${database}.properties" - todir="${jbpm.home}/install/jdbc" - overwrite="true" + <copy file="jdbc/${database}.properties" + todir="${jbpm.home}/install/jdbc" + overwrite="true" failonerror="false" />  - <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" - todir="${jbpm.home}/install/jdbc" - overwrite="true" + <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" + todir="${jbpm.home}/install/jdbc" + overwrite="true" failonerror="false" />  - <copy file="../modules/distro/target/libs/ojdbc14.jar" - todir="${jbpm.home}/lib"/> + <copy file="../modules/distro/target/libs/ojdbc14.jar" todir="${jbpm.home}/lib" /> </target> </project> Modified: jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,15 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.tx.hibernate.cfg.xml" /> - <import resource="jbpm.jpdl.cfg.xml" /> - <import resource="jbpm.bpmn.cfg.xml" /> - <import resource="jbpm.identity.cfg.xml" /> - <import resource="jbpm.businesscalendar.cfg.xml" /> -  - - <import resource="jbpm.mail.templates.examples.xml" /> - -</jbpm-configuration> +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> + + <import resource="jbpm.mail.templates.examples.xml" /> + +</jbpm-configuration> Modified: jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.hibernate.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.hibernate.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,25 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> - <session-factory> - - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.password" /> <property name="hibernate.hbm2ddl.auto">create-drop</property> <property name="hibernate.format_sql">true</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.properties =================================================================== --- jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.properties 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.properties 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,3 +0,0 @@ -mail.smtp.host localhost -mail.smtp.port 2525 -mail.from noreply(a)jbpm.org \ No newline at end of file Deleted: jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.templates.examples.xml =================================================================== --- jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.templates.examples.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/cactus.webapp.cfg/WEB-INF/classes/jbpm.mail.templates.examples.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <process-engine-context> - - <mail-template name="rectify-template"> - <to addresses="${addressee}" /> - <cc users="bb" groups="innerparty" /> - <bcc groups="thinkpol" /> - <subject>rectify ${newspaper}</subject> - <text>${newspaper} ${date} ${details}</text> - </mail-template> - - </process-engine-context> - -</jbpm-configuration> \ No newline at end of file Modified: jbpm4/trunk/qa/hudson-jbpm4-cfg.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-07-02 08:05:29 UTC (rev 6449) @@ -2,7 +2,8 @@ # # runs the configuration test suite +# build distribution mvn -U -Pdistro clean install - +# run test suite mvn -f modules/test-cfg/pom.xml -Dmaven.test.failure.ignore=true \ clean test Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-db.sh 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/hudson-jbpm4-db.sh 2010-07-02 08:05:29 UTC (rev 6449) @@ -2,7 +2,11 @@ # # runs the database test suite +# build distribution mvn -U -Pdistro clean install +# set up ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.setup +# run test suite mvn -Ddatabase=$DATABASE -Dmaven.test.failure.ignore=true test +# tear down ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-07-02 08:05:29 UTC (rev 6449) @@ -2,20 +2,17 @@ # # runs the jboss integration test suite -# Give tests a max memory amount of at least 256 MB -TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'` -MAX_MEM=`expr $TOTAL_MEM / 4` -[ $MAX_MEM -lt 256 ] && MAX_MEM=256 -MAX_MEM="$MAX_MEM"m -export MAVEN_OPTS="-Xmx$MAX_MEM -Dbind.address=$JBOSS_BINDADDR" +export MAVEN_OPTS="-Dbind.address=$JBOSS_BINDADDR" -export ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \ - -Djboss.distro.dir=$SOURCE_REPO/jboss -Dbind.address=$JBOSS_BINDADDR" +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dbind.address=$JBOSS_BINDADDR \ + -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION" +# build distribution mvn -U -Pdistro,enterprise clean install +# set up ant -f qa/build.xml testsuite.enterprise.setup - +# run test suite mvn -f modules/test-enterprise/test-enterprise-suite/pom.xml -Pruntest \ - -Dmaven.test.failure.ignore=true clean test - + -Dmaven.test.failure.ignore=true test +# tear down ant -f qa/build.xml testsuite.enterprise.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-07-02 08:05:29 UTC (rev 6449) @@ -2,20 +2,16 @@ # # runs the jboss integration test suite -# Give tests a max memory amount of at least 256 MB -TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'` -MAX_MEM=`expr $TOTAL_MEM / 4` -[ $MAX_MEM -lt 256 ] && MAX_MEM=256 -MAX_MEM="$MAX_MEM"m -export MAVEN_OPTS="-Xmx$MAX_MEM -Dbind.address=$JBOSS_BINDADDR" +export MAVEN_OPTS="-Dbind.address=$JBOSS_BINDADDR" -export ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \ - -Djboss.distro.dir=$SOURCE_REPO/jboss -Dbind.address=$JBOSS_BINDADDR" +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dbind.address=$JBOSS_BINDADDR \ + -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION" +# build distribution mvn -U -Pdistro,integration clean install +# set up ant -f qa/build.xml testsuite.jboss.setup - -mvn -f modules/test-cactus/pom.xml -Pruntest \ - -Dmaven.test.failure.ignore=true clean test - +# run test suite +mvn -f modules/test-cactus/pom.xml -Pruntest -Dmaven.test.failure.ignore=true test +# tear down ant -f qa/build.xml testsuite.jboss.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-07-02 08:05:29 UTC (rev 6449) @@ -2,16 +2,16 @@ # # runs the tomcat integration test suite -MAVEN_OPTS="-Xmx512M -Dbind.address=$TOMCAT_BINDADDR" -ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dtomcat.distro.dir=tomcat.downloads \ --Dbind.address=$TOMCAT_BINDADDR" +export MAVEN_OPTS="-Dbind.address=$TOMCAT_BINDADDR" +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dbind.address=$TOMCAT_BINDADDR \ + -Dtomcat.distro.dir=tomcat.downloads" + +# build distribution mvn -U -Pdistro,integration clean install -ant -f qa/build.xml reinstall.jbpm +# set up ant -f qa/build.xml testsuite.tomcat.setup - -cd modules/test-cactus -mvn -Pruntest test -cd ../.. - +# run test suite +mvn -f modules/test-cactus/pom.xml -Pruntest -Dmaven.test.failure.ignore=true test +# tear down ant -f qa/build.xml testsuite.tomcat.teardown Modified: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -3,11 +3,11 @@ <jbpm-configuration> <import resource="jbpm.default.cfg.xml" /> - <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.mail.templates.examples.xml" /> Modified: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,3 +1,3 @@ -mail.smtp.host localhost -mail.smtp.port 2525 -mail.from noreply(a)jbpm.org \ No newline at end of file +mail.smtp.host=(a)bind.address@ +mail.smtp.port=2525 +mail.from=noreply(a)jbpm.org Deleted: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml 2010-07-01 15:55:46 UTC (rev 6448) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <process-engine-context> - - <mail-template name="rectify-template"> - <to addresses="${addressee}" /> - <cc users="bb" groups="innerparty" /> - <bcc groups="thinkpol" /> - <subject>rectify ${newspaper}</subject> - <text>${newspaper} ${date} ${details}</text> - </mail-template> - - </process-engine-context> - -</jbpm-configuration> Copied: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml (from rev 6438, jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml) =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml (rev 0) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml 2010-07-02 08:05:29 UTC (rev 6449) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <process-engine-context> + + <mail-template name='task-notification'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hi ${task.assignee}, +Task "${task.name}" has been assigned to you. +${task.description} + +Sent by jBPM]]></text> + </mail-template> + + <mail-template name='task-reminder'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hey ${task.assignee}, +Do not forget about task "${task.name}". +${task.description} + +Sent by jBPM]]></text> + </mail-template> + + <mail-template name="rectify-template"> + <to addresses="${addressee}" /> + <cc users="bb" groups="innerparty" /> + <bcc groups="thinkpol" /> + <subject>rectify ${newspaper}</subject> + <text>${newspaper} ${date} ${details}</text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration>

13 years, 12 months

1
0
0 / 0

JBoss JBPM SVN: r6448 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/query and 1 other directories.

by do-not-reply＠jboss.org

Author: swiderski.maciej Date: 2010-07-01 11:55:46 -0400 (Thu, 01 Jul 2010) New Revision: 6448 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryProcessTest.java Log: JBPM-2901: task query extended with executionId as query condition. Incorporated changes done by Micheal Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2010-07-01 08:54:37 UTC (rev 6447) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2010-07-01 15:55:46 UTC (rev 6448) @@ -58,6 +58,9 @@ * associated as a candidate group to the task. */ TaskQuery candidate(String userId); + /** only select tasks that are associated to the given execution */ + TaskQuery executionId(String executionId); + /** only select tasks that are associated to the given process instance */ TaskQuery processInstanceId(String processInstanceId); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java 2010-07-01 08:54:37 UTC (rev 6447) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java 2010-07-01 15:55:46 UTC (rev 6448) @@ -54,6 +54,7 @@ protected String assignee; protected String candidate; protected Boolean suspended; + protected String executionId; protected String processInstanceId; protected String processDefinitionId; protected String activityName; @@ -75,6 +76,11 @@ return this; } + public TaskQuery executionId(String executionId) { + this.executionId = executionId; + return this; + } + public TaskQuery processInstanceId(String processInstanceId) { this.processInstanceId = processInstanceId; return this; @@ -190,6 +196,10 @@ } } + if (executionId!=null) { + appendWhereClause("task.execution.id = '"+executionId+"' ", hql); + } + if (processInstanceId!=null) { appendWhereClause("task.processInstance.id = '"+processInstanceId+"' ", hql); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryProcessTest.java 2010-07-01 08:54:37 UTC (rev 6447) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryProcessTest.java 2010-07-01 15:55:46 UTC (rev 6448) @@ -21,11 +21,13 @@ */ package org.jbpm.test.task; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.jbpm.api.Execution; import org.jbpm.api.ProcessInstance; import org.jbpm.api.task.Task; @@ -243,4 +245,55 @@ assertEquals(0, workHardForTheMoneyTasks); } + + public void testTaskQueryExecutionId() { + deployJpdlXmlString( + "<process name='VacationTrip'>" + + " <start>" + + " <transition to='f' />" + + " </start>" + + " <fork name='f'>" + + " <transition to='select destination' />" + + " <transition to='work hard for the money' />" + + " </fork>" + + " <task name='select destination' " + + " assignee='johndoe'>" + + " <transition to='join' />" + + " </task>" + + " <task name='work hard for the money' " + + " assignee='johndoe'>" + + " <transition to='join' />" + + " </task>" + + " <join name='join'>" + + " <transition to='end' />" + + " </join>" + + " <end name='end'/>" + + "</process>"); + // start the process + ProcessInstance process = executionService.startProcessInstanceByKey("VacationTrip"); + + // we should have two tasks and two executions here: + Collection<? extends Execution> executions = process.getExecutions(); + assertEquals(2, executions.size()); + + // check if there is one task in each execution: + for (Execution execution : executions) { + Task task = taskService.createTaskQuery().executionId(execution.getId()).uniqueResult(); + assertNotNull(task); + assertEquals(execution.getId(), task.getExecutionId()); } + + // complete the tasks + process = executionService.findProcessInstanceById(process.getId()); + executions = process.getExecutions(); + for (Execution execution : executions) { + assertFalse(execution.isEnded()); + Task task = taskService.createTaskQuery().executionId(execution.getId()).uniqueResult(); + taskService.completeTask(task.getId()); + } + + // process should be ended now + process = executionService.findProcessInstanceById(process.getId()); + assertNull(process); + } +}

13 years, 12 months

1
0
0 / 0

JBoss JBPM SVN: r6447 - in jbpm4/trunk: modules/bpmn and 24 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-07-01 04:54:37 -0400 (Thu, 01 Jul 2010) New Revision: 6447 Added: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml Removed: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/ Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/bpmn/pom.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/examples/src/test/config/jndi.properties jbpm4/trunk/modules/jpdl/pom.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java jbpm4/trunk/modules/test-cactus/pom.xml jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties jbpm4/trunk/pom.xml jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/hudson-jbpm4-cfg.sh jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh jbpm4/trunk/qa/hudson-jbpm4-jboss.sh jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh jbpm4/trunk/qa/jdbc/hsqldb.properties Log: JBPM-2893: revive hudson enterprise and jboss jobs address bind address issues Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/build.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -18,7 +18,7 @@  <property name="windows.browser" value="C:/Program Files/Mozilla Firefox/firefox.exe" /> <property name="macos.browser" value="/usr/bin/open" /> - <property name="linux.browser" value="mozilla" /> + <property name="linux.browser" value="firefox" /> <property name="distro.installation.dir" value="c:/software" /> <property name="distro.version" value="4.4-SNAPSHOT" /> @@ -34,13 +34,13 @@ </target> <target name="install"> - <exec executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <exec executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000"> <arg line="-DskipTests install" /> </exec> </target> <target name="javadoc"> - <exec executable="${mvn.executable}" dir="modules/api" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <exec executable="${mvn.executable}" dir="modules/api" os="Windows Vista, Windows XP,Windows 2000"> <arg line="javadoc:javadoc" /> </exec> <antcall target="show.html"> @@ -49,7 +49,7 @@ </target> <target name="test.pvm"> - <exec dir="modules/pvm" executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <exec dir="modules/pvm" executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000"> <arg line="${mvn.executable} surefire-report:report" /> </exec> <antcall target="show.html"> @@ -157,7 +157,7 @@ <target name="test.configuration" description="create test configuration in target/config"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="db.drop.create" inheritall="false"> - <property name="jboss.bind.address" value="localhost" /> + <property name="bind.address" value="localhost" /> <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" /> <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" /> <property name="libs.dir" value="${basedir}/target/libs" /> Modified: jbpm4/trunk/modules/bpmn/pom.xml =================================================================== --- jbpm4/trunk/modules/bpmn/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/bpmn/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -97,7 +97,7 @@ <id>integration.test</id> <activation> <property> - <name>jboss.bind.address</name> + <name>bind.address</name> </property> </activation> <properties> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -17,12 +17,8 @@   <property name="database" value="hsqldb" /> - <echo message="database......... ${database}" />  <property name="tx" value="standalone" /> - <echo message="tx............... ${tx}" /> - <property name="mail.smtp.host" value="localhost" /> - <echo message="mail.smtp.host... ${mail.smtp.host}" />  <property name="jbpm.version" value="4.4-SNAPSHOT" /> @@ -34,9 +30,11 @@ <property name="logging" value="jdk" /> <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" /> <property name="install.src.dir" value="${jbpm.home}/install/src" /> +  <property name="mail.cfg" value="default" /> - <property name="hsql.bind.address" value="localhost" /> + <property name="bind.address" value="localhost" /> + <property name="jdbc.properties.dir" value="${jbpm.home}/install/jdbc" /> <property file="${jdbc.properties.dir}/${database}.properties" /> @@ -59,7 +57,6 @@ <property name="jboss.version" value="5.1.0.GA" /> <property name="jboss.parent.dir" value="${jbpm.home}" /> <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> - <property name="jboss.bind.address" value="localhost" /> <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> <property name="jboss.distro.dir" value="downloads" /> <property name="jboss.distro.url" @@ -173,8 +170,8 @@ <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> </copy> <replace file="${cfg.dest.dir}/jbpm.hibernate.cfg.xml" - token="$${hsql.bind.address}" - value="${hsql.bind.address}" /> + token="$${bind.address}" + value="${bind.address}" /> <copy todir="${cfg.dest.dir}" overwrite="true"> <fileset dir="${install.src.dir}/cfg/logging/${logging}" /> </copy> @@ -182,7 +179,7 @@ file="${install.src.dir}/cfg/mail/jbpm.mail.${mail.cfg}.properties" overwrite="true"> <filterset> - <filter token="mail.smtp.host" value="${mail.smtp.host}" /> + <filter token="bind.address" value="${bind.address}" /> </filterset> </copy> @@ -284,7 +281,9 @@ </target>  - <target name="install.jbpm.into.jboss" description="Installs jBPM into JBoss"> + <target name="install.jbpm.into.jboss" + depends="create.cfg" + description="Installs jBPM into JBoss">  <copy todir="${jboss.server.config.dir}" overwrite="true"> <fileset dir="${jbpm.home}/install/src/jboss/config" /> @@ -297,16 +296,19 @@  - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <copy file="${jbpm.home}/install/src/jboss/datasources/jbpm-${database}-ds.xml" + todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> - <fileset dir="${jbpm.home}/install/src/jboss/datasources"> - <include name="jbpm-${database}-ds.xml" /> - </fileset> </copy> <replace file="${jboss.server.config.dir}/deploy/jbpm/jbpm-${database}-ds.xml" - token="$${hsql.bind.address}" - value="${hsql.bind.address}" /> + token="$${bind.address}" + value="${bind.address}" /> +  + <copy file="${cfg.dest.dir}/jbpm.mail.properties" + todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" + overwrite="true" /> +  <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/gwt-console-jbpm.war" /> <unzip src="${jbpm.home}/lib/gwt-console-jbpm.war" @@ -399,18 +401,18 @@ <exec executable="${jboss.home}/bin/run.bat" spawn="yes" os="Windows 7,Windows Vista,Windows XP,Windows 2000"> <arg value="-b" /> - <arg value="${jboss.bind.address}" /> + <arg value="${bind.address}" /> </exec> <exec executable="${jboss.home}/bin/run.sh" spawn="yes" os="Linux,Mac OS X"> <arg value="-b" /> - <arg value="${jboss.bind.address}" /> + <arg value="${bind.address}" /> </exec> <waitfor maxwait="5" maxwaitunit="minute" checkevery="30" checkeveryunit="second" timeoutproperty="jboss.timeout"> - <socket server="${jboss.bind.address}" port="8080" /> + <socket server="${bind.address}" port="8080" /> </waitfor> <fail if="jboss.timeout" message="jboss did not start within 5 minutes" /> </target> @@ -421,12 +423,12 @@ <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows 7,Windows Vista,Windows XP,Windows 2000"> <arg value="-s" /> - <arg value="jnp://${jboss.bind.address}:1099" /> + <arg value="jnp://${bind.address}:1099" /> <arg value="-S" /> </exec> <exec executable="${jboss.home}/bin/shutdown.sh" os="Linux,Mac OS X"> <arg value="-s" /> - <arg value="jnp://${jboss.bind.address}:1099" /> + <arg value="jnp://${bind.address}:1099" /> <arg value="-S" /> </exec> </target> @@ -588,8 +590,8 @@ <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> </copy> <replace file="${tomcat.home}/conf/server.xml" - token="$${hsql.bind.address}" - value="${hsql.bind.address}" /> + token="@bind.address@" + value="${bind.address}" /> </target>  @@ -619,7 +621,7 @@ <java classname="org.hsqldb.Server" fork="yes" spawn="yes"> <classpath location="${hsqldb.server.install.dir}/hsqldb.jar" /> <arg value="-address" /> - <arg value="${hsql.bind.address}" /> + <arg value="${bind.address}" /> <arg value="-port" /> <arg value="1701" /> <arg value="-dbname.0" /> @@ -630,7 +632,7 @@ checkevery="10" checkeveryunit="second" timeoutproperty="hsqldb.timeout"> - <socket server="${hsql.bind.address}" port="1701" /> + <socket server="${bind.address}" port="1701" /> </waitfor> <fail if="hsqldb.timeout" message="hsqldb server did not start within one minute" /> </target> @@ -766,7 +768,7 @@ <target name="hsqldb.databasemanager" description="start the hsqldb database manager"> <java classname="org.hsqldb.util.DatabaseManager" fork="true"> <arg value="-url" /> - <arg value="jdbc:hsqldb:hsql://${hsql.bind.address}:1701" /> + <arg value="jdbc:hsqldb:hsql://${bind.address}:1701" /> <classpath> <fileset dir="${jbpm.home}/lib"> <include name="hsqldb.jar" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,4 +1,4 @@ jdbc.driver=org.hsqldb.jdbcDriver -jdbc.url=jdbc\:hsqldb\:hsql\://${hsql.bind.address}\:1701 +jdbc.url=jdbc\:hsqldb\:hsql\://${bind.address}\:1701 jdbc.username=sa jdbc.password= Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,3 +1,4 @@ -mail.smtp.host=(a)mail.smtp.host@ +mail.smtp.host=(a)bind.address@ mail.smtp.port=25 mail.from=noreply(a)jbpm.org + Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,3 +1,4 @@ -mail.smtp.host localhost -mail.smtp.port 2525 -mail.from noreply(a)jbpm.org \ No newline at end of file +mail.smtp.host=(a)bind.address@ +mail.smtp.port=2525 +mail.from=noreply(a)jbpm.org + Deleted: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,3 +0,0 @@ -mail.smtp.host=localhost -mail.smtp.port=25 -mail.from=noreply(a)jbpm.org Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -23,9 +23,9 @@ <Service name="Catalina"> - <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> + <Connector address="@bind.address@" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> - <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> + <Connector address="@bind.address@" port="8009" protocol="AJP/1.3" redirectPort="8443" /> <Engine name="Catalina" defaultHost="localhost"> Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/enterprise/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -144,10 +144,10 @@ <profiles> <profile> - <id>no-jboss-bind-address</id> + <id>no-bind-address</id> <activation> <property> - <name>!jboss.bind.address</name> + <name>!bind.address</name> </property> </activation> <build> Modified: jbpm4/trunk/modules/examples/src/test/config/jndi.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/config/jndi.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/examples/src/test/config/jndi.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,3 +1,3 @@ java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory java.naming.factory.url.pkgs=org.jboss.naming\:org.jnp.interfaces -java.naming.provider.url=jnp\://@jboss.bind.address@\:1099 +java.naming.provider.url=jnp\://@bind.address@\:1099 Modified: jbpm4/trunk/modules/jpdl/pom.xml =================================================================== --- jbpm4/trunk/modules/jpdl/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/jpdl/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -11,7 +11,6 @@ <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 - jPDL</name> @@ -44,6 +43,11 @@  <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> <scope>provided</scope> @@ -96,5 +100,4 @@ </properties> </profile> </profiles> - </project> \ No newline at end of file Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2010-07-01 08:54:37 UTC (rev 6447) @@ -81,7 +81,7 @@ if (textElement != null) { String expressionText = XmlUtil.getContentText(textElement); jmsActivity.setType("text"); - Expression expression = Expression.create(expressionText, Expression.LANGUAGE_UEL); + Expression expression = Expression.create(expressionText, Expression.LANGUAGE_UEL_VALUE); jmsActivity.setTextExpression(expression); } @@ -89,7 +89,7 @@ if (objectElement != null) { jmsActivity.setType("object"); String expressionText = XmlUtil.attribute(objectElement, "expr"); - Expression expression = Expression.create(expressionText, Expression.LANGUAGE_UEL); + Expression expression = Expression.create(expressionText, Expression.LANGUAGE_UEL_VALUE); jmsActivity.setObjectExpression(expression); } Copied: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant (from rev 6438, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant) Deleted: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java 2010-06-28 23:26:55 UTC (rev 6438) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.test.ant; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.util.List; - -import org.apache.tools.ant.Main; - -import org.jbpm.api.Deployment; -import org.jbpm.test.JbpmTestCase; - -/** - * @author Alejandro Guizar - */ -public class DeployTaskTest extends JbpmTestCase { - - public void testDeployXml() { - runTarget("deploy-xml"); - checkDeployment(); - } - - public void testDeployZip() { - runTarget("deploy-zip"); - checkDeployment(); - } - - public void testDeployBar() { - runTarget("deploy-bar"); - checkDeployment(); - } - - private void runTarget(String target) { - PrintStream stdout = System.out; - PrintStream stderr = System.err; - - ByteArrayOutputStream memout = new ByteArrayOutputStream(); - PrintStream prnout = new PrintStream(memout); - - try { - System.setOut(prnout); - System.setErr(prnout); - - Main antMain = new Main() { - - protected void exit(int exitCode) { - // prevent ant from terminating the VM - } - }; - String[] args = { "-f", getClass().getResource("build.xml").getPath(), target }; - antMain.startAnt(args, System.getProperties(), getClass().getClassLoader()); - } - finally { - System.setOut(stdout); - System.setErr(stderr); - - log.info(new String(memout.toByteArray())); - } - } - - private void checkDeployment() { - List<Deployment> deployments = repositoryService.createDeploymentQuery().list(); - assertEquals(1, deployments.size()); - repositoryService.deleteDeploymentCascade(deployments.get(0).getId()); - } -} Copied: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java (from rev 6439, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java) =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java (rev 0) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java 2010-07-01 08:54:37 UTC (rev 6447) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.ant; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.List; + +import org.apache.tools.ant.Main; + +import org.jbpm.api.Deployment; +import org.jbpm.test.JbpmTestCase; + +/** + * @author Alejandro Guizar + */ +public class DeployTaskTest extends JbpmTestCase { + + public void testDeployXml() { + runTarget("deploy-xml"); + checkDeployment("valid.jpdl.xml"); + } + + public void testDeployZip() { + runTarget("deploy-zip"); + checkDeployment("valid.zip"); + } + + public void testDeployBar() { + runTarget("deploy-bar"); + checkDeployment("valid.bar"); + } + + private void runTarget(String target) { + PrintStream stdout = System.out; + PrintStream stderr = System.err; + + ByteArrayOutputStream memout = new ByteArrayOutputStream(); + PrintStream prnout = new PrintStream(memout); + + try { + System.setOut(prnout); + System.setErr(prnout); + + Main antMain = new Main() { + + protected void exit(int exitCode) { + // prevent ant from terminating the VM + } + }; + String[] args = { "-f", getClass().getResource("build.xml").getPath(), target }; + antMain.startAnt(args, System.getProperties(), getClass().getClassLoader()); + } + finally { + System.setOut(stdout); + System.setErr(stderr); + } + + log.info(memout.toString()); + } + + private void checkDeployment(String deploymentName) { + List<Deployment> deployments = repositoryService.createDeploymentQuery().list(); + assertEquals(1, deployments.size()); + + Deployment deployment = deployments.get(0); + assertEquals(deploymentName, deployment.getName()); + repositoryService.deleteDeploymentCascade(deployment.getId()); + } +} Copied: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant (from rev 6438, jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant) Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml 2010-06-28 23:26:55 UTC (rev 6438) +++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<project name="test-ant"> - <target name="init"> - <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" /> - </target> - - <target name="deploy-xml" depends="init"> - <jbpm-deploy file="valid.jpdl.xml" /> - </target> - - <target name="deploy-zip" depends="init"> - <jbpm-deploy file="valid.zip" /> - </target> - - <target name="deploy-bar" depends="init"> - <jbpm-deploy file="valid.bar" /> - </target> -</project> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml (from rev 6439, jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<project name="test-ant"> + <target name="init"> + <dirname file="${ant.file}" property="base.dir" /> + <echo>base directory: ${base.dir}</echo> + <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" /> + </target> + + <target name="deploy-xml" depends="init"> + <jbpm-deploy file="${base.dir}/valid.jpdl.xml" /> + </target> + + <target name="deploy-zip" depends="init"> + <jbpm-deploy file="${base.dir}/valid.zip" /> + </target> + + <target name="deploy-bar" depends="init"> + <jbpm-deploy file="${base.dir}/valid.bar" /> + </target> +</project> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java 2010-07-01 08:54:37 UTC (rev 6447) @@ -34,7 +34,6 @@ import org.jbpm.api.task.Task; import org.jbpm.pvm.internal.model.ScopeInstanceImpl; - /** handles all expression resolving * * @author Tom Baeyens @@ -43,12 +42,12 @@ private static final long serialVersionUID = 1L; - public static final String LANGUAGE_UEL = "uel"; - public static final String LANGUAGE_UEL_METHOD = "uel-method"; - public static final String LANGUAGE_UEL_VALUE = "uel-value"; + private static final String LANGUAGE_UEL = "uel"; + public static final String LANGUAGE_UEL_METHOD = LANGUAGE_UEL + "-method"; + public static final String LANGUAGE_UEL_VALUE = LANGUAGE_UEL + "-value"; - private static ExpressionFactory expressionFactory = null; - private static ELContext elContext = null; + private static ExpressionFactory expressionFactory; + private static ELContext elContext; public static Expression create(String expressionText, String language) { // if there is an expr specified Modified: jbpm4/trunk/modules/test-cactus/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-cactus/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,15 +1,13 @@ <?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"> @@ -60,30 +58,6 @@ <filtering>true</filtering> </testResource> </testResources> - - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>delete.previous.generated.files</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <delete> - <fileset dir="."> - <include name="src/test/java/org/jbpm/test/AllIntegrationTests.java*" /> - </fileset> - </delete> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> <profiles> @@ -235,9 +209,8 @@ <id>runtest</id> <dependencies> <dependency> - <groupId>apache-httpclient</groupId> + <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.1</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -271,6 +244,7 @@ <scope>runtime</scope> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -284,38 +258,33 @@ </goals> <configuration> <tasks> - <property name="test_classpath" refid="maven.test.classpath" /> - <echo message="${test_classpath}" /> - <delete> - <fileset dir="."> - <include name="src/test/java/org/jbpm/test/AllIntegrationTests.java*" /> - </fileset> - </delete> - <java classname="org.jbpm.cactustool.CactusTestGenerator"> - <classpath path="${test_classpath}" /> - <arg line="src/test/java ../examples/src/test/java ../test-db/src/test/java" /> + <echo>Bind address: ${bind.address}</echo> + <java classname="org.jbpm.cactustool.CactusTestGenerator" classpathref="maven.test.classpath"> + <arg file="${project.build.testSourceDirectory}" /> + <arg file="${basedir}/../examples/src/test/java" /> + <arg file="${basedir}/../test-db/src/test/java" /> </java> </tasks> </configuration> </execution> + <execution> <id>remove-generated-cactus-test</id> - <phase>package</phase> + <phase>clean</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> <delete> - <fileset dir="."> - <include name="src/test/java/org/jbpm/test/AllIntegrationTests.java*" /> - </fileset> + <fileset dir="src/test/java" includes="org/jbpm/test/AllIntegrationTests.java" /> </delete> </tasks> </configuration> </execution> </executions> </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -328,5 +297,4 @@ </build> </profile> </profiles> - </project> Property changes on: jbpm4/trunk/modules/test-cactus/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Modified: jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1 +1 @@ -cactus.contextURL=http\://@jboss.bind.address@\:8080/jbpm-test-webapp +cactus.contextURL=http\://${bind.address}\:8080/jbpm-test-webapp Modified: jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,3 +1,3 @@ java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory java.naming.factory.url.pkgs=org.jboss.naming\:org.jnp.interfaces -java.naming.provider.url=jnp\://@jboss.bind.address@\:1099 +java.naming.provider.url=jnp\://${bind.address}\:1099 Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-db/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -66,11 +66,6 @@ <artifactId>spring</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,140 +1,147 @@ <?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"> + + + + + + - <modelVersion>4.0.0</modelVersion> + - <name>jBPM 4 - Test Enterprise Suite</name> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-enterprise-suite</artifactId> - <packaging>jar</packaging> +<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"> -  - <parent> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm</artifactId> - <version>4.4-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> - <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-enterprise-ejb</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cactus</groupId> - <artifactId>cactus.core</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> + <name>jBPM 4 - Test Enterprise Suite</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-enterprise-suite</artifactId> + <packaging>jar</packaging> - <profiles> +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> - <profile> - <id>enterprise</id> - <properties> - <skipTests>true</skipTests> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>generate-test-jar</id> - <phase>package</phase> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <excludes> - <exclude>jbpm-test-destinations-service.xml</exclude> - <exclude>cactus.properties</exclude> - <exclude>META-INF/*</exclude> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy.libs</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>aspectj</groupId> - <artifactId>aspectjrt</artifactId> - </artifactItem> - <artifactItem> - <groupId>cactus</groupId> - <artifactId>cactus.core</artifactId> - </artifactItem> - <artifactItem> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-enterprise-ejb</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cactus</groupId> + <artifactId>cactus.core</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> - <profile> - <id>runtest</id> - <dependencies> - <dependency> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>cactus</groupId> - <artifactId>cactus.core</artifactId> - </dependency> - <dependency> - <groupId>aspectj</groupId> - <artifactId>aspectjrt</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + </build> - </profiles> + <profiles> + <profile> + <id>enterprise</id> + <properties> + <skipTests>true</skipTests> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>generate-test-jar</id> + <phase>package</phase> + <goals> + <goal>test-jar</goal> + </goals> + <configuration> + <excludes> + <exclude>jbpm-test-destinations-service.xml</exclude> + <exclude>cactus.properties</exclude> + <exclude>META-INF/*</exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy.libs</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </artifactItem> + <artifactItem> + <groupId>cactus</groupId> + <artifactId>cactus.core</artifactId> + </artifactItem> + <artifactItem> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>runtest</id> + <dependencies> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>cactus</groupId> + <artifactId>cactus.core</artifactId> + </dependency> + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> </project> Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2010-07-01 08:54:37 UTC (rev 6447) @@ -27,7 +27,6 @@ import junit.framework.Test; import org.apache.cactus.ServletTestSuite; -import org.jbpm.pvm.internal.tx.JtaTransaction; import org.jbpm.test.JbpmTestCase; public class QueueTextMessageTest extends JbpmTestCase { Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1 +1 @@ -cactus.contextURL=http://localhost:8080/jbpm-test-webapp +cactus.contextURL=http://${bind.address}:8080/jbpm-test-webapp Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/pom.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -50,6 +50,7 @@ <beanshell.version>2.0b5</beanshell.version> <cactus.version>1.8.1</cactus.version> <cdi.version>1.0</cdi.version> + <commons.httpclient.version>3.1</commons.httpclient.version> <drools.version>5.0.1</drools.version> <errai.version>1.1-M1</errai.version> <freemarker.version>2.3.15</freemarker.version> @@ -248,6 +249,11 @@ <version>${cdi.version}</version> </dependency> <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${commons.httpclient.version}</version> + </dependency> + <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> <version>${drools.version}</version> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/qa/build.xml 2010-07-01 08:54:37 UTC (rev 6447) @@ -8,11 +8,12 @@ <fail message="property jbpm.parent.dir must be specified" unless="jbpm.parent.dir" />  - <property name="database" value="hsqldb" /> + <property name="database" value="hsqldb" /> <property name="identity.component" value="jbpm-built-in" /> <property name="jbpm.version" value="4.4-SNAPSHOT" /> - <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />  - <property name="jboss.version" value="5.0.0.GA" /> +  + <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> + <property name="jboss.version" value="5.1.0.GA" /> <property name="jboss.distro.dir" value="${jbpm.home}/downloads" /> <property name="jboss.parent.dir" value="${jbpm.home}" /> <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> @@ -23,6 +24,8 @@ <property name="tomcat.parent.dir" value="${jbpm.home}" /> <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> + <property name="mail.cfg" value="testsuite" /> +  <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> <property name="jbpm.distro.dir" value="../modules/distro/target" /> @@ -35,13 +38,11 @@ <equals arg1="${database}" arg2="oracle" /> </condition> - <echo message="database.......... ${database}" /> <echo message="jbpm.version...... ${jbpm.version}" /> <echo message="jbpm.home......... ${jbpm.home}" /> <echo message="jbpm.distro.path.. ${jbpm.distro.path}" /> -    Modified: jbpm4/trunk/qa/hudson-jbpm4-cfg.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-07-01 08:54:37 UTC (rev 6447) @@ -3,5 +3,6 @@ # runs the configuration test suite mvn -U -Pdistro clean install -cd modules/test-cfg -mvn -Dmaven.test.failure.ignore=true clean test + +mvn -f modules/test-cfg/pom.xml -Dmaven.test.failure.ignore=true \ + clean test Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-07-01 08:54:37 UTC (rev 6447) @@ -2,16 +2,20 @@ # # runs the jboss integration test suite -MAVEN_OPTS="-Xmx512M -Djboss.bind.address=$JBOSS_BINDADDR" -ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \ --Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.bind.address=$JBOSS_BINDADDR \ --Dhsql.bind.address=$JBOSS_BINDADDR" +# Give tests a max memory amount of at least 256 MB +TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'` +MAX_MEM=`expr $TOTAL_MEM / 4` +[ $MAX_MEM -lt 256 ] && MAX_MEM=256 +MAX_MEM="$MAX_MEM"m +export MAVEN_OPTS="-Xmx$MAX_MEM -Dbind.address=$JBOSS_BINDADDR" +export ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \ + -Djboss.distro.dir=$SOURCE_REPO/jboss -Dbind.address=$JBOSS_BINDADDR" + mvn -U -Pdistro,enterprise clean install ant -f qa/build.xml testsuite.enterprise.setup -cd modules/test-enterprise/test-enterprise-suite -mvn -Pruntest test -cd ../../.. +mvn -f modules/test-enterprise/test-enterprise-suite/pom.xml -Pruntest \ + -Dmaven.test.failure.ignore=true clean test ant -f qa/build.xml testsuite.enterprise.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-07-01 08:54:37 UTC (rev 6447) @@ -2,20 +2,20 @@ # # runs the jboss integration test suite -MAVEN_OPTS="-Xmx512M -Djboss.bind.address=$JBOSS_BINDADDR" -ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \ --Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.bind.address=$JBOSS_BINDADDR \ --Dhsql.bind.address=$JBOSS_BINDADDR" +# Give tests a max memory amount of at least 256 MB +TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'` +MAX_MEM=`expr $TOTAL_MEM / 4` +[ $MAX_MEM -lt 256 ] && MAX_MEM=256 +MAX_MEM="$MAX_MEM"m +export MAVEN_OPTS="-Xmx$MAX_MEM -Dbind.address=$JBOSS_BINDADDR" -# just in case the previous run didnt complete ok, we stop jboss -ant -f modules/distro/src/main/files/install/build.xml reinstall.jboss -ant -f modules/distro/src/main/files/install/build.xml stop.jboss +export ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \ + -Djboss.distro.dir=$SOURCE_REPO/jboss -Dbind.address=$JBOSS_BINDADDR" mvn -U -Pdistro,integration clean install ant -f qa/build.xml testsuite.jboss.setup -cd modules/test-cactus -mvn -Pruntest test -cd ../.. +mvn -f modules/test-cactus/pom.xml -Pruntest \ + -Dmaven.test.failure.ignore=true clean test ant -f qa/build.xml testsuite.jboss.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,10 +1,10 @@ #!/bin/sh # -# runs the jboss integration test suite +# runs the tomcat integration test suite -MAVEN_OPTS="-Xmx512M -Dtomcat.bind.address=$TOMCAT_BINDADDR" -ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss \ --Dtomcat.distro.dir=tomcat.downloads -Dtomcat.bind.address=$TOMCAT_BINDADDR" +MAVEN_OPTS="-Xmx512M -Dbind.address=$TOMCAT_BINDADDR" +ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dtomcat.distro.dir=tomcat.downloads \ +-Dbind.address=$TOMCAT_BINDADDR" mvn -U -Pdistro,integration clean install ant -f qa/build.xml reinstall.jbpm Modified: jbpm4/trunk/qa/jdbc/hsqldb.properties =================================================================== --- jbpm4/trunk/qa/jdbc/hsqldb.properties 2010-06-30 20:45:31 UTC (rev 6446) +++ jbpm4/trunk/qa/jdbc/hsqldb.properties 2010-07-01 08:54:37 UTC (rev 6447) @@ -1,4 +1,4 @@ jdbc.driver=org.hsqldb.jdbcDriver -jdbc.url=jdbc\:hsqldb\:hsql\://${hsql.bind.address}\:1701 +jdbc.url=jdbc\:hsqldb\:hsql\://${bind.address}\:1701 jdbc.username=sa jdbc.password=

13 years, 12 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits July 2010