Author: alex.guizar(a)jboss.com Date: 2010-06-12 22:38:39 -0400 (Sat, 12 Jun 2010) New Revision: 6409 Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/concurrency/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/multipleentries/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/simple/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/timer/ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml Removed: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/concurrency/GroupConcurrencyTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/multipleentries/MultipleEntriesTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/simple/GroupSimpleTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/timer/GroupTimerTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml Log: JBPM-2872: have test-db module employ standalone.testsuite.examples configuration restore original standalone.testsuite configuration fix typo in org.examples.group package Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2010-06-12 03:40:59 UTC (rev 6408) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2010-06-13 02:38:39 UTC (rev 6409) @@ -9,6 +9,4 @@ <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.mail.templates.xml" /> - </jbpm-configuration> Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2010-06-12 03:40:59 UTC (rev 6408) +++ jbpm4/trunk/modules/test-db/pom.xml 2010-06-13 02:38:39 UTC (rev 6409) @@ -134,7 +134,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" /> + <property name="tx" value="standalone.testsuite.examples" /> <property name="mail.cfg" value="testsuite" /> <property name="database" value="${database}" /> <property name="cfg.dest.dir" value="target/test-classes" /> Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/concurrency (from rev 6386, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency) Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/concurrency/GroupConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java 2010-06-01 08:29:00 UTC (rev 6386) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/concurrency/GroupConcurrencyTest.java 2010-06-13 02:38:39 UTC (rev 6409) @@ -19,7 +19,7 @@ * 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.examples.goup.concurrency; +package org.jbpm.examples.group.concurrency; import org.jbpm.api.ProcessInstance; import org.jbpm.test.JbpmTestCase; Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/multipleentries (from rev 6386, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries) Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/multipleentries/MultipleEntriesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java 2010-06-01 08:29:00 UTC (rev 6386) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/multipleentries/MultipleEntriesTest.java 2010-06-13 02:38:39 UTC (rev 6409) @@ -19,7 +19,7 @@ * 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.examples.goup.multipleentries; +package org.jbpm.examples.group.multipleentries; import java.util.HashMap; import java.util.Map; Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/simple (from rev 6386, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple) Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/simple/GroupSimpleTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java 2010-06-01 08:29:00 UTC (rev 6386) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/simple/GroupSimpleTest.java 2010-06-13 02:38:39 UTC (rev 6409) @@ -19,7 +19,7 @@ * 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.examples.goup.simple; +package org.jbpm.examples.group.simple; import org.jbpm.api.ProcessInstance; import org.jbpm.test.JbpmTestCase; Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/timer (from rev 6386, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer) Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/timer/GroupTimerTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java 2010-06-01 08:29:00 UTC (rev 6386) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/group/timer/GroupTimerTest.java 2010-06-13 02:38:39 UTC (rev 6409) @@ -19,7 +19,7 @@ * 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.examples.goup.timer; +package org.jbpm.examples.group.timer; import java.util.List; Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2010-06-12 03:40:59 UTC (rev 6408) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2010-06-13 02:38:39 UTC (rev 6409) @@ -8,7 +8,6 @@ <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> + <import resource="jbpm.mail.templates.examples.xml" /> - <import resource="jbpm.mail.templates.xml" /> - </jbpm-configuration> Copied: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml (from rev 6404, jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml) =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml 2010-06-13 02:38:39 UTC (rev 6409) @@ -0,0 +1,16 @@ +<?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" /> + <subject>rectify ${newspaper}</subject> + <text>${newspaper} ${date} ${details}</text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml 2010-06-12 03:40:59 UTC (rev 6408) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml 2010-06-13 02:38:39 UTC (rev 6409) @@ -1,16 +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" /> - <subject>rectify ${newspaper}</subject> - <text>${newspaper} ${date} ${details}</text> - </mail-template> - - </process-engine-context> - -</jbpm-configuration>