JBoss JBPM SVN: r2013 - in jbpm3/trunk/hudson: hudson-home/jobs/jBPM-Matrix and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 05:16:59 -0400 (Tue, 26 Aug 2008)
New Revision: 2013
Added:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
Modified:
jbpm3/trunk/hudson/build.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-AS-4.2.2/config.xml
Log:
Extract command.sh
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-08-26 08:58:22 UTC (rev 2012)
+++ jbpm3/trunk/hudson/build.xml 2008-08-26 09:16:59 UTC (rev 2013)
@@ -118,6 +118,7 @@
<copy todir="${hudson.home}" overwrite="true">
<fileset dir="${hudson.dir}/hudson-home">
<include name="jobs/*/config.xml"/>
+ <include name="jobs/*/command.sh"/>
<include name="*.xml"/>
</fileset>
<filterset>
Added: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh (rev 0)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-08-26 09:16:59 UTC (rev 2013)
@@ -0,0 +1,92 @@
+WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
+JBOSSDIR=$WORKSPACE/$CONTAINER
+DISTRODIR=$JBPMDIR/modules/distribution/target
+JBOSS_BINDADDR=(a)jboss.bind.address@
+
+case "$CONTAINER" in
+ jboss421*)
+ JBOSS_BUILD=(a)hudson.jboss421.build@
+ JBOSS_SVN=(a)hudson.jboss421.url@
+ JBOSS_REV=(a)hudson.jboss421.rev@
+ ;;
+
+ jboss422*)
+ JBOSS_BUILD=(a)hudson.jboss422.build@
+ JBOSS_SVN=(a)hudson.jboss422.url@
+ JBOSS_REV=(a)hudson.jboss422.rev@
+ ;;
+esac
+
+JBOSS_INSTANCE=$JBOSSDIR/build/output/$JBOSS_BUILD
+ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_INSTANCE"
+
+#
+# checkout with an explicit version
+#
+if [ -d "$JBOSSDIR" ]; then
+ cd $WORKSPACE
+ svn up -r$JBOSS_REV $CONTAINER
+else
+ cd $WORKSPACE
+ svn co -r$JBOSS_REV $JBOSS_SVN $CONTAINER
+fi
+
+#
+# build jboss
+#
+cd $JBOSSDIR
+rm -rf thirdparty/*
+./build/build.sh clean main
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/$JBOSS_BUILD ]; then
+ echo "Cannot find expected build: $JBOSS_BUILD"
+ exit 1
+fi
+
+#
+# Build distro
+#
+cd $JBPMDIR
+cp profiles.xml.example profiles.xml
+mvn -U -Pdistro clean package
+
+#
+# Deploy distro
+#
+java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-install.jar $DISTRODIR/resources/auto-install-$CONTAINER.xml
+
+#
+# start jbossas
+#
+$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn test 2>&1 | tee $WORKSPACE/tests.log
+# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
+
+#
+# stop jbossas
+#
+$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
Property changes on: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-08-26 08:58:22 UTC (rev 2012)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-08-26 09:16:59 UTC (rev 2013)
@@ -2,6 +2,10 @@
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
<description></description>
+ <logRotator>
+ <daysToKeep>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.security.AuthorizationMatrixProperty/>
@@ -46,102 +50,26 @@
<hudson.tasks.Shell>
<command>
WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
CONTAINER=$container
DATABASE=$database
-JBPMDIR=$WORKSPACE/jbpm
-JBOSSDIR=$WORKSPACE/$CONTAINER
-DISTRODIR=$JBPMDIR/modules/distribution/target
-JBOSS_BINDADDR=(a)jboss.bind.address@
-case "$CONTAINER" in
- jboss421*)
- JBOSS_BUILD=(a)hudson.jboss421.build@
- JBOSS_SVN=(a)hudson.jboss421.url@
- JBOSS_REV=(a)hudson.jboss421.rev@
- ;;
-
- jboss422*)
- JBOSS_BUILD=(a)hudson.jboss422.build@
- JBOSS_SVN=(a)hudson.jboss422.url@
- JBOSS_REV=(a)hudson.jboss422.rev@
- ;;
-esac
-
-JBOSS_INSTANCE=$JBOSSDIR/build/output/$JBOSS_BUILD
-ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_INSTANCE"
-
#
-# checkout with an explicit version
-#
-if [ -d "$JBOSSDIR" ]; then
- cd $WORKSPACE
- svn up -r$JBOSS_REV $CONTAINER
-else
- cd $WORKSPACE
- svn co -r$JBOSS_REV $JBOSS_SVN $CONTAINER
-fi
-
+# call command.sh
#
-# build jboss
-#
-cd $JBOSSDIR
-rm -rf thirdparty/*
-./build/build.sh clean main
-
-#
-# Verify build
-#
-if [ ! -d ./build/output/$JBOSS_BUILD ]; then
- echo "Cannot find expected build: $JBOSS_BUILD"
- exit 1
-fi
-
-#
-# Build distro
-#
-cd $JBPMDIR
-cp profiles.xml.example profiles.xml
-mvn -U -Pdistro clean package
-
-#
-# Deploy distro
-#
-java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-install.jar $DISTRODIR/resources/auto-install-$CONTAINER.xml
-
-#
-# start jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn test 2>&1 | tee $WORKSPACE/tests.log
-# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
-
-#
-# stop jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+$JBPMDIR/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
</command>
</hudson.tasks.Shell>
</builders>
- <publishers/>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
<buildWrappers/>
</matrix-project>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-AS-4.2.2/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-AS-4.2.2/config.xml 2008-08-26 08:58:22 UTC (rev 2012)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-AS-4.2.2/config.xml 2008-08-26 09:16:59 UTC (rev 2013)
@@ -3,67 +3,15 @@
<builders class="vector">
<hudson.tasks.Shell>
<command>
-#
-# Module settings
-#
-MODULE=jBPM3-AS-4.2.2
-
WORKSPACE=`pwd`
-JBOSS_TARGET=jboss422
JBPMDIR=$WORKSPACE/jbpm
-DISTRODIR=$JBPMDIR/modules/distribution/target
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djboss422.home=$JBOSS_INSTANCE"
+CONTAINER=jboss422
+DATABASE=hypersonic
#
-# stop jbossas
+# call command.sh
#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $JBPMDIR
-cp profiles.xml.example profiles.xml
-mvn -U -Pdistro clean package
-
-#
-# Deploy distro
-#
-java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-install.jar $DISTRODIR/resources/auto-install-$JBOSS_TARGET.xml
-
-#
-# start jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn test 2>&1 | tee $WORKSPACE/tests.log
-# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+$JBPMDIR/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
</command>
</hudson.tasks.Shell>
</builders>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2012 - jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm.
by do-not-reply＠jboss.org
Author: porcherg
Date: 2008-08-26 04:58:22 -0400 (Tue, 26 Aug 2008)
New Revision: 2012
Modified:
jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml
Log:
change exception column mapping to text (JBPM-1685)
Modified: jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml 2008-08-26 08:50:10 UTC (rev 2011)
+++ jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml 2008-08-26 08:58:22 UTC (rev 2012)
@@ -18,7 +18,7 @@
<property name="isExclusive" column="ISEXCLUSIVE_" />
<property name="lockOwner" column="LOCKOWNER_" />
<property name="lockExpirationTime" column="LOCKEXPTIME_" />
- <property name="exception" column="EXCEPTION_" length="4000" />
+ <property name="exception" column="EXCEPTION_" type="text" />
<property name="retries" column="RETRIES_" />
<many-to-one name="processInstance"
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2011 - in jbpm3/trunk: modules/distribution and 5 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 04:50:10 -0400 (Tue, 26 Aug 2008)
New Revision: 2011
Added:
jbpm3/trunk/modules/distribution/docs/
jbpm3/trunk/modules/distribution/docs/images/
jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller1.png
jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller2.png
jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller3.png
jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller4.png
jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller5.png
jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller6.png
jbpm3/trunk/modules/jpdl/integration/src/main/java/
Removed:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss501.xml
Modified:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml
jbpm3/trunk/modules/jpdl/integration/
jbpm3/trunk/profiles.xml.example
Log:
Fix autoinstall
Added: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller1.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller2.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller3.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller4.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller5.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller6.png
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/distribution/docs/images/JBPMInstaller6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml 2008-08-26 08:28:35 UTC (rev 2010)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml 2008-08-26 08:50:10 UTC (rev 2011)
@@ -5,11 +5,11 @@
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.TreePacksPanel>
<pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Console" index="1" selected="true" />
- <pack name="jBPM3 BAM Console" index="2" selected="true" />
+ <pack name="jBPM3 Config" index="1" selected="true" />
+ <pack name="jBPM3 Console" index="2" selected="true" />
<pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.SummaryPanel />
<com.izforge.izpack.panels.InstallPanel />
<com.izforge.izpack.panels.FinishPanel />
-</AutomatedInstallation>
+</AutomatedInstallation>
\ No newline at end of file
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml 2008-08-26 08:28:35 UTC (rev 2010)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml 2008-08-26 08:50:10 UTC (rev 2011)
@@ -5,8 +5,8 @@
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.TreePacksPanel>
<pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Console" index="1" selected="true" />
- <pack name="jBPM3 BAM Console" index="2" selected="true" />
+ <pack name="jBPM3 Config" index="1" selected="true" />
+ <pack name="jBPM3 Console" index="2" selected="true" />
<pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.SummaryPanel />
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml 2008-08-26 08:28:35 UTC (rev 2010)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml 2008-08-26 08:50:10 UTC (rev 2011)
@@ -1,15 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.TargetPanel>
- <installpath>@jboss500.home@</installpath>
- </com.izforge.izpack.panels.TargetPanel>
- <com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Console" index="1" selected="true" />
- <pack name="jBPM3 BAM Console" index="2" selected="true" />
- <pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
- </com.izforge.izpack.panels.TreePacksPanel>
- <com.izforge.izpack.panels.SummaryPanel />
- <com.izforge.izpack.panels.InstallPanel />
- <com.izforge.izpack.panels.FinishPanel />
-</AutomatedInstallation>
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss501.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss501.xml 2008-08-26 08:28:35 UTC (rev 2010)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss501.xml 2008-08-26 08:50:10 UTC (rev 2011)
@@ -1,15 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.TargetPanel>
- <installpath>@jboss501.home@</installpath>
- </com.izforge.izpack.panels.TargetPanel>
- <com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Console" index="1" selected="true" />
- <pack name="jBPM3 BAM Console" index="2" selected="true" />
- <pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
- </com.izforge.izpack.panels.TreePacksPanel>
- <com.izforge.izpack.panels.SummaryPanel />
- <com.izforge.izpack.panels.InstallPanel />
- <com.izforge.izpack.panels.FinishPanel />
-</AutomatedInstallation>
Property changes on: jbpm3/trunk/modules/jpdl/integration
___________________________________________________________________
Name: svn:ignore
- .settings
+ .settings
target
Modified: jbpm3/trunk/profiles.xml.example
===================================================================
--- jbpm3/trunk/profiles.xml.example 2008-08-26 08:28:35 UTC (rev 2010)
+++ jbpm3/trunk/profiles.xml.example 2008-08-26 08:50:10 UTC (rev 2011)
@@ -11,7 +11,7 @@
</property>
</activation>
<properties>
- <jboss422.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+ <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
</properties>
</profile>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2010 - in jbpm3/trunk/modules: jpdl/integration and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 04:28:35 -0400 (Tue, 26 Aug 2008)
New Revision: 2010
Modified:
jbpm3/trunk/modules/distribution/scripts/install-definition.xml
jbpm3/trunk/modules/jpdl/integration/pom.xml
Log:
Fix distro build
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-26 07:50:58 UTC (rev 2009)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-26 08:28:35 UTC (rev 2010)
@@ -56,7 +56,6 @@
<include name="jbpm-jbpm4jsf.jar"/>
<include name="jbpm-jpdl-core.jar"/>
<include name="jbpm-jpdl-identity.jar"/>
- <include name="jbpm-jpdl-integration.jar"/>
</fileset>
</pack>
@@ -76,12 +75,6 @@
<file src="@{deploy.artifacts.dir}/lib/jbpm-console.war" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm" />
</pack>
- <!-- jBPM BAM Console -->
- <pack name="jBPM3 BAM Console" required="no" installGroups="Main">
- <description>The jBPM BAM Console</description>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-bam-console.ear" targetdir="$INSTALL_PATH/server/(a){jboss.server.instance}/deploy/jbpm" />
- </pack>
-
<!-- jBPM Hypersonic Database -->
<pack name="jBPM3 Hypersonic Database Scripts" required="no" installGroups="Main">
<description>The Hypersonic Database Scripts</description>
Modified: jbpm3/trunk/modules/jpdl/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/pom.xml 2008-08-26 07:50:58 UTC (rev 2009)
+++ jbpm3/trunk/modules/jpdl/integration/pom.xml 2008-08-26 08:28:35 UTC (rev 2010)
@@ -15,7 +15,7 @@
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>JBoss jBPM - CTS Integration</name>
+ <name>JBoss jBPM - jPDL CTS Integration</name>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl-integration</artifactId>
<packaging>jar</packaging>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2009 - jbossbpm/spec/tags.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 03:50:58 -0400 (Tue, 26 Aug 2008)
New Revision: 2009
Removed:
jbossbpm/spec/tags/jbpm-api-1.0.0.Alpha1/
Log:
Release jboss-bpm-1.0.0.Alpha1
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2008 - jbossbpm/spec/tags.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 03:49:19 -0400 (Tue, 26 Aug 2008)
New Revision: 2008
Added:
jbossbpm/spec/tags/jboss-bpm-1.0.0.Alpha1/
Log:
Release jboss-bpm-1.0.0.Alpha1
Copied: jbossbpm/spec/tags/jboss-bpm-1.0.0.Alpha1 (from rev 2007, jbossbpm/spec/trunk)
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2007 - in jbpm3/trunk: hudson and 8 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 03:44:31 -0400 (Tue, 26 Aug 2008)
New Revision: 2007
Added:
jbpm3/trunk/hudson/.classpath
jbpm3/trunk/hudson/.project
jbpm3/trunk/modules/jpdl/integration/
jbpm3/trunk/modules/jpdl/integration/.classpath
jbpm3/trunk/modules/jpdl/integration/.project
jbpm3/trunk/modules/jpdl/integration/pom.xml
jbpm3/trunk/modules/jpdl/integration/src/
jbpm3/trunk/modules/jpdl/integration/src/main/
jbpm3/trunk/modules/jpdl/integration/src/main/resources/
jbpm3/trunk/modules/jpdl/integration/src/main/resources/jbpm-beans.xml
Removed:
jbpm3/trunk/hudson/hudson-home/jobs/AS-4.2.1/
jbpm3/trunk/hudson/hudson-home/jobs/AS-4.2.2/
jbpm3/trunk/hudson/hudson-home/jobs/AS-5.0.0/
jbpm3/trunk/hudson/hudson-home/jobs/AS-5.0.1/
jbpm3/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/
jbpm3/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-AS-4.2.2-JDK6/
Modified:
jbpm3/trunk/hudson/build.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/jpdl/pom.xml
jbpm3/trunk/pom.xml
Log:
Add CTS Integration
Added: jbpm3/trunk/hudson/.classpath
===================================================================
--- jbpm3/trunk/hudson/.classpath (rev 0)
+++ jbpm3/trunk/hudson/.classpath 2008-08-26 07:44:31 UTC (rev 2007)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target"/>
+</classpath>
Added: jbpm3/trunk/hudson/.project
===================================================================
--- jbpm3/trunk/hudson/.project (rev 0)
+++ jbpm3/trunk/hudson/.project 2008-08-26 07:44:31 UTC (rev 2007)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>hudson</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-08-26 07:31:18 UTC (rev 2006)
+++ jbpm3/trunk/hudson/build.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -117,7 +117,7 @@
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
<fileset dir="${hudson.dir}/hudson-home">
- <include name="jobs/jBPM-Matrix/config.xml"/>
+ <include name="jobs/*/config.xml"/>
<include name="*.xml"/>
</fileset>
<filterset>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-08-26 07:31:18 UTC (rev 2006)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -27,21 +27,17 @@
<name>container</name>
<values>
<string>jboss421</string>
- <string>jboss422</string>
</values>
</axis>
<axis>
<name>database</name>
<values>
<string>hypersonic</string>
- <string>mysql</string>
- <string>postgress</string>
</values>
</axis>
<axis>
<name>jdk</name>
<values>
- <string>jdk1.6</string>
<string>jdk1.5</string>
</values>
</axis>
@@ -53,7 +49,7 @@
CONTAINER=$container
DATABASE=$database
JBPMDIR=$WORKSPACE/jbpm
-JBOSSDIR=$WORKSPACE/jboss
+JBOSSDIR=$WORKSPACE/$CONTAINER
DISTRODIR=$JBPMDIR/modules/distribution/target
JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -71,18 +67,18 @@
;;
esac
-JBOSS_INSTANCE=$JBOSSDIR/build/output/$JBOSS_REV
+JBOSS_INSTANCE=$JBOSSDIR/build/output/$JBOSS_BUILD
ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_INSTANCE"
#
# checkout with an explicit version
#
if [ -d "$JBOSSDIR" ]; then
- cd $JBOSSDIR
- svn up .
+ cd $WORKSPACE
+ svn up -r$JBOSS_REV $CONTAINER
else
cd $WORKSPACE
- svn co -r$JBOSS_REV $JBOSS_SVN jboss
+ svn co -r$JBOSS_REV $JBOSS_SVN $CONTAINER
fi
#
@@ -95,8 +91,8 @@
#
# Verify build
#
-if [ ! -d ./build/output/$JBOSS_REV ]; then
- echo "Cannot find expected build: $JBOSS_REV"
+if [ ! -d ./build/output/$JBOSS_BUILD ]; then
+ echo "Cannot find expected build: $JBOSS_BUILD"
exit 1
fi
@@ -135,7 +131,7 @@
#
mvn test 2>&1 | tee $WORKSPACE/tests.log
# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
#
# stop jbossas
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-08-26 07:31:18 UTC (rev 2006)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -16,7 +16,6 @@
<unpack>false</unpack>
<excludes>
<exclude>*:war:*</exclude>
- <exclude>*:ear:*</exclude>
<exclude>*:login</exclude>
<exclude>*:config</exclude>
</excludes>
@@ -31,15 +30,6 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>lib/jbpm-bam-console.ear</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>org.jboss.jbpm:jbpm-bam-console-ear:ear</include>
- </includes>
- </dependencySet>
- <dependencySet>
<outputDirectory>lib/jbpm-login.sar</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
Property changes on: jbpm3/trunk/modules/jpdl/integration
___________________________________________________________________
Name: svn:ignore
+ .settings
Added: jbpm3/trunk/modules/jpdl/integration/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/.classpath (rev 0)
+++ jbpm3/trunk/modules/jpdl/integration/.classpath 2008-08-26 07:44:31 UTC (rev 2007)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: jbpm3/trunk/modules/jpdl/integration/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/.project (rev 0)
+++ jbpm3/trunk/modules/jpdl/integration/.project 2008-08-26 07:44:31 UTC (rev 2007)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-jpdl-integration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: jbpm3/trunk/modules/jpdl/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/pom.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/integration/pom.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<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>JBoss jBPM - CTS Integration</name>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jpdl-integration</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>jboss-bpm-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>jboss-bpm-ri</artifactId>
+ <version>${jboss.bpm.api.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>jboss-bpm-testsuite</artifactId>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jpdl-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-jpdl-core</artifactId>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/test</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>jboss-bpm-testsuite</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>src/test</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/jpdl/integration/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Property changes on: jbpm3/trunk/modules/jpdl/integration/src
___________________________________________________________________
Name: svn:ignore
+ test
Added: jbpm3/trunk/modules/jpdl/integration/src/main/resources/jbpm-beans.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/src/main/resources/jbpm-beans.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/integration/src/main/resources/jbpm-beans.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -0,0 +1,46 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The KernelLocator -->
+ <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
+
+ <!-- The Builder Factories -->
+ <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
+ <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
+
+ <!-- The ProcessEngine -->
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
+ <property name="processManager"><inject bean="jBPMProcessManager"/></property>
+ <property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
+ <property name="signalManager"><inject bean="jBPMSignalManager"/></property>
+ <property name="messageManager"><inject bean="jBPMMessageManager"/></property>
+ </bean>
+
+ <!-- The Managers -->
+ <bean name="jBPMExecutionManager" class="org.jboss.bpm.ri.client.ExecutionManagerImpl"/>
+ <bean name="jBPMSignalManager" class="org.jboss.bpm.ri.client.SignalManagerImpl"/>
+ <bean name="jBPMMessageManager" class="org.jboss.bpm.ri.client.MessageManagerImpl"/>
+
+ <!-- The ProcessManager -->
+ <bean name="jBPMProcessManager" class="org.jboss.bpm.ri.client.ProcessManagerImpl">
+ <property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property>
+ <property name="dialectHandlers">
+ <map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
+ <entry><key>api10</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry>
+ <entry><key>stp</key><value><inject bean="jBPMDialectHandlerSTP"/></value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>
+ <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>
+
+ <!-- The DialectRegistry -->
+ <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
+ <property name="registry">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
+ <entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
+ </map>
+ </property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/jpdl/integration/src/main/resources/jbpm-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/pom.xml 2008-08-26 07:31:18 UTC (rev 2006)
+++ jbpm3/trunk/modules/jpdl/pom.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -33,6 +33,7 @@
<module>core</module>
<module>db</module>
<module>identity</module>
+ <module>integration</module>
<module>simulation</module>
<module>userguide</module>
</modules>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-08-26 07:31:18 UTC (rev 2006)
+++ jbpm3/trunk/pom.xml 2008-08-26 07:44:31 UTC (rev 2007)
@@ -86,8 +86,7 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
- <classifier>testsuite</classifier>
+ <artifactId>jboss-bpm-testsuite</artifactId>
<version>${jboss.bpm.api.version}</version>
<type>zip</type>
</dependency>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2006 - in jbossbpm/spec/trunk/modules: dialects/stp/src/test/resources and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-08-26 03:31:18 -0400 (Tue, 26 Aug 2008)
New Revision: 2006
Modified:
jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
Log:
Remove PropertyFactory
Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-26 06:18:19 UTC (rev 2005)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-26 07:31:18 UTC (rev 2006)
@@ -6,7 +6,6 @@
<!-- The Builder Factories -->
<bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
<bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
<bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
@@ -41,4 +40,4 @@
</property>
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-26 06:18:19 UTC (rev 2005)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-26 07:31:18 UTC (rev 2006)
@@ -6,7 +6,6 @@
<!-- The Builder Factories -->
<bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
<bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
<bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
@@ -41,4 +40,4 @@
</property>
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: jbossbpm/spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml 2008-08-26 06:18:19 UTC (rev 2005)
+++ jbossbpm/spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml 2008-08-26 07:31:18 UTC (rev 2006)
@@ -6,7 +6,6 @@
<!-- The Builder Factories -->
<bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
<bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
<bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
@@ -42,4 +41,4 @@
</property>
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-26 06:18:19 UTC (rev 2005)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-26 07:31:18 UTC (rev 2006)
@@ -6,7 +6,6 @@
<!-- The Builder Factories -->
<bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
<bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
<bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java 2008-08-26 06:18:19 UTC (rev 2005)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityOutputSetMarshallerTest.java 2008-08-26 07:31:18 UTC (rev 2006)
@@ -45,7 +45,7 @@
Process proc = super.getProcess();
String procXML = marshallProcess(proc);
- System.out.println(procXML);
+ // System.out.println(procXML);
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-26 06:18:19 UTC (rev 2005)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-26 07:31:18 UTC (rev 2006)
@@ -6,7 +6,6 @@
<!-- The Builder Factories -->
<bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.ri.model.impl.ProcessBuilderFactoryImpl"/>
<bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
- <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.ri.model.impl.PropertyBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
<bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
@@ -50,4 +49,4 @@
</property>
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2005 - in jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src: test/java/org/jbpm/job/executor and 1 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-08-26 02:18:19 -0400 (Tue, 26 Aug 2008)
New Revision: 2005
Added:
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobConcurrencyDbTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorDbTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TestCallback.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timer-on-timer.jpdl.xml
Removed:
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timerOnTimer.jpdl.xml
Modified:
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/resources/log4j.properties
Log:
[JBPM-1704] reduced duration of job executor tests
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/db/hibernate/HibernateHelper.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -119,16 +119,13 @@
Iterator iter = classMetadata.keySet().iterator();
while (iter.hasNext()) {
String entityName = (String) iter.next();
- log.debug("evicting entities "+entityName);
- Class entityClass = ClassLoaderUtil.loadClass(entityName);
- sessionFactory.evict(entityClass);
+ sessionFactory.evictEntity(entityName);
}
Map collectionMetadata = sessionFactory.getAllCollectionMetadata();
iter = collectionMetadata.keySet().iterator();
while (iter.hasNext()) {
String collectionName = (String) iter.next();
- log.debug("evicting collection "+collectionName);
sessionFactory.evictCollection(collectionName);
}
}
Deleted: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -1,238 +0,0 @@
-package org.jbpm.job.executor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
-import org.jbpm.graph.def.ActionHandler;
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.ProcessInstance;
-
-/**
- * test case for http://jira.jboss.com/jira/browse/JBPM-983
- */
-public class ConcurrencyTest extends TestCase {
-
- private static Log log = LogFactory.getLog(ConcurrencyTest.class);
-
- protected static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/jbpm.test.cfg.xml");
-
- protected void setUp() throws Exception {
- jbpmConfiguration.createSchema();
-
- JobExecutor jobExecutor = jbpmConfiguration.getJobExecutor();
- jobExecutor.setNbrOfThreads(5);
- jobExecutor.start();
-
- log.debug("");
- log.debug("### starting " + getName() + " ####################################################");
- }
-
- protected void tearDown() throws Exception {
- log.debug("### " + getName() + " done ####################################################");
- log.debug("");
-
- jbpmConfiguration.getJobExecutor().stop();
-
- jbpmConfiguration.dropSchema();
- }
-
- static String SUBPROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
- + "<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='simplesubtest'>"
- + "<start-state name='start-state1'>"
- + " <description>start of the process</description>"
- + " <transition name='start-to-check' to='fileCheck' />"
- + "</start-state>"
- + ""
- + "<node name='fileCheck' async='exclusive'>"
- + " <action name='action_filecheck' class='"
- + TestAction.class.getName()
- + "'>"
- + " </action>"
- + " <transition name='check-to-do' to='doWhatever'></transition>"
- + "</node>"
- + ""
- + "<node name='doWhatever' async='exclusive'>"
- + " <action name='action_do' class='"
- + TestAction.class.getName()
- + "'>"
- + " </action>"
- + " <transition name='check-to-end' to='end-state-success'></transition>"
- + "</node>"
- + ""
- + "<end-state name='end-state-success'>"
- + " <description>process finished normally</description>"
- + "</end-state>"
- + "</process-definition>";
-
- static String PROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
- + "<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='simpletest'>"
- + "<start-state name='start-state1'>"
- + " <description>start of the process</description>"
- + " <transition name='start-to-check' to='fileCheck' />"
- + "</start-state>"
- + ""
- + "<node name='fileCheck' async='true'>"
- + " <action name='action_check' class='"
- + TestAction.class.getName()
- + "'>"
- + " </action>"
- + " <transition name='check-to-fork' to='fork1'></transition>"
- + "</node>"
- + ""
- + "<fork name='fork1'>"
- + " <transition name='toNode1' to='node1'></transition>"
- + " <transition name='toNode2' to='node2'></transition>"
- + "</fork>"
- + ""
- + "<process-state name='node1' async='exclusive'>"
- + " <sub-process name='simplesubtest' />"
- + " <transition name='node1toJoin1' to='join1'></transition>"
- + "</process-state>"
- + ""
- + "<process-state name='node2' async='exclusive'>"
- + " <sub-process name='simplesubtest' />"
- + " <transition name='node2toJoin1' to='join1'></transition>"
- + "</process-state>"
- + ""
- + "<join name='join1'>"
- + " <transition name='joinToEnd' to='end-state-success'></transition>"
- + "</join>"
- + ""
- + "<end-state name='end-state-success'>"
- + " <description>process finished normally</description>"
- + "</end-state>"
- + "</process-definition>";
-
- public void testSimple() throws Exception {
- assertTrue(jbpmConfiguration.getJobExecutor().getNbrOfThreads() > 1);
-
- log.info("### TEST: deploy + start processes ###");
-
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(SUBPROCESS_XML));
- jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_XML));
- }
- finally {
- jbpmContext.close();
- }
-
- // create test properties
- Map testVariables = new HashMap();
- testVariables.put("test", "true");
-
- final int processCount = 10;
- long[] piIds = new long[processCount];
- for (int i = 0; i < processCount; i++) {
- log.info("#################### TEST: starting process " + i + " ####################");
-
- jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("simpletest");
- pi.getContextInstance().addVariables(testVariables);
- pi.signal();
- piIds[i] = pi.getId();
- }
- finally {
- jbpmContext.close();
- }
- }
-
- for (int i = 0; i < processCount; i++) {
- log.info("### TEST: wait for process completion ###");
-
- long piId = piIds[i];
- waitFor(piId);
-
- jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- ProcessInstance pi = jbpmContext.loadProcessInstance(piId);
- assertEquals("end-state-success", pi.getRootToken().getNode().getName());
- }
- finally {
- jbpmContext.close();
- }
-
- log.info("#################### TEST: finished ####################");
- }
- }
-
- protected void waitFor(final long piId) throws Exception {
- long startTime = System.currentTimeMillis();
- int SECONDS = 30;
-
- while (true) {
- if (System.currentTimeMillis() - startTime > SECONDS * 1000) {
- fail("Aborting after " + SECONDS + " seconds.");
- return;
- }
-
- log.info("waiting for workflow completion....");
- try {
- Thread.sleep(1000);
- }
- catch (InterruptedException e) {
- log.error("wait for workflow was interruputed", e);
- fail();
- }
-
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- if (jbpmContext.loadProcessInstance(piId).hasEnded())
- break;
- }
- finally {
- jbpmContext.close();
- }
- }
- }
-
- public static class TestAction implements ActionHandler {
-
- private static final long serialVersionUID = 1L;
-
- public void execute(ExecutionContext executionContext) throws Exception {
- String processName = executionContext.getProcessDefinition().getName()
- + ":"
- + executionContext.getProcessInstance().getId();
- String nodeName = executionContext.getToken().getNode().getName();
- String tokenName = executionContext.getToken().toString();
-
- log.info("ACTION (process="
- + processName
- + ",node="
- + nodeName
- + ",token="
- + tokenName
- + "): begin");
-
- for (int i = 0; i < 5; i++) {
- log.info("ACTION (process="
- + processName
- + ",node="
- + nodeName
- + ",token="
- + tokenName
- + "): working...");
- Thread.sleep(100);
- }
-
- log.info("ACTION (process="
- + processName
- + ",node="
- + nodeName
- + ",token="
- + tokenName
- + "): end");
-
- executionContext.leaveNode();
- }
- }
-}
Copied: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobConcurrencyDbTest.java (from rev 2004, jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java)
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobConcurrencyDbTest.java (rev 0)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobConcurrencyDbTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -0,0 +1,238 @@
+package org.jbpm.job.executor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * test case for http://jira.jboss.com/jira/browse/JBPM-983
+ */
+public class JobConcurrencyDbTest extends TestCase {
+
+ private static Log log = LogFactory.getLog(JobConcurrencyDbTest.class);
+
+ protected static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/jbpm.test.cfg.xml");
+
+ protected void setUp() throws Exception {
+ jbpmConfiguration.createSchema();
+
+ JobExecutor jobExecutor = jbpmConfiguration.getJobExecutor();
+ jobExecutor.setNbrOfThreads(5);
+ jobExecutor.start();
+
+ log.debug("");
+ log.debug("### starting " + getName() + " ####################################################");
+ }
+
+ protected void tearDown() throws Exception {
+ log.debug("### " + getName() + " done ####################################################");
+ log.debug("");
+
+ jbpmConfiguration.getJobExecutor().stop();
+
+ jbpmConfiguration.dropSchema();
+ }
+
+ static String SUBPROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
+ + "<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='subprocess'>"
+ + "<start-state name='start-state1'>"
+ + " <description>start of the process</description>"
+ + " <transition name='start-to-check' to='fileCheck' />"
+ + "</start-state>"
+ + ""
+ + "<node name='fileCheck' async='exclusive'>"
+ + " <action name='action_filecheck' class='"
+ + TestAction.class.getName()
+ + "'>"
+ + " </action>"
+ + " <transition name='check-to-do' to='doWhatever'></transition>"
+ + "</node>"
+ + ""
+ + "<node name='doWhatever' async='exclusive'>"
+ + " <action name='action_do' class='"
+ + TestAction.class.getName()
+ + "'>"
+ + " </action>"
+ + " <transition name='check-to-end' to='end-state-success'></transition>"
+ + "</node>"
+ + ""
+ + "<end-state name='end-state-success'>"
+ + " <description>process finished normally</description>"
+ + "</end-state>"
+ + "</process-definition>";
+
+ static String PROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
+ + "<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='superprocess'>"
+ + "<start-state name='start-state1'>"
+ + " <description>start of the process</description>"
+ + " <transition name='start-to-check' to='fileCheck' />"
+ + "</start-state>"
+ + ""
+ + "<node name='fileCheck' async='true'>"
+ + " <action name='action_check' class='"
+ + TestAction.class.getName()
+ + "'>"
+ + " </action>"
+ + " <transition name='check-to-fork' to='fork1'></transition>"
+ + "</node>"
+ + ""
+ + "<fork name='fork1'>"
+ + " <transition name='toNode1' to='node1'></transition>"
+ + " <transition name='toNode2' to='node2'></transition>"
+ + "</fork>"
+ + ""
+ + "<process-state name='node1' async='exclusive'>"
+ + " <sub-process name='subprocess' />"
+ + " <transition name='node1toJoin1' to='join1'></transition>"
+ + "</process-state>"
+ + ""
+ + "<process-state name='node2' async='exclusive'>"
+ + " <sub-process name='subprocess' />"
+ + " <transition name='node2toJoin1' to='join1'></transition>"
+ + "</process-state>"
+ + ""
+ + "<join name='join1'>"
+ + " <transition name='joinToEnd' to='end-state-success'></transition>"
+ + "</join>"
+ + ""
+ + "<end-state name='end-state-success'>"
+ + " <description>process finished normally</description>"
+ + "</end-state>"
+ + "</process-definition>";
+
+ public void testConcurrentJobs() throws Exception {
+ assertTrue(jbpmConfiguration.getJobExecutor().getNbrOfThreads() > 1);
+
+ log.info("### TEST: deploy + start processes ###");
+
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(SUBPROCESS_XML));
+ jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_XML));
+ }
+ finally {
+ jbpmContext.close();
+ }
+
+ // create test properties
+ Map testVariables = new HashMap();
+ testVariables.put("test", "true");
+
+ final int processCount = 10;
+ long[] piIds = new long[processCount];
+ for (int i = 0; i < processCount; i++) {
+ log.info("#################### TEST: starting process " + i + " ####################");
+
+ jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("superprocess");
+ pi.getContextInstance().addVariables(testVariables);
+ pi.signal();
+ piIds[i] = pi.getId();
+ }
+ finally {
+ jbpmContext.close();
+ }
+ }
+
+ for (int i = 0; i < processCount; i++) {
+ log.info("### TEST: wait for process completion ###");
+
+ long piId = piIds[i];
+ waitFor(piId);
+
+ jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ ProcessInstance pi = jbpmContext.loadProcessInstance(piId);
+ assertEquals("end-state-success", pi.getRootToken().getNode().getName());
+ }
+ finally {
+ jbpmContext.close();
+ }
+
+ log.info("#################### TEST: finished ####################");
+ }
+ }
+
+ protected void waitFor(long piId) throws Exception {
+ final int endTimeout = 30;
+ long startTime = System.currentTimeMillis();
+
+ while (true) {
+ if (System.currentTimeMillis() - startTime > endTimeout * 1000) {
+ fail("Aborting after " + endTimeout + " seconds.");
+ return;
+ }
+
+ log.info("waiting for workflow completion....");
+ try {
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e) {
+ log.error("wait for workflow was interruputed", e);
+ fail();
+ }
+
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ if (jbpmContext.loadProcessInstance(piId).hasEnded())
+ break;
+ }
+ finally {
+ jbpmContext.close();
+ }
+ }
+ }
+
+ public static class TestAction implements ActionHandler {
+
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ExecutionContext executionContext) throws Exception {
+ String processName = executionContext.getProcessDefinition().getName()
+ + ":"
+ + executionContext.getProcessInstance().getId();
+ String nodeName = executionContext.getToken().getNode().getName();
+ String tokenName = executionContext.getToken().toString();
+
+ log.info("ACTION (process="
+ + processName
+ + ",node="
+ + nodeName
+ + ",token="
+ + tokenName
+ + "): begin");
+
+ for (int i = 0; i < 5; i++) {
+ log.info("ACTION (process="
+ + processName
+ + ",node="
+ + nodeName
+ + ",token="
+ + tokenName
+ + "): working...");
+ Thread.sleep(100);
+ }
+
+ log.info("ACTION (process="
+ + processName
+ + ",node="
+ + nodeName
+ + ",token="
+ + tokenName
+ + "): end");
+
+ executionContext.leaveNode();
+ }
+ }
+}
Property changes on: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobConcurrencyDbTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -54,7 +54,7 @@
}
}
- public void testBulkJobs() {
+ public void testJobExecutor() {
jbpmConfiguration.createSchema();
deployProcess();
launchProcesses();
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -31,8 +31,8 @@
// $JUnit-BEGIN$
suite.addTestSuite(JobExecutorDbTest.class);
suite.addTestSuite(NoJobExecutorDbTest.class);
- suite.addTestSuite(MultiJobExecutorTest.class);
- suite.addTestSuite(ConcurrencyTest.class);
+ suite.addTestSuite(MultiJobExecutorDbTest.class);
+ suite.addTestSuite(JobConcurrencyDbTest.class);
suite.addTestSuite(TimerOnTimerDbTest.class);
// $JUnit-END$
return suite;
Copied: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorDbTest.java (from rev 2004, jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java)
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorDbTest.java (rev 0)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorDbTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -0,0 +1,135 @@
+package org.jbpm.job.executor;
+
+import java.sql.SQLException;
+
+import junit.framework.TestCase;
+
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.def.Event;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * Test case for JBPM-1072.
+ * @author Jiri Pechanec
+ * @author Alejandro Guizar
+ */
+public class MultiJobExecutorDbTest extends TestCase {
+
+ private static final int EXECUTOR_COUNT = 20;
+ public static final String PROCESS_NAME = "TestProcess";
+
+ private JobExecutor[] executors = new JobExecutor[EXECUTOR_COUNT];
+
+ private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+
+ public static final String PROCESS_DEFINITION = "<?xml version='1.0' encoding='UTF-8'?>"
+ + "<process-definition name='" + PROCESS_NAME + "'>"
+ + "<event type='process-end'>"
+ + "<action expression='#{testCallback.processEnd}' />"
+ + "</event>"
+ + "<start-state name='start-state1'>"
+ + "<transition to='Service 1'></transition>"
+ + "</start-state>"
+ + "<node name='Service 1'>"
+ + "<action class='"
+ + SimpleAction.class.getName()
+ + "' />"
+ + "<transition to='Service 2' />"
+ + "</node>"
+ + "<node name='Service 2' async='true'>"
+ + "<action class='"
+ + SimpleAction2.class.getName()
+ + "' />"
+ + "<transition to='end-state1' />"
+ + "</node>"
+ + "<end-state name='end-state1' />"
+ + "</process-definition>";
+
+ protected void setUp() throws SQLException {
+ jbpmConfiguration.createSchema();
+
+ // deploy process definition
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_DEFINITION));
+ }
+ finally {
+ jbpmContext.close();
+ }
+ }
+
+ public void testMultipleJobExecutors() {
+ // start job executors
+ for (int i = 0; i < executors.length; i++) {
+ executors[i] = (JobExecutor) JbpmConfiguration.Configs.getObjectFactory().createObject(
+ "jbpm.job.executor");
+ executors[i].setName("JbpmJobExecutor/" + (i + 1));
+ executors[i].start();
+ }
+
+ // kick off process instance
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate(PROCESS_NAME);
+ processInstance.getContextInstance().setVariable("testCallback", new TestCallback());
+ processInstance.signal();
+ }
+ finally {
+ jbpmContext.close();
+ }
+
+ // wait for process end
+ TestCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
+
+ // stop job executors
+ for (int i = executors.length - 1; i >= 0; i--) {
+ try {
+ executors[i].stopAndJoin();
+ }
+ catch (InterruptedException e) {
+ // continue to next executor
+ }
+ }
+
+ assertEquals(1, SimpleAction2.getExecutionCount());
+ }
+
+ protected void tearDown() {
+ jbpmConfiguration.dropSchema();
+ }
+
+ public static class SimpleAction implements ActionHandler {
+
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ExecutionContext exeContext) throws Exception {
+ System.out.println("Action 1");
+ exeContext.leaveNode();
+ }
+
+ }
+
+ public static class SimpleAction2 implements ActionHandler {
+
+ private static int executionCount = 0;
+
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ExecutionContext exeContext) throws Exception {
+ System.out.println("Action 2: " + incrementCount());
+ exeContext.leaveNode();
+ }
+
+ private static synchronized int incrementCount() {
+ return ++executionCount;
+ }
+
+ public static synchronized int getExecutionCount() {
+ return executionCount;
+ }
+ }
+}
Property changes on: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorDbTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -1,163 +0,0 @@
-package org.jbpm.job.executor;
-
-import java.sql.SQLException;
-
-import junit.framework.TestCase;
-
-import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
-import org.jbpm.command.CommandService;
-import org.jbpm.command.SignalCommand;
-import org.jbpm.command.StartProcessInstanceCommand;
-import org.jbpm.command.impl.CommandServiceImpl;
-import org.jbpm.graph.def.ActionHandler;
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.ProcessInstance;
-
-/**
- * Test case for JBPM-1072.
- * @author Jiri Pechanec
- * @author Alejandro Guizar
- */
-public class MultiJobExecutorTest extends TestCase {
-
- private static final int EXECUTOR_COUNT = 20;
- public static final String PROCESS_NAME = "TestProcess";
-
- private JobExecutor[] executors = new JobExecutor[EXECUTOR_COUNT];
-
- private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
- private static CommandService commandService = new CommandServiceImpl(jbpmConfiguration);
-
- public static final String PROCESS_DEFINITION = "<?xml version='1.0' encoding='UTF-8'?>"
- + "<process-definition xmlns='' name='TestProcess'>"
- + "<event type='process-end'>"
- + "<action class='"
- + EndAction.class.getName()
- + "' />"
- + "</event>"
- + "<start-state name='start-state1'>"
- + "<transition to='Service 1'></transition>"
- + "</start-state>"
- + "<node name='Service 1'>"
- + "<action class='"
- + SimpleAction.class.getName()
- + "' />"
- + "<transition to='Service 2' />"
- + "</node>"
- + "<node name='Service 2' async='true'>"
- + "<action class='"
- + SimpleAction2.class.getName()
- + "' />"
- + "<transition to='end-state1' />"
- + "</node>"
- + "<end-state name='end-state1' />"
- + "</process-definition>";
-
- protected void setUp() throws SQLException {
- jbpmConfiguration.createSchema();
-
- // deploy process definition
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_DEFINITION));
- System.out.println("Isolation " + jbpmContext.getConnection().getTransactionIsolation());
- }
- finally {
- jbpmContext.close();
- }
- }
-
- public void testMultipleExecutors() {
- // start job executors
- for (int i = 0; i < executors.length; i++) {
- executors[i] = (JobExecutor) JbpmConfiguration.Configs.getObjectFactory().createObject(
- "jbpm.job.executor");
- executors[i].setName("JbpmJobExecutor/" + (i + 1));
- executors[i].start();
- }
-
- // kick off process instance
- StartProcessInstanceCommand startCommand = new StartProcessInstanceCommand();
- startCommand.setProcessName(PROCESS_NAME);
- ProcessInstance pi = (ProcessInstance) commandService.execute(startCommand);
-
- // signal service 1
- SignalCommand signalCommand = new SignalCommand();
- signalCommand.setTokenId(pi.getRootToken().getId());
- commandService.execute(signalCommand);
-
- // wait for process end
- EndAction.waitFor();
-
- // stop job executors
- for (int i = executors.length - 1; i >= 0; i--) {
- try {
- executors[i].stopAndJoin();
- }
- catch (InterruptedException e) {
- // continue to next executor
- }
- }
-
- assertEquals(1, SimpleAction2.getExecutionCount());
- }
-
- protected void tearDown() {
- jbpmConfiguration.dropSchema();
- }
-
- public static class SimpleAction implements ActionHandler {
-
- private static final long serialVersionUID = -9065054081909009083L;
-
- public void execute(ExecutionContext ctx) throws Exception {
- System.out.println("Action 1");
- }
-
- }
-
- public static class SimpleAction2 implements ActionHandler {
-
- private static int executionCount = 0;
-
- private static final long serialVersionUID = -9065054081909009083L;
-
- public void execute(ExecutionContext ctx) throws Exception {
- System.out.println("Action 2: " + incrementCount());
- ctx.getNode().leave(ctx);
- }
-
- private static synchronized int incrementCount() {
- return ++executionCount;
- }
-
- public static synchronized int getExecutionCount() {
- return executionCount;
- }
- }
-
- public static class EndAction implements ActionHandler {
-
- private static final Object monitor = new Object();
-
- private static final long serialVersionUID = 1L;
-
- public void execute(ExecutionContext executionContext) throws Exception {
- synchronized (monitor) {
- monitor.notify();
- }
- }
-
- public static void waitFor() {
- try {
- synchronized (monitor) {
- monitor.wait(60000);
- }
- }
- catch (InterruptedException e) {
- }
- }
- }
-}
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/NoJobExecutorDbTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -25,6 +25,7 @@
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.configuration.ObjectFactory;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -51,10 +52,13 @@
jbpmConfiguration.dropSchema();
}
- public void testJobExecutorDoesNotExist() {
+ public void testNoJobExecutor() {
// check the job executor is properly nullified
- assertNull(jbpmContext.getObjectFactory().createObject("jbpm.job.executor"));
- // start and end a process instance, confirm no exception gets thrown
+ ObjectFactory objectFactory = jbpmContext.getObjectFactory();
+ assertTrue("expected object factory to have object jbpm.job.executor",
+ objectFactory.hasObject("jbpm.job.executor"));
+ assertNull(objectFactory.createObject("jbpm.job.executor"));
+ // start and end a process instance, no exception should be thrown
jbpmContext.deployProcessDefinition(new ProcessDefinition("Audit"));
ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("Audit");
processInstance.end();
Added: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TestCallback.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TestCallback.java (rev 0)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TestCallback.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -0,0 +1,105 @@
+/*
+ * 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.job.executor;
+
+import java.io.Serializable;
+
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.Event;
+
+public class TestCallback implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private static final Log log = LogFactory.getLog(TestCallback.class);
+
+ public void processStart() {
+ registerNotification(Event.EVENTTYPE_PROCESS_START);
+ }
+
+ public void processEnd() {
+ registerNotification(Event.EVENTTYPE_PROCESS_END);
+ }
+
+ public void nodeEnter() {
+ registerNotification(Event.EVENTTYPE_NODE_ENTER);
+ }
+
+ public void nodeLeave() {
+ registerNotification(Event.EVENTTYPE_NODE_LEAVE);
+ }
+
+ public void taskCreate() {
+ registerNotification(Event.EVENTTYPE_TASK_CREATE);
+ }
+
+ public void taskEnd() {
+ registerNotification(Event.EVENTTYPE_TASK_END);
+ }
+
+ public void timerCreate() {
+ registerNotification(Event.EVENTTYPE_TIMER_CREATE);
+ }
+
+ public void timer() {
+ registerNotification(Event.EVENTTYPE_TIMER);
+ }
+
+ private static void registerNotification(final String event) {
+ Synchronization notification = new Synchronization() {
+
+ public void beforeCompletion() {
+ // nothing to do here
+ }
+
+ public void afterCompletion(int status) {
+ if (status == Status.STATUS_COMMITTED) {
+ log.info("delivering " + event + " notification");
+ synchronized (event) {
+ event.notify();
+ }
+ }
+ }
+
+ };
+ JbpmContext.getCurrentJbpmContext()
+ .getSession()
+ .getTransaction()
+ .registerSynchronization(notification);
+ }
+
+ public static void waitForEvent(String event) {
+ synchronized (event) {
+ try {
+ event.wait(30000);
+ }
+ catch (InterruptedException e) {
+ // reassert interruption
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/TimerOnTimerDbTest.java 2008-08-26 06:18:19 UTC (rev 2005)
@@ -21,13 +21,6 @@
*/
package org.jbpm.job.executor;
-import java.io.Serializable;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
@@ -40,7 +33,7 @@
public class TimerOnTimerDbTest extends AbstractDbTestCase {
public void testTimerOnTimer() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/job/executor/timerOnTimer.jpdl.xml");
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/job/executor/timer-on-timer.jpdl.xml");
jbpmContext.deployProcessDefinition(processDefinition);
ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("timerTest");
@@ -68,77 +61,4 @@
stopJobExecutor();
}
}
-
- public static class TestCallback implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(TestCallback.class);
-
- public void processStart() {
- registerNotification(Event.EVENTTYPE_PROCESS_START);
- }
-
- public void processEnd() {
- registerNotification(Event.EVENTTYPE_PROCESS_END);
- }
-
- public void nodeEnter() {
- registerNotification(Event.EVENTTYPE_NODE_ENTER);
- }
-
- public void nodeLeave() {
- registerNotification(Event.EVENTTYPE_NODE_LEAVE);
- }
-
- public void taskCreate() {
- registerNotification(Event.EVENTTYPE_TASK_CREATE);
- }
-
- public void taskEnd() {
- registerNotification(Event.EVENTTYPE_TASK_END);
- }
-
- public void timerCreate() {
- registerNotification(Event.EVENTTYPE_TIMER_CREATE);
- }
-
- public void timer() {
- registerNotification(Event.EVENTTYPE_TIMER);
- }
-
- private static void registerNotification(final String event) {
- Synchronization notification = new Synchronization() {
-
- public void beforeCompletion() {
- // nothing to do here
- }
-
- public void afterCompletion(int status) {
- if (status == Status.STATUS_COMMITTED) {
- log.info("delivering " + event + " notification");
- synchronized (event) {
- event.notify();
- }
- }
- }
-
- };
- jbpmConfiguration.getCurrentJbpmContext()
- .getSession()
- .getTransaction()
- .registerSynchronization(notification);
- }
-
- public static void waitForEvent(String event) {
- synchronized (event) {
- try {
- event.wait(60000);
- }
- catch (InterruptedException e) {
- // reassert interruption
- Thread.currentThread().interrupt();
- }
- }
- }
- }
}
Copied: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timer-on-timer.jpdl.xml (from rev 2003, jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timerOnTimer.jpdl.xml)
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timer-on-timer.jpdl.xml (rev 0)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timer-on-timer.jpdl.xml 2008-08-26 06:18:19 UTC (rev 2005)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process-definition name="timerTest" xmlns="urn:jbpm.org:jpdl-3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
+
+ <event type="process-start">
+ <action expression="#{testCallback.processStart}"/>
+ </event>
+ <event type="process-end">
+ <action expression="#{testCallback.processEnd}"/>
+ </event>
+ <event type="node-enter">
+ <action expression="#{testCallback.nodeEnter}" />
+ </event>
+ <event type="node-leave">
+ <action expression="#{testCallback.nodeLeave}" />
+ </event>
+
+ <start-state name="start">
+ <transition name="doneStart" to="firstNode" />
+ </start-state>
+
+ <task-node name="firstNode" end-tasks="yes">
+ <task name="firstTask">
+ <assignment actor-id="admin" />
+ <timer duedate="1 second" transition="doneFirst" />
+ </task>
+ <transition name="doneFirst" to="secondNode" />
+ </task-node>
+
+ <task-node name="secondNode" end-tasks="yes">
+ <task name="secondTask">
+ <assignment actor-id="admin" />
+ <timer duedate="1 second" transition="doneSecond" />
+ </task>
+ <transition name="doneSecond" to="end" />
+ </task-node>
+
+ <end-state name="end" />
+
+</process-definition>
\ No newline at end of file
Property changes on: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timer-on-timer.jpdl.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timerOnTimer.jpdl.xml
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timerOnTimer.jpdl.xml 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/timerOnTimer.jpdl.xml 2008-08-26 06:18:19 UTC (rev 2005)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process-definition name="timerTest" xmlns="urn:jbpm.org:jpdl-3.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
-
- <event type="process-start">
- <action expression="#{testCallback.processStart}"/>
- </event>
- <event type="process-end">
- <action expression="#{testCallback.processEnd}"/>
- </event>
- <event type="node-enter">
- <action expression="#{testCallback.nodeEnter}" />
- </event>
- <event type="node-leave">
- <action expression="#{testCallback.nodeLeave}" />
- </event>
- <event type="task-create">
- <action expression="#{testCallback.taskCreate}" />
- </event>
- <event type="task-end">
- <action expression="#{testCallback.taskEnd}" />
- </event>
- <event type="timer-create">
- <action expression="#{testCallback.timerCreate}" />
- </event>
- <event type="timer">
- <action expression="#{testCallback.timer}"/>
- </event>
-
- <start-state name="start">
- <transition name="doneStart" to="firstNode" />
- </start-state>
-
- <task-node name="firstNode" end-tasks="yes">
- <task name="firstTask">
- <assignment actor-id="admin" />
- <timer duedate="1 second" transition="doneFirst" />
- </task>
- <transition name="doneFirst" to="secondNode" />
- </task-node>
-
- <task-node name="secondNode" end-tasks="yes">
- <task name="secondTask">
- <assignment actor-id="admin" />
- <timer duedate="1 second" transition="doneSecond" />
- </task>
- <transition name="doneSecond" to="end" />
- </task-node>
-
- <end-state name="end" />
-
-</process-definition>
\ No newline at end of file
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/resources/log4j.properties
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/resources/log4j.properties 2008-08-26 04:37:20 UTC (rev 2004)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/resources/log4j.properties 2008-08-26 06:18:19 UTC (rev 2005)
@@ -15,9 +15,9 @@
# hide optimistic locking failures
log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=FATAL
#Log all SQL DML statements as they are executed
-#log4j.logger.org.hibernate.SQL=TRACE
+log4j.logger.org.hibernate.SQL=DEBUG
#Log all JDBC parameters
-log4j.logger.org.hibernate.type=TRACE
+#log4j.logger.org.hibernate.type=TRACE
#Log all SQL DDL statements as they are executed
#log4j.logger.org.hibernate.tool.hbm2ddl=DEBUG
#Log the state of all entities (max 20 entities) associated with the session at flush time
17 years, 8 months
- 1
- 0
JBoss JBPM SVN: r2004 - in jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704: jpdl/jar/src/test/java/org/jbpm/job/executor and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-08-26 00:37:20 -0400 (Tue, 26 Aug 2008)
New Revision: 2004
Added:
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java
Modified:
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/.project
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java
jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java
Log:
[JBPM-1704] rehabilitated most job executor tests and hooked them to test suite
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/.project
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/.project 2008-08-26 01:11:36 UTC (rev 2003)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/.project 2008-08-26 04:37:20 UTC (rev 2004)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm.3_HEAD</name>
+ <name>jbpm.3_JBPM-1704</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java 2008-08-26 01:11:36 UTC (rev 2003)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/ConcurrencyTest.java 2008-08-26 04:37:20 UTC (rev 2004)
@@ -119,7 +119,6 @@
try {
jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(SUBPROCESS_XML));
jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_XML));
-
}
finally {
jbpmContext.close();
@@ -129,30 +128,33 @@
Map testVariables = new HashMap();
testVariables.put("test", "true");
- for (int i = 0; i < 10; i++) {
+ final int processCount = 10;
+ long[] piIds = new long[processCount];
+ for (int i = 0; i < processCount; i++) {
log.info("#################### TEST: starting process " + i + " ####################");
- ProcessInstance pi = null;
-
jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- pi = jbpmContext.newProcessInstance("simpletest");
+ ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("simpletest");
pi.getContextInstance().addVariables(testVariables);
- jbpmContext.save(pi);
pi.signal();
-
+ piIds[i] = pi.getId();
}
finally {
jbpmContext.close();
}
+ }
+
+ for (int i = 0; i < processCount; i++) {
log.info("### TEST: wait for process completion ###");
- waitFor(pi.getId());
+ long piId = piIds[i];
+ waitFor(piId);
jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- ProcessInstance pi2 = jbpmContext.getProcessInstance(pi.getId());
- assertEquals("end-state-success", pi2.getRootToken().getNode().getName());
+ ProcessInstance pi = jbpmContext.loadProcessInstance(piId);
+ assertEquals("end-state-success", pi.getRootToken().getNode().getName());
}
finally {
jbpmContext.close();
@@ -172,10 +174,9 @@
return;
}
- log.info("waiting for workflow completion...."); // + pi.getRootToken().getNode().getName()
- // );
+ log.info("waiting for workflow completion....");
try {
- Thread.sleep(5000);
+ Thread.sleep(1000);
}
catch (InterruptedException e) {
log.error("wait for workflow was interruputed", e);
@@ -184,7 +185,7 @@
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- if (jbpmContext.getProcessInstance(piId).hasEnded())
+ if (jbpmContext.loadProcessInstance(piId).hasEnded())
break;
}
finally {
@@ -213,7 +214,6 @@
+ "): begin");
for (int i = 0; i < 5; i++) {
- Thread.sleep(500);
log.info("ACTION (process="
+ processName
+ ",node="
@@ -221,7 +221,7 @@
+ ",token="
+ tokenName
+ "): working...");
- Thread.sleep(500);
+ Thread.sleep(100);
}
log.info("ACTION (process="
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2008-08-26 01:11:36 UTC (rev 2003)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2008-08-26 04:37:20 UTC (rev 2004)
@@ -22,7 +22,7 @@
public class JobExecutorDbTest extends TestCase {
static int nbrOfConcurrentProcessExecutions = 20;
- static int maxWaitTime = 20000;
+ static int maxWaitTime = 60000;
static Set collectedResults = Collections.synchronizedSet(new TreeSet());
protected static JbpmConfiguration jbpmConfiguration =
@@ -37,7 +37,7 @@
public static class AutomaticActivity implements ActionHandler {
private static final long serialVersionUID = 1L;
public void execute(ExecutionContext executionContext) throws Exception {
- String id = (String) Long.toString(executionContext.getProcessInstance().getId());
+ long id = executionContext.getProcessInstance().getId();
String nodeName = executionContext.getNode().getName();
collectedResults.add(id+nodeName);
executionContext.leaveNode();
@@ -47,7 +47,7 @@
public static class AsyncAction implements ActionHandler {
private static final long serialVersionUID = 1L;
public void execute(ExecutionContext executionContext) throws Exception {
- String id = (String) Long.toString(executionContext.getProcessInstance().getId());
+ long id = executionContext.getProcessInstance().getId();
Action action = executionContext.getAction();
String actionName = action.getName();
collectedResults.add(id+actionName);
Added: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java (rev 0)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorDbTests.java 2008-08-26 04:37:20 UTC (rev 2004)
@@ -0,0 +1,41 @@
+/*
+ * 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.job.executor;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class JobExecutorDbTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("org.jbpm.job.executor");
+ // $JUnit-BEGIN$
+ suite.addTestSuite(JobExecutorDbTest.class);
+ suite.addTestSuite(NoJobExecutorDbTest.class);
+ suite.addTestSuite(MultiJobExecutorTest.class);
+ suite.addTestSuite(ConcurrencyTest.class);
+ suite.addTestSuite(TimerOnTimerDbTest.class);
+ // $JUnit-END$
+ return suite;
+ }
+
+}
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java 2008-08-26 01:11:36 UTC (rev 2003)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java 2008-08-26 04:37:20 UTC (rev 2004)
@@ -24,16 +24,16 @@
static Set finishedProcesses = Collections.synchronizedSet(new HashSet());
long start;
-
- static {
- jbpmConfiguration.createSchema();
- }
protected void setUp() throws Exception {
- super.setUp();
+ jbpmConfiguration.createSchema();
start = System.currentTimeMillis();
}
-
+
+ protected void tearDown() throws Exception {
+ jbpmConfiguration.dropSchema();
+ }
+
private boolean timeIsUp(int maxWait) {
return System.currentTimeMillis() - start > maxWait;
}
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-08-26 01:11:36 UTC (rev 2003)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-08-26 04:37:20 UTC (rev 2004)
@@ -18,7 +18,7 @@
public class JobLoadSubProcessTest extends TestCase {
// TODO see JobLoadJoinTest, but instead of the joins, use a process with a sub process
- private static Log log = LogFactory.getLog(JobLoadJoinTest.class);
+ private static Log log = LogFactory.getLog(JobLoadSubProcessTest.class);
static Set finishedProcesses = Collections.synchronizedSet(new HashSet());
long start;
@@ -26,15 +26,15 @@
private static JbpmConfiguration jbpmConfiguration =
JbpmConfiguration.getInstance("org/jbpm/job/executor/loadtests.jbpm.cfg.xml");
- static {
- jbpmConfiguration.createSchema();
- }
-
protected void setUp() throws Exception {
- super.setUp();
+ jbpmConfiguration.createSchema();
start = System.currentTimeMillis();
}
-
+
+ protected void tearDown() throws Exception {
+ jbpmConfiguration.dropSchema();
+ }
+
private boolean timeIsUp(int maxWait) {
return System.currentTimeMillis() - start > maxWait;
}
Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java 2008-08-26 01:11:36 UTC (rev 2003)
+++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java 2008-08-26 04:37:20 UTC (rev 2004)
@@ -33,7 +33,7 @@
public static final String PROCESS_DEFINITION = "<?xml version='1.0' encoding='UTF-8'?>"
+ "<process-definition xmlns='' name='TestProcess'>"
+ "<event type='process-end'>"
- + "<action name='endAction' class='"
+ + "<action class='"
+ EndAction.class.getName()
+ "' />"
+ "</event>"
@@ -41,22 +41,18 @@
+ "<transition to='Service 1'></transition>"
+ "</start-state>"
+ "<node name='Service 1'>"
- + "<action name='esbAction' "
- + "class='"
+ + "<action class='"
+ SimpleAction.class.getName()
- + "'>"
- + "</action>"
- + "<transition to='Service 2'></transition>"
+ + "' />"
+ + "<transition to='Service 2' />"
+ "</node>"
+ "<node name='Service 2' async='true'>"
- + "<action name='esbAction' "
- + "class='"
+ + "<action class='"
+ SimpleAction2.class.getName()
- + "'>"
- + "</action>"
- + "<transition to='end-state1'></transition>"
+ + "' />"
+ + "<transition to='end-state1' />"
+ "</node>"
- + "<end-state name='end-state1'></end-state>"
+ + "<end-state name='end-state1' />"
+ "</process-definition>";
protected void setUp() throws SQLException {
17 years, 8 months
- 1
- 0