[jbpm-commits] JBoss JBPM SVN: r6449 - in jbpm4/trunk: modules/distro/src/main/files/install and 13 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jul 2 04:05:32 EDT 2010
Author: alex.guizar at 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 the right datasource configuration file and replace the jdbc properties with
the values in the jdbc/${database}.properties file -->
<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 @@
<!-- ### START JBOSS ################################################### -->
<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=@bind.address@
mail.smtp.port=2525
mail.from=noreply at 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">
-
+
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
-
+
<fail message="property jbpm.parent.dir must be specified" unless="jbpm.parent.dir" />
<!-- CONFIGURABLE PROPERTIES -->
@@ -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" />
-
<!-- DERIVED PROPERTIES -->
<property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
<property name="jbpm.distro.dir" value="../modules/distro/target" />
@@ -46,10 +45,9 @@
<!-- ####################################### -->
<!-- ### MAIN SETUP AND TEARDOWN TARGETS ### -->
<!-- ####################################### -->
-
+
<!-- DB SETUP -->
- <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 @@
<!-- ################ -->
<!-- TOMCAT SETUP -->
- <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 @@
<!-- to build the jbpm test webapp we start by copying the user webapp -->
<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>
<!-- customize the configuration for the jbpm-test-webapp -->
@@ -85,10 +82,12 @@
<!-- add examples.jar -->
<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" />
+
<!-- add junit.jar -->
- <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" />
<!-- add the cactus libs -->
<copy todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib">
@@ -96,7 +95,8 @@
</copy>
<!-- add the bsh lib -->
- <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" />
<!-- start tomcat -->
<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>
-
+
<!-- ################ -->
<!-- ### JBOSS ### -->
<!-- ################ -->
<!-- JBOSS SETUP -->
- <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>
<!-- JBOSS TEARDOWN -->
- <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>
<!-- JBOSS SETUP DEBUG -->
- <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>
<!-- JBOSS INTERNAL SETUP BASE -->
- <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 @@
<!-- to build the jbpm test webapp we start by copying the user webapp -->
<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>
<!-- customize the jbpm configuration for the testsuite -->
<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>
<!-- customize the configuration for the jbpm-test-webapp -->
<copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true">
<fileset dir="cactus.webapp.cfg" />
</copy>
-
+
<!-- delete the jbpm configuration files -->
<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" />
<!-- add examples.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" />
+
<!-- add junit.jar -->
- <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" />
<!-- add the cactus libs -->
<copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib">
@@ -186,7 +189,7 @@
<!-- ################# -->
<!-- ENTERPRISE SETUP -->
- <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 @@
<!-- ENTERPRISE TEARDOWN -->
<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">
<!-- create the test queue -->
<copy file="enterprise/jbpm-test-destinations-service.xml"
todir="${jboss.home}/server/default/deploy/jbpm-test" />
-
+
<!-- deploy the test ejbs -->
- <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 the test classes to the test web app -->
- <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>
-
<!-- ################ -->
<!-- ### UPGRADE ### -->
<!-- ################ -->
<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" />
-
+
<!-- install old jbpm version -->
<delete dir="${old.jbpm.home}" />
<unzip src="upgrade/target/jbpm-distro-${old.jbpm.version}.jar" dest="${jbpm.parent.dir}" />
-
+
<!-- copy the oracle driver jar -->
<antcall target="copy.oracle.driver" />
-
+
<!-- create jdbc properties files for PVM2 based on the originals -->
<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>
-
+
<!-- install the jbpm-test-upgrade lib -->
<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" />
<!-- create jbpm schema using the old jbpm distro -->
@@ -273,7 +275,7 @@
</condition>
<antcall target="create.jbpm.schema.in.jbpm.40" />
<antcall target="create.jbpm.schema.in.jbpm.41plus" />
-
+
<!-- start couple of processes using the old jbpm version -->
<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>
-
+
<!-- upgrade -->
<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" />
<!--property name="logging" value="debug" /-->
@@ -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 the PVM2 jdbc properties files in the old jbpm distro -->
<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>
-
<!-- ############################################ -->
<!-- ### REUSABLE TARGETS ### -->
<!-- ### These targets can be called directly ### -->
<!-- ############################################ -->
<!-- REINSTALL JBPM -->
- <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}" />
<!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory -->
- <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" />
<!-- overwrite the jdbc properties in the distro with those specified in the user specific properties -->
- <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 the oracle jar as it is not allowed to be part of our distro -->
- <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.jobexecutor.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 at 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 at jbpm.org
\ No newline at end of file
+mail.smtp.host=@bind.address@
+mail.smtp.port=2525
+mail.from=noreply at 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>
More information about the jbpm-commits
mailing list