September 2010 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6660 - jbpm3/branches/jbpm-3.2-soa/ci.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-15 04:18:31 -0400 (Wed, 15 Sep 2010) New Revision: 6660 Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh Log: JBPM-2934 adapt shell scripts to new continuous integration directory Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-09-15 03:37:37 UTC (rev 6659) +++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-09-15 08:18:31 UTC (rev 6660) @@ -50,7 +50,7 @@ # Set up Maven export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -cp -u hudson/profiles.redhat.qa.xml profiles.xml +cp -u ci/profiles.redhat.qa.xml profiles.xml # Determine jBPM version mvn -s /dev/null -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt @@ -137,7 +137,7 @@ -u $MCAST_ADDR &> /dev/null & # Was it successfully started? -wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080 +wget --spider --retry-connrefused --tries=24 --waitretry=24 --no-verbose $MYTESTIP_1:8080 if [ $? -ne 0 ]; then tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S Modified: jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-09-15 03:37:37 UTC (rev 6659) +++ jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-09-15 08:18:31 UTC (rev 6660) @@ -22,7 +22,7 @@ # Set up Maven export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -cp -u hudson/profiles.redhat.qa.xml profiles.xml +cp -u ci/profiles.redhat.qa.xml profiles.xml # Build jBPM mvn -s /dev/null -Pdistro clean install

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6659 - in jbpm3/branches/jbpm-3.2-soa: ci and 12 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-14 23:37:37 -0400 (Tue, 14 Sep 2010) New Revision: 6659 Added: jbpm3/branches/jbpm-3.2-soa/ci/ jbpm3/branches/jbpm-3.2-soa/ci/container.sh jbpm3/branches/jbpm-3.2-soa/ci/hudson/ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-base/ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-base/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-db/ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-db/config.xml jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh jbpm3/branches/jbpm-3.2-soa/ci/tomcat/ Removed: jbpm3/branches/jbpm-3.2-soa/ci/apache-tomcat/ jbpm3/branches/jbpm-3.2-soa/ci/hudson-home/ jbpm3/branches/jbpm-3.2-soa/ci/hudson/container.sh jbpm3/branches/jbpm-3.2-soa/ci/hudson/standalone.sh jbpm3/branches/jbpm-3.2-soa/hudson/.project jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties jbpm3/branches/jbpm-3.2-soa/hudson/apache-tomcat/ jbpm3/branches/jbpm-3.2-soa/hudson/build.xml jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml Modified: jbpm3/branches/jbpm-3.2-soa/ci/ant.example.properties jbpm3/branches/jbpm-3.2-soa/ci/build.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss405/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss423/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss501/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss510/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk142/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk150/config.xml jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk160/config.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2934 reorganize continuous integration directory Copied: jbpm3/branches/jbpm-3.2-soa/ci (from rev 6647, jbpm3/branches/jbpm-3.2-soa/hudson) Modified: jbpm3/branches/jbpm-3.2-soa/ci/ant.example.properties =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/ant.example.properties 2010-09-15 03:37:37 UTC (rev 6659) @@ -36,7 +36,7 @@ #jboss510.zip=${download.path}/jboss-5.1.0.GA.zip # Local Hudson cache -hudson.version=1.369 +hudson.version=1.376 #hudson.war=${download.path}/hudson-${hudson.version}.war # Local Tomcat cache Modified: jbpm3/branches/jbpm-3.2-soa/ci/build.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/build.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -25,8 +25,8 @@ <target name="init-hudson" depends="init"> <echo message="hudson.base: ${hudson.base}" /> - <property name="hudson.tomcat" value="${hudson.base}/apache-tomcat" /> - <property name="hudson.home" value="${hudson.base}/hudson-home" /> + <property name="hudson.tomcat" value="${hudson.base}/tomcat" /> + <property name="hudson.home" value="${hudson.base}/home" /> <available file="${hudson.tomcat}" property="hudson.tomcat.available" /> @@ -41,7 +41,7 @@ <target name="init-thirdparty" depends="init-hudson"> <property name="thirdparty.dir" value="${target.dir}/thirdparty" /> <mkdir dir="${thirdparty.dir}" /> - <available property="tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip" /> + <available property="tomcat.available" file="${thirdparty.dir}/tomcat.zip" /> <available property="hudson.available" file="${thirdparty.dir}/hudson.war" /> </target> @@ -63,7 +63,7 @@ <property name="tomcat.zip" value="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/apa..." /> <get src="${tomcat.zip}" - dest="${thirdparty.dir}/apache-tomcat.zip" + dest="${thirdparty.dir}/tomcat.zip" usetimestamp="true" verbose="true" /> </target> @@ -114,7 +114,7 @@ <target name="hudson-tomcat-setup" depends="get-thirdparty" unless="hudson.tomcat.available">  <mkdir dir="${hudson.base}" /> - <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.base}" /> + <unzip src="${thirdparty.dir}/tomcat.zip" dest="${hudson.base}" /> <move file="${hudson.base}/apache-tomcat-${tomcat.version}" tofile="${hudson.tomcat}" /> <chmod perm="+x"> <fileset dir="${hudson.tomcat}/bin" includes="*.sh" /> @@ -144,7 +144,7 @@  <copy todir="${hudson.tomcat}" overwrite="true"> - <fileset dir="${basedir}/apache-tomcat" /> + <fileset dir="${basedir}/tomcat" /> <filterset> <filtersfile file="${basedir}/ant.properties" /> </filterset> @@ -160,7 +160,7 @@  <copy todir="${hudson.home}" overwrite="true"> - <fileset dir="${basedir}/hudson-home"> + <fileset dir="${basedir}/hudson"> <include name="jobs/*/config.xml" /> <include name="command.sh" /> <include name="*.xml" /> Copied: jbpm3/branches/jbpm-3.2-soa/ci/container.sh (from rev 6647, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/container.sh (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-09-15 03:37:37 UTC (rev 6659) @@ -0,0 +1,155 @@ +#!/bin/sh +# +# Build the project with Maven and +# run the enterprise test suite inside a container +# +# Exported shell variables required: +# WORKSPACE work directory +# JAVA_HOME location of java development kit +# JAVA_15_HOME required if testing against java 1.4 only +# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql +# CONTAINER jboss405, jboss423, jboss501, jboss510 +# MYTESTIP_1 bind address +# MCAST_ADDR multicast address +# SOURCE_REPO location of jboss distributions + +# Determine JBoss AS version +case $CONTAINER in + jboss405) + JBOSS_VERSION=jboss-4.0.5.GA + ;; + jboss423) + JBOSS_VERSION=jboss-4.2.3.GA + ;; + jboss501) + JBOSS_VERSION=jboss-5.0.1.GA + ;; + jboss510) + JBOSS_VERSION=jboss-5.1.0.GA + ;; + *) + echo "ERROR: invalid container: $CONTAINER" + exit 1 + ;; +esac +JBOSS_HOME=$WORKSPACE/$JBOSS_VERSION +JBOSS_SERVER=all + +# Determine Java platform version +JAVA=$JAVA_HOME/bin/java +JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'` + +if [ $JAVA_VERSION = 1.4 ]; then + # Switch to JDK 1.5 for building and installing jBPM + ORIG_JAVA_HOME=$JAVA_HOME + JAVA=$JAVA_15_HOME/bin/java + export JAVA_HOME=$JAVA_15_HOME +else + ORIG_JAVA_HOME=$JAVA_HOME +fi + +# Set up Maven +export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" +cp -u hudson/profiles.redhat.qa.xml profiles.xml + +# Determine jBPM version +mvn -s /dev/null -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt +JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt` + +# Build jBPM +mvn -s /dev/null -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ + -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install +if [ $? -ne 0 ]; then + echo "ERROR: failed to build distro" + exit 1 +fi + +# Install JBoss AS +rm -rf $JBOSS_HOME +unzip -q -d $WORKSPACE $SOURCE_REPO/jboss/$JBOSS_VERSION.zip + +# Install jBPM +$JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \ + modules/distribution/target/classes/auto-install-template.xml +if [ $? -ne 0 ]; then + echo "ERROR: failed to install distro" + exit 1 +fi + +# Install proprietary JDBC drivers +mvn -s /dev/null -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve + +# DB2 driver +if [ "$DATABASE" = "db2" ]; then + DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` + DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar + if [ -f $DB2JCC_JAR ]; then + ln -s $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib + else + echo "WARNING: DB2 driver not found: $DB2JCC_JAR" + fi + DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar + if [ -f $DB2JCC_LICENSE ]; then + ln -s $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib + else + echo "WARNING: DB2 license not found: $DB2JCC_LICENSE" + fi +fi + +# MSSQL driver +if [ "$DATABASE" = "mssql" ]; then + MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` + MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar + if [ -f $MSJDBC_JAR ]; then + ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib + else + echo "WARNING: SQL Server driver not found: $MSJDBC_JAR" + fi +fi + +# Oracle driver +if [ "$DATABASE" = "oracle" ]; then + OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` + OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar + if [ -f $OJDBC_JAR ]; then + ln -s $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib + else + echo "WARNING: Oracle driver not found: $OJDBC_JAR" + fi +fi + +# Sybase driver +if [ "$DATABASE" = "sybase" ]; then + JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` + JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar + if [ -f $JCONNECT_JAR ]; then + ln -s $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib + else + echo "WARNING: Sybase driver not found: $JCONNECT_JAR" + fi +fi + +# Switch back to JDK 1.4 for running test suite +export JAVA_HOME=$ORIG_JAVA_HOME + +# Start JBoss AS +$JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g jbpm3-$CONTAINER-$DATABASE \ + -u $MCAST_ADDR &> /dev/null & + +# Was it successfully started? +wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080 +if [ $? -ne 0 ]; then + tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log + $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S + exit 1 +fi + +# Run enterprise test suite +mvn -f modules/enterprise/pom.xml -s /dev/null --fail-at-end -Djboss.bind.address=$MYTESTIP_1 \ + -Dsurefire.jvm.args="-Xms64m -Xmx256m" integration-test | tee $WORKSPACE/tests.log +grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt + +# Stop JBoss AS +$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S +ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE +ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE Copied: jbpm3/branches/jbpm-3.2-soa/ci/hudson (from rev 6647, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home) Deleted: jbpm3/branches/jbpm-3.2-soa/ci/hudson/container.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/container.sh 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,155 +0,0 @@ -#!/bin/sh -# -# Build the project with Maven and -# run the enterprise test suite inside a container -# -# Exported shell variables required: -# WORKSPACE work directory -# JAVA_HOME location of java development kit -# JAVA_15_HOME required if testing against java 1.4 only -# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql -# CONTAINER jboss405, jboss423, jboss501, jboss510 -# MYTESTIP_1 bind address -# MCAST_ADDR multicast address -# SOURCE_REPO location of jboss distributions - -# Determine JBoss AS version -case $CONTAINER in - jboss405) - JBOSS_VERSION=jboss-4.0.5.GA - ;; - jboss423) - JBOSS_VERSION=jboss-4.2.3.GA - ;; - jboss501) - JBOSS_VERSION=jboss-5.0.1.GA - ;; - jboss510) - JBOSS_VERSION=jboss-5.1.0.GA - ;; - *) - echo "ERROR: invalid container: $CONTAINER" - exit 1 - ;; -esac -JBOSS_HOME=$WORKSPACE/$JBOSS_VERSION -JBOSS_SERVER=all - -# Determine Java platform version -JAVA=$JAVA_HOME/bin/java -JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'` - -if [ $JAVA_VERSION = 1.4 ]; then - # Switch to JDK 1.5 for building and installing jBPM - ORIG_JAVA_HOME=$JAVA_HOME - JAVA=$JAVA_15_HOME/bin/java - export JAVA_HOME=$JAVA_15_HOME -else - ORIG_JAVA_HOME=$JAVA_HOME -fi - -# Set up Maven -export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -cp -u hudson/profiles.redhat.qa.xml profiles.xml - -# Determine jBPM version -mvn -s /dev/null -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt -JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt` - -# Build jBPM -mvn -s /dev/null -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ - -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install -if [ $? -ne 0 ]; then - echo "ERROR: failed to build distro" - exit 1 -fi - -# Install JBoss AS -rm -rf $JBOSS_HOME -unzip -q -d $WORKSPACE $SOURCE_REPO/jboss/$JBOSS_VERSION.zip - -# Install jBPM -$JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \ - modules/distribution/target/classes/auto-install-template.xml -if [ $? -ne 0 ]; then - echo "ERROR: failed to install distro" - exit 1 -fi - -# Install proprietary JDBC drivers -mvn -s /dev/null -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve - -# DB2 driver -if [ "$DATABASE" = "db2" ]; then - DB2JCC_VERSION=`grep com.ibm:db2jcc:jar $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` - DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar - if [ -f $DB2JCC_JAR ]; then - ln -s $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib - else - echo "WARNING: DB2 driver not found: $DB2JCC_JAR" - fi - DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar - if [ -f $DB2JCC_LICENSE ]; then - ln -s $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib - else - echo "WARNING: DB2 license not found: $DB2JCC_LICENSE" - fi -fi - -# MSSQL driver -if [ "$DATABASE" = "mssql" ]; then - MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` - MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar - if [ -f $MSJDBC_JAR ]; then - ln -s $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib - else - echo "WARNING: SQL Server driver not found: $MSJDBC_JAR" - fi -fi - -# Oracle driver -if [ "$DATABASE" = "oracle" ]; then - OJDBC_VERSION=`grep com.oracle:ojdbc14 $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` - OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar - if [ -f $OJDBC_JAR ]; then - ln -s $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib - else - echo "WARNING: Oracle driver not found: $OJDBC_JAR" - fi -fi - -# Sybase driver -if [ "$DATABASE" = "sybase" ]; then - JCONNECT_VERSION=`grep com.sybase:jconnect $WORKSPACE/dependencies.txt | awk -F : '{ print $4 }'` - JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar - if [ -f $JCONNECT_JAR ]; then - ln -s $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib - else - echo "WARNING: Sybase driver not found: $JCONNECT_JAR" - fi -fi - -# Switch back to JDK 1.4 for running test suite -export JAVA_HOME=$ORIG_JAVA_HOME - -# Start JBoss AS -$JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g jbpm3-$CONTAINER-$DATABASE \ - -u $MCAST_ADDR &> /dev/null & - -# Was it successfully started? -wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080 -if [ $? -ne 0 ]; then - tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log - $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S - exit 1 -fi - -# Run enterprise test suite -mvn -f modules/enterprise/pom.xml -s /dev/null --fail-at-end -Djboss.bind.address=$MYTESTIP_1 \ - -Dsurefire.jvm.args="-Xms64m -Xmx256m" integration-test | tee $WORKSPACE/tests.log -grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt - -# Stop JBoss AS -$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S -ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE -ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE Added: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-base/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-base/config.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-base/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -0,0 +1,66 @@ +<?xml version='1.0' encoding='UTF-8'?> +<matrix-project> + <description>Basic test suite that developers should run before checking in code</description> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>10</numToKeep> + </logRotator> + <properties> + <hudson.security.AuthorizationMatrixProperty /> + </properties> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote>@hudson.jbpm.url@</remote> + <local>jbpm</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> + </browser> + </scm> + <triggers> + <hudson.triggers.SCMTrigger> + <spec>30 6,12,18 * * *</spec> + </hudson.triggers.SCMTrigger> + </triggers> + <axes> + <axis> + <name>jdk</name> + <values> + <string>jdk1.5</string> + <string>jdk1.6</string> + </values> + </axis> + </axes> + <builders> + <hudson.tasks.Shell> + <command><![CDATA[ +export DATABASE=hsqldb + +cd jbpm +sh -x ci/standalone.sh +]]></command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.BuildTrigger> + <childProjects>jbpm3-db</childProjects> + <threshold> + <name>UNSTABLE</name> + <ordinal>1</ordinal> + <color>YELLOW</color> + </threshold> + </hudson.tasks.BuildTrigger> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers /> +</matrix-project> Property changes on: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-base/config.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-db/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-db/config.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-db/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -0,0 +1,63 @@ +<?xml version='1.0' encoding='UTF-8'?> +<matrix-project> + <description>Database integration test matrix</description> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>10</numToKeep> + </logRotator> + <properties> + <hudson.security.AuthorizationMatrixProperty /> + </properties> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote>@hudson.jbpm.url@</remote> + <local>jbpm</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> + </browser> + </scm> + <triggers /> + <axes> + <axis> + <name>DATABASE</name> + <values> + <string>db2</string> + <string>mysql</string> + <string>oracle</string> + <string>postgresql</string> + <string>sybase</string> + </values> + </axis> + </axes> + <builders> + <hudson.tasks.Shell> + <command><![CDATA[ +cd jbpm +sh -x ci/standalone.sh +]]></command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.BuildTrigger> + <childProjects>jbpm3-jboss405</childProjects> + <threshold> + <name>UNSTABLE</name> + <ordinal>1</ordinal> + <color>YELLOW</color> + </threshold> + </hudson.tasks.BuildTrigger> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers /> +</matrix-project> Property changes on: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-db/config.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss405/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss405/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,14 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> - <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test jBPM 3 on JBoss 4.0.5</description> + <description>JBoss AS 4.0.5 integration test matrix</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> - <hudson.security.AuthorizationMatrixProperty/> + <hudson.security.AuthorizationMatrixProperty /> </properties> <scm class="hudson.scm.SubversionSCM"> <locations> @@ -19,17 +17,11 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <triggers class="vector"> - <hudson.triggers.TimerTrigger> - <spec>5 22 * * *</spec> - </hudson.triggers.TimerTrigger> - </triggers> + <triggers /> <axes> <axis> <name>DATABASE</name> @@ -48,31 +40,28 @@ <command><![CDATA[ export JAVA_15_HOME=(a)java.home.jdk15@ export CONTAINER=jboss405 -export JBOSS_BINDADDR=(a)jboss.bind.address@ -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> - <publishers class="vector"> + <publishers> <hudson.tasks.junit.JUnitResultArchiver> <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.BuildTrigger> <childProjects>jbpm3-jboss423</childProjects> <threshold> - <name>SUCCESS</name> - <ordinal>0</ordinal> - <color>BLUE</color> + <name>UNSTABLE</name> + <ordinal>1</ordinal> + <color>YELLOW</color> </threshold> </hudson.tasks.BuildTrigger> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> </publishers> - <buildWrappers/> + <buildWrappers /> </matrix-project> Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss423/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss423/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,14 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> - <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test jBPM 3 on JBoss 4.2.3</description> + <description>JBoss AS 4.2.3 integration test matrix</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> - <hudson.security.AuthorizationMatrixProperty/> + <hudson.security.AuthorizationMatrixProperty /> </properties> <scm class="hudson.scm.SubversionSCM"> <locations> @@ -19,13 +17,11 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <triggers class="vector"/> + <triggers /> <axes> <axis> <name>DATABASE</name> @@ -43,31 +39,28 @@ <hudson.tasks.Shell> <command><![CDATA[ export CONTAINER=jboss423 -export JBOSS_BINDADDR=(a)jboss.bind.address@ -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> - <publishers class="vector"> + <publishers> <hudson.tasks.junit.JUnitResultArchiver> <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.BuildTrigger> <childProjects>jbpm3-jboss501</childProjects> <threshold> - <name>SUCCESS</name> - <ordinal>0</ordinal> - <color>BLUE</color> + <name>UNSTABLE</name> + <ordinal>1</ordinal> + <color>YELLOW</color> </threshold> </hudson.tasks.BuildTrigger> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> </publishers> - <buildWrappers/> + <buildWrappers /> </matrix-project> Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss501/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss501/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,14 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> - <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test jBPM 3 on JBoss 5.0.1</description> + <description>JBoss AS 5.0.1 integration test matrix</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> - <hudson.security.AuthorizationMatrixProperty/> + <hudson.security.AuthorizationMatrixProperty /> </properties> <scm class="hudson.scm.SubversionSCM"> <locations> @@ -19,13 +17,11 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <triggers class="vector"/> + <triggers /> <axes> <axis> <name>DATABASE</name> @@ -43,31 +39,28 @@ <hudson.tasks.Shell> <command><![CDATA[ export CONTAINER=jboss501 -export JBOSS_BINDADDR=(a)jboss.bind.address@ -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> - <publishers class="vector"> + <publishers> <hudson.tasks.junit.JUnitResultArchiver> <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.BuildTrigger> <childProjects>jbpm3-jboss510</childProjects> <threshold> - <name>SUCCESS</name> - <ordinal>0</ordinal> - <color>BLUE</color> + <name>UNSTABLE</name> + <ordinal>1</ordinal> + <color>YELLOW</color> </threshold> </hudson.tasks.BuildTrigger> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> </publishers> - <buildWrappers/> + <buildWrappers /> </matrix-project> Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss510/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jboss510/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,14 +1,12 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> - <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test jBPM 3 on JBoss 5.1.0</description> + <description>JBoss AS 5.1.0 integration test matrix</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> - <hudson.security.AuthorizationMatrixProperty/> + <hudson.security.AuthorizationMatrixProperty /> </properties> <scm class="hudson.scm.SubversionSCM"> <locations> @@ -19,13 +17,11 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <triggers class="vector"/> + <triggers /> <axes> <axis> <name>DATABASE</name> @@ -43,23 +39,20 @@ <hudson.tasks.Shell> <command><![CDATA[ export CONTAINER=jboss510 -export JBOSS_BINDADDR=(a)jboss.bind.address@ -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> - <publishers class="vector"> + <publishers> <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/> + <buildWrappers /> </matrix-project> Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk142/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk142/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,12 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?> <project> - <actions class="vector" /> - <description>Build and test jBPM 3 on JDK 1.4.2</description> + <description>Enterprise test suite with JDK 1.4.2, JBoss AS 4.0.5 and the specified target + database</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> <hudson.model.ParametersDefinitionProperty> <parameterDefinitions> @@ -27,24 +26,20 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> <jdk>jdk1.4</jdk> - <triggers class="vector" /> + <triggers /> <builders> <hudson.tasks.Shell> <command><![CDATA[ export JAVA_15_HOME=(a)java.home.jdk15@ export CONTAINER=jboss405 -export JBOSS_BINDADDR=(a)jboss.bind.address@ -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> @@ -53,8 +48,7 @@ <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients></recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <recipients>@hudson.mail.recipients@</recipients> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> </publishers> Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk150/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk150/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,12 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?> <project> - <actions class="vector" /> - <description>Build and test jBPM 3 on JDK 1.5.0</description> + <description>Enterprise test suite with JDK 1.5 and the specified target container and + database</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> <hudson.model.ParametersDefinitionProperty> <parameterDefinitions> @@ -31,22 +30,17 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> <jdk>jdk1.5</jdk> - <triggers class="vector" /> + <triggers /> <builders> <hudson.tasks.Shell> <command><![CDATA[ -export JBOSS_BINDADDR=(a)jboss.bind.address@ - -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> @@ -55,8 +49,7 @@ <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients></recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <recipients>@hudson.mail.recipients@</recipients> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> </publishers> Modified: jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk160/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/jobs/jbpm3-jdk160/config.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,12 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?> <project> - <actions class="vector" /> - <description>Build and test jBPM 3 on JDK 1.6.0</description> + <description>Enterprise test suite with JDK 1.6 and the specified target container and + database</description> <logRotator> <daysToKeep>-1</daysToKeep> <numToKeep>10</numToKeep> </logRotator> - <keepDependencies>false</keepDependencies> <properties> <hudson.model.ParametersDefinitionProperty> <parameterDefinitions> @@ -31,22 +30,17 @@ </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url> - <rootModule></rootModule> + <url>http://fisheye.jboss.org/browse/jbpm/</url> + <rootModule>jbpm3</rootModule> </browser> </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> <jdk>jdk1.6</jdk> - <triggers class="vector" /> + <triggers /> <builders> <hudson.tasks.Shell> <command><![CDATA[ -export JBOSS_BINDADDR=(a)jboss.bind.address@ - -# call continuous integration script cd jbpm -sh -x hudson/hudson-home/command.sh +sh -x ci/container.sh ]]></command> </hudson.tasks.Shell> </builders> @@ -55,8 +49,7 @@ <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients></recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <recipients>@hudson.mail.recipients@</recipients> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> </publishers> Deleted: jbpm3/branches/jbpm-3.2-soa/ci/hudson/standalone.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh 2010-09-02 14:53:46 UTC (rev 6647) +++ jbpm3/branches/jbpm-3.2-soa/ci/hudson/standalone.sh 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,37 +0,0 @@ -#!/bin/sh -# -# Build the project with Maven and -# run the standalone test suite -# -# Exported shell variables required: -# JAVA_HOME location of java development kit -# JAVA_15_HOME required if testing against java 1.4 only -# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql - -# Determine Java platform version -JAVA=$JAVA_HOME/bin/java -JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'` - -if [ $JAVA_VERSION = 1.4 ]; then - ORIG_JAVA_HOME=$JAVA_HOME - JAVA=$JAVA_15_HOME/bin/java - export JAVA_HOME=$JAVA_15_HOME -else - ORIG_JAVA_HOME=$JAVA_HOME -fi - -# Set up Maven -export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -cp -u hudson/profiles.redhat.qa.xml profiles.xml - -# Build jBPM -mvn -s /dev/null -Pdistro clean install -if [ $? -ne 0 ]; then - echo "ERROR: failed to build distro" - exit 1 -fi - -# Run standalone test suite -export JAVA_HOME=$ORIG_JAVA_HOME -mvn -s /dev/null --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ - -Dmaven.test.failure.ignore=true test Copied: jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh (from rev 6647, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-09-15 03:37:37 UTC (rev 6659) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Build the project with Maven and +# run the standalone test suite +# +# Exported shell variables required: +# JAVA_HOME location of java development kit +# JAVA_15_HOME required if testing against java 1.4 only +# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql + +# Determine Java platform version +JAVA=$JAVA_HOME/bin/java +JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'` + +if [ $JAVA_VERSION = 1.4 ]; then + ORIG_JAVA_HOME=$JAVA_HOME + JAVA=$JAVA_15_HOME/bin/java + export JAVA_HOME=$JAVA_15_HOME +else + ORIG_JAVA_HOME=$JAVA_HOME +fi + +# Set up Maven +export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" +cp -u hudson/profiles.redhat.qa.xml profiles.xml + +# Build jBPM +mvn -s /dev/null -Pdistro clean install +if [ $? -ne 0 ]; then + echo "ERROR: failed to build distro" + exit 1 +fi + +# Run standalone test suite +export JAVA_HOME=$ORIG_JAVA_HOME +mvn -s /dev/null --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ + -Dmaven.test.failure.ignore=true test Copied: jbpm3/branches/jbpm-3.2-soa/ci/tomcat (from rev 6647, jbpm3/branches/jbpm-3.2-soa/hudson/apache-tomcat) Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/.project =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/.project 2010-09-14 04:04:29 UTC (rev 6658) +++ jbpm3/branches/jbpm-3.2-soa/hudson/.project 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>hudson</name> - <comment></comment> - <projects> - </projects> -</projectDescription> Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-09-14 04:04:29 UTC (rev 6658) +++ jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,44 +0,0 @@ -# -# Build properties for Hudson CI -# - -# JBoss AS settings -jboss.bind.address=127.0.0.1 - -# JDK homes -java.home.jdk14=/etc/alternatives/java_sdk_1.4.2 -java.home.jdk15=/etc/alternatives/java_sdk_1.5.0 -java.home.jdk16=/etc/alternatives/java_sdk_1.6.0 - -# Hudson QA Environment -hudson.username=changeme -hudson.password=changeme - -hudson.base=/home/hudson/workspace - -hudson.host=localhost -hudson.admin.port=8105 -hudson.ajp.port=8109 -hudson.http.port=8180 - -hudson.maven.path=/usr/share/maven2 -hudson.maven.profile=$JBPMDIR/hudson/profiles.local.qa.xml - -hudson.admin.address=alex.guizar(a)jboss.com -hudson.mail.recipients= -hudson.smtp.host=localhost - -# Local JBoss AS cache -#download.path=file:/home/hudson/download -#jboss405.zip=${download.path}/jboss-4.0.5.GA.zip -#jboss423.zip=${download.path}/jboss-4.2.3.GA.zip -#jboss501.zip=${download.path}/jboss-5.0.1.GA.zip -#jboss510.zip=${download.path}/jboss-5.1.0.GA.zip - -# Local Hudson cache -hudson.version=1.369 -#hudson.war=${download.path}/hudson-${hudson.version}.war - -# Local Tomcat cache -tomcat.version=5.5.30 -#tomcat.zip=${download.path}/apache-tomcat-${tomcat.version}.zip \ No newline at end of file Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/build.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-09-14 04:04:29 UTC (rev 6658) +++ jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,218 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - -<project> - - <property name="target.dir" value="${basedir}/target" /> - -  - <target name="init"> -  - <available property="ant.properties.available" file="${basedir}/ant.properties" /> - <fail message="Cannot find ant.properties. Did you copy/edit ant.example.properties?" - unless="ant.properties.available" /> - <property file="${basedir}/ant.properties" /> - </target> - - <target name="init-hudson" depends="init"> - <echo message="hudson.base: ${hudson.base}" /> - - <property name="hudson.tomcat" value="${hudson.base}/apache-tomcat" /> - <property name="hudson.home" value="${hudson.base}/hudson-home" /> - - <available file="${hudson.tomcat}" property="hudson.tomcat.available" /> - - <property name="hudson.username.${hudson.username}" value="true" /> - <fail message="Cannot use default hudson username: ${hudson.username}" - if="hudson.username.changeme" /> - <property name="hudson.password.${hudson.password}" value="true" /> - <fail message="Cannot use default hudson password: ${hudson.password}" - if="hudson.password.changeme" /> - </target> - - <target name="init-thirdparty" depends="init-hudson"> - <property name="thirdparty.dir" value="${target.dir}/thirdparty" /> - <mkdir dir="${thirdparty.dir}" /> - <available property="tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip" /> - <available property="hudson.available" file="${thirdparty.dir}/hudson.war" /> - </target> - - <target name="init-jboss" depends="init"> - <property name="hudson.jboss" value="${hudson.base}/jboss" /> - <mkdir dir="${hudson.jboss}" /> - <available property="jboss405.available" file="${hudson.jboss}/jboss-4.0.5.GA.zip" /> - <available property="jboss423.available" file="${hudson.jboss}/jboss-4.2.3.GA.zip" /> - <available property="jboss501.available" file="${hudson.jboss}/jboss-5.0.1.GA.zip" /> - <available property="jboss510.available" file="${hudson.jboss}/jboss-5.1.0.GA.zip" /> - </target> - -  - <target name="get-thirdparty" - depends="get-tomcat,get-hudson,get-jboss405,get-jboss423,get-jboss501,get-jboss510" /> - <target name="get-tomcat" depends="init-thirdparty" unless="tomcat.available"> - <property name="tomcat.zip" - value="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/apa..." /> - <get src="${tomcat.zip}" - dest="${thirdparty.dir}/apache-tomcat.zip" - usetimestamp="true" - verbose="true" /> - </target> - <target name="get-hudson" depends="init-thirdparty" unless="hudson.available"> - <property name="hudson.war" - value="http://hudson-ci.org/download/war/${hudson.version}/hudson.war" /> - <get src="${hudson.war}" - dest="${thirdparty.dir}/hudson.war" - usetimestamp="true" - verbose="true" /> - </target> - <target name="get-jboss405" depends="init-jboss" unless="jboss405.available"> - <property name="jboss405.zip" - value="http://downloads.sourceforge.net/jboss/jboss-4.0.5.GA.zip" /> - <get src="${jboss405.zip}" - dest="${hudson.jboss}/jboss-4.0.5.GA.zip" - usetimestamp="true" - verbose="true" /> - </target> - <target name="get-jboss423" depends="init-jboss" unless="jboss423.available"> - <property name="jboss423.zip" - value="http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip" /> - <get src="${jboss423.zip}" - dest="${hudson.jboss}/jboss-4.2.3.GA.zip" - usetimestamp="true" - verbose="true" /> - </target> - <target name="get-jboss501" depends="init-jboss" unless="jboss501.available"> - <property name="jboss501.zip" - value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip" /> - <get src="${jboss501.zip}" - dest="${hudson.jboss}/jboss-5.0.1.GA.zip" - usetimestamp="true" - verbose="true" /> - </target> - <target name="get-jboss510" depends="init-jboss" unless="jboss510.available"> - <property name="jboss510.zip" - value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA-jdk6.zip" /> - <get src="${jboss510.zip}" - dest="${hudson.jboss}/jboss-5.1.0.GA.zip" - usetimestamp="true" - verbose="true" /> - </target> - -  - <target name="hudson-tomcat-setup" depends="get-thirdparty" unless="hudson.tomcat.available"> -  - <mkdir dir="${hudson.base}" /> - <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.base}" /> - <move file="${hudson.base}/apache-tomcat-${tomcat.version}" tofile="${hudson.tomcat}" /> - <chmod perm="+x"> - <fileset dir="${hudson.tomcat}/bin" includes="*.sh" /> - </chmod> - -  - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war" /> - </target> - -  - <target name="setup" - depends="init-hudson,hudson-tomcat-setup" - description="Set up the Hudson QA environment"> -  - <exec dir="${basedir}/.." - executable="svn" - failonerror="true" - output="${target.dir}/svn-info.xml"> - <arg value="info" /> - <arg value="--xml" /> - </exec> - <replace file="${target.dir}/svn-info.xml" token="https://svn" value="http://anonsvn" /> - <xmlproperty file="${target.dir}/svn-info.xml" /> - <property name="hudson.jbpm.url" value="${info.entry.url}" /> - -  - <copy todir="${hudson.tomcat}" overwrite="true"> - <fileset dir="${basedir}/apache-tomcat" /> - <filterset> - <filtersfile file="${basedir}/ant.properties" /> - </filterset> - </copy> - <replace file="${hudson.tomcat}/conf/server.xml"> - <replacefilter token="port="8005"" - value="port="${hudson.admin.port}"" /> - <replacefilter token="port="8009"" - value="port="${hudson.ajp.port}"" /> - <replacefilter token="port="8080"" - value="port="${hudson.http.port}"" /> - </replace> - -  - <copy todir="${hudson.home}" overwrite="true"> - <fileset dir="${basedir}/hudson-home"> - <include name="jobs/*/config.xml" /> - <include name="command.sh" /> - <include name="*.xml" /> - </fileset> - <filterset> -  - <filter token="hudson.jbpm.url" value="${hudson.jbpm.url}" /> - <filter token="hudson.home" value="${hudson.home}" /> - <filtersfile file="${basedir}/ant.properties" /> - </filterset> - </copy> - - <echo /> - <echo message="*************************************" /> - <echo message="* Hudson setup successfully *" /> - <echo message="* ant start *" /> - <echo message="*************************************" /> - </target> - - <target name="stop" depends="init-hudson" description="Stop the Hudson QA environment"> - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> - <arg line="stop" /> - </exec> - - <echo /> - <echo message="*************************************" /> - <echo message="* Hudson stopped successfully *" /> - <echo message="* ant start *" /> - <echo message="*************************************" /> - </target> - - <target name="start" depends="init-hudson" description="Start the Hudson QA environment"> - <property environment="env" /> - <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY" /> - - <exec executable="${hudson.tomcat}/bin/catalina.sh" - failonerror="true" - output="${target.dir}/hudson.log"> - <env key="CATALINA_OPTS" value="-Djava.awt.headless=true" /> - <env key="HUDSON_HOME" value="${hudson.home}" /> - <arg line="start" /> - </exec> - - <echo /> - <echo message="*************************************" /> - <echo message="* Hudson started successfully *" /> - <echo message="* http://${hudson.host}:${hudson.http.port}/hudson *" /> - <echo message="*************************************" /> - </target> - - <target name="clean" depends="init" description="Clean up"> - <delete dir="${target.dir}" failonerror="false" /> - <delete dir="${hudson.base}" failonerror="false" /> - </target> -</project> Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2010-09-14 04:04:29 UTC (rev 6658) +++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,65 +0,0 @@ -<?xml version="1.0"?> -<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> - <profiles> - <profile> - <id>qa-local</id> - - <properties> - <jdbc.db2.server>localhost</jdbc.db2.server> - <jdbc.db2.port>50000</jdbc.db2.port> - <jdbc.db2.database>jbpm3</jdbc.db2.database> - <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> - <jdbc.db2.username>jbpm3</jdbc.db2.username> - <jdbc.db2.password>jbpm3</jdbc.db2.password> - <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> - - <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> - <jdbc.mssql.port>3918</jdbc.mssql.port> - <jdbc.mssql.database>jbpm</jdbc.mssql.database> - <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> - <jdbc.mssql.username>jbpm</jdbc.mssql.username> - <jdbc.mssql.password>jbpm</jdbc.mssql.password> - <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> - - <jdbc.mysql.server>localhost</jdbc.mysql.server> - <jdbc.mysql.port>3306</jdbc.mysql.port> - <jdbc.mysql.database>jbpm3</jdbc.mysql.database> - <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> - <jdbc.mysql.username>jbpm3</jdbc.mysql.username> - <jdbc.mysql.password>jbpm3</jdbc.mysql.password> - <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> - - <jdbc.oracle.server>localhost</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>XE</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpm3</jdbc.oracle.username> - <jdbc.oracle.password>jbpm3</jdbc.oracle.password> - <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> - - <jdbc.postgresql.server>localhost</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> - <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> - <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> - - <jdbc.sybase.server>localhost</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpm3</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> - <jdbc.sybase.username>jbpm3</jdbc.sybase.username> - <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>qa-local</activeProfile> - </activeProfiles> -</profilesXml> Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2010-09-14 04:04:29 UTC (rev 6658) +++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -1,65 +0,0 @@ -<?xml version="1.0"?> -<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> - <profiles> - <profile> - <id>qa-redhat</id> - - <properties> - <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server> - <jdbc.db2.port>50000</jdbc.db2.port> - <jdbc.db2.database>jbossqa</jdbc.db2.database> - <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> - <jdbc.db2.username>jbpm3</jdbc.db2.username> - <jdbc.db2.password>jbpm3</jdbc.db2.password> - <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> - - <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> - <jdbc.mssql.port>3918</jdbc.mssql.port> - <jdbc.mssql.database>jbpm</jdbc.mssql.database> - <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> - <jdbc.mssql.username>jbpm</jdbc.mssql.username> - <jdbc.mssql.password>jbpm</jdbc.mssql.password> - <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> - - <jdbc.mysql.server>vmg02.mw.lab.eng.bos.redhat.com</jdbc.mysql.server> - <jdbc.mysql.port>3306</jdbc.mysql.port> - <jdbc.mysql.database>jbpm3</jdbc.mysql.database> - <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> - <jdbc.mysql.username>jbpm3</jdbc.mysql.username> - <jdbc.mysql.password>jbpm3</jdbc.mysql.password> - <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> - - <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>qadb01</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpm3</jdbc.oracle.username> - <jdbc.oracle.password>jbpm3</jdbc.oracle.password> - <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> - - <jdbc.postgresql.server>vmg01.mw.lab.eng.bos.redhat.com</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> - <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> - <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> - - <jdbc.sybase.server>vmg07.mw.lab.eng.bos.redhat.com</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpm3</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> - <jdbc.sybase.username>jbpm3xa</jdbc.sybase.username> - <jdbc.sybase.password>jbpm3xa</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>qa-redhat</activeProfile> - </activeProfiles> -</profilesXml> Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-14 04:04:29 UTC (rev 6658) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-15 03:37:37 UTC (rev 6659) @@ -212,7 +212,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>1.4.5</version> + <version>1.6.2</version> <exclusions> <exclusion> <groupId>xerces</groupId>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6658 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/api/history and 4 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-14 00:04:29 -0400 (Tue, 14 Sep 2010) New Revision: 6658 Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperator.java Removed: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryTaskQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskReassignTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessDefinitionQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java Log: JBPM-2873 allow variable number of operands Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/DeploymentQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -36,7 +36,7 @@ DeploymentQuery deploymentId(String id); /** only include a specific deployment by id allows to specify query operand*/ - DeploymentQuery deploymentId(String id, QueryOperand operand); + DeploymentQuery deploymentId(QueryOperator operator, String... deploymentId); /** only select suspended deployments */ DeploymentQuery suspended(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -51,7 +51,7 @@ JobQuery processInstanceId(String processInstanceId); /** only select jobs related to the given process instance, allows to specify query operand*/ - JobQuery processInstanceId(String processInstanceId, QueryOperand operand); + JobQuery processInstanceId(QueryOperator operator, String... processInstanceId); /** only select jobs that were rolled back due to an exception */ JobQuery exception(boolean hasException); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessDefinitionQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -57,16 +57,16 @@ ProcessDefinitionQuery deploymentId(String deploymentId); /** select only the process definition with the given id, allows to specify query operand */ - ProcessDefinitionQuery processDefinitionId(String processDefinitionId, QueryOperand operand); + ProcessDefinitionQuery processDefinitionId(QueryOperator operator, String... processDefinitionId); /** select only process definitions with the given key, allows to specify query operand */ - ProcessDefinitionQuery processDefinitionKey(String key, QueryOperand operand); + ProcessDefinitionQuery processDefinitionKey(QueryOperator operator, String... processDefinitionKey); /** select only process definitions with an exact match for the given name, allows to specify query operand */ - ProcessDefinitionQuery processDefinitionName(String name, QueryOperand operand); + ProcessDefinitionQuery processDefinitionName(QueryOperator operator, String... processDefinitionName); /** select only process definitions within the given deployment, allows to specify query operand */ - ProcessDefinitionQuery deploymentId(String deploymentId, QueryOperand operand); + ProcessDefinitionQuery deploymentId(QueryOperator operator, String... deploymentId); /** select only suspended process definitions */ ProcessDefinitionQuery suspended(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessInstanceQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -47,19 +47,19 @@ ProcessInstanceQuery processInstanceKey(String processInstanceKey); /** select only process instances that were started be given user */ - ProcessInstanceQuery initiator(String user); + ProcessInstanceQuery initiator(String userId); /** select only process instances for the given process definition, allows to specify query operand */ - ProcessInstanceQuery processDefinitionId(String processDefinitionId, QueryOperand operand); + ProcessInstanceQuery processDefinitionId(QueryOperator operator, String... processDefinitionId); /** select only a specific process instances using the process instance id, allows to specify query operand */ - ProcessInstanceQuery processInstanceId(String processInstanceId, QueryOperand operand); + ProcessInstanceQuery processInstanceId(QueryOperator operator, String... processInstanceId); /** select only specific process instances using a business key, allows to specify query operand */ - ProcessInstanceQuery processInstanceKey(String processInstanceKey, QueryOperand operand); + ProcessInstanceQuery processInstanceKey(QueryOperator operator, String... processInstanceKey); /** select only process instances that were started be given user, allows to specify query operand */ - ProcessInstanceQuery initiator(String user, QueryOperand operand); + ProcessInstanceQuery initiator(QueryOperator operator, String... userId); /** select only suspended process definitions */ ProcessInstanceQuery suspended(); Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -1,21 +0,0 @@ -package org.jbpm.api; - -public enum QueryOperand { - - EQUALS("="), - LIKE("like"), - IN("in"), - NOT_IN("not in"); - - private final String value; - - QueryOperand(String value) { - this.value = value; - } - - @Override - public String toString() { - return value; - } - -} Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperator.java (from rev 6655, jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java) =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperator.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperator.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -0,0 +1,21 @@ +package org.jbpm.api; + +public enum QueryOperator { + + EQUALS("="), + LIKE("like"), + IN("in"), + NOT_IN("not in"); + + private final String value; + + QueryOperator(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + +} Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -25,7 +25,6 @@ import org.jbpm.api.task.Task; - /** query for tasks. * * @author Tom Baeyens @@ -71,24 +70,24 @@ * can be used in combination with the {@link #processDefinitionId(String)} */ TaskQuery activityName(String activityName); - /** only query for tasks for which the given user is a candidate, allows to specify query operand. + /** only query for tasks for which the given user is a candidate, allows to specify query operator. * The user could be associated directly as a candidate participant * to the task or the user could be a member of a group that is * associated as a candidate group to the task. */ - TaskQuery assignee(String userId, QueryOperand operand); + TaskQuery assignee(QueryOperator operator, String... userId); - /** only select tasks that are associated to the given execution, allows to specify query operand */ - TaskQuery executionId(String executionId, QueryOperand operand); + /** only select tasks that are associated to the given execution, allows to specify query operator */ + TaskQuery executionId(QueryOperator operator, String... executionId); - /** only select tasks that are associated to the given process instance, allows to specify query operand */ - TaskQuery processInstanceId(String processInstanceId, QueryOperand operand); + /** only select tasks that are associated to the given process instance, allows to specify query operator */ + TaskQuery processInstanceId(QueryOperator operator, String... processInstanceId); - /** only select tasks that are associated to the given process definition, allows to specify query operand */ - TaskQuery processDefinitionId(String processDefinitionId, QueryOperand operand); + /** only select tasks that are associated to the given process definition, allows to specify query operator */ + TaskQuery processDefinitionId(QueryOperator operator, String... processDefinitionId); - /** only select tasks that are associated to the given activity name, allows to specify query operand. This - * can be used in combination with the {@link #processDefinitionId(String)} */ - TaskQuery activityName(String activityName, QueryOperand operand); + /** only select tasks that are associated to the given activity name, allows to specify query operator. + * can be used in combination with {@link #processDefinitionId(String)} */ + TaskQuery activityName(QueryOperator operator, String... activityName); /** only select suspended tasks */ TaskQuery suspended(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryActivityInstanceQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; /** query for {@link HistoryActivityInstance activity occurrences}. @@ -55,13 +55,13 @@ HistoryActivityInstanceQuery processInstanceId(String processInstanceId); /** only select activity instances for the given process definition, allows to specify query operand */ - HistoryActivityInstanceQuery processDefinitionId(String processDefinitionId, QueryOperand operand); + HistoryActivityInstanceQuery processDefinitionId(QueryOperator operator, String... processDefinitionId); /** only select activity instances for the given execution, allows to specify query operand */ - HistoryActivityInstanceQuery executionId(String executionId, QueryOperand operand); + HistoryActivityInstanceQuery executionId(QueryOperator operator, String... executionId); /** only select activity instances for the given process instance id, allows to specify query operand */ - HistoryActivityInstanceQuery processInstanceId(String processInstanceId, QueryOperand operand); + HistoryActivityInstanceQuery processInstanceId(QueryOperator operator, String... processInstanceId); /** only select activity instances started after the given time */ HistoryActivityInstanceQuery startedAfter(Date time); @@ -78,7 +78,7 @@ /** only select activity instances for the given activity, allows to specify query operand * (this usually used in combination with {@link #processDefinitionId(String)}) */ - HistoryActivityInstanceQuery activityName(String activityName, QueryOperand operand); + HistoryActivityInstanceQuery activityName(QueryOperator operator, String... activityName); /** only select activity instances that took longer then the given duration in milliseconds */ HistoryActivityInstanceQuery tookLongerThen(long durationInMillis); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryDetailQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; /** query for task comments, task assignments and so on. @@ -49,13 +49,13 @@ HistoryDetailQuery taskId(String taskId); /** only select details for the given processInstanceId, allows to specify query operand */ - HistoryDetailQuery processInstanceId(String processInstanceId, QueryOperand operand); + HistoryDetailQuery processInstanceId(QueryOperator operator, String... processInstanceId); /** only select details for the given activityInstanceId, allows to specify query operand */ - HistoryDetailQuery activityInstanceId(String activityInstanceId, QueryOperand operand); + HistoryDetailQuery activityInstanceId(QueryOperator operator, String... activityInstanceId); /** only select details for the given taskId, allows to specify query operand */ - HistoryDetailQuery taskId(String taskId, QueryOperand operand); + HistoryDetailQuery taskId(QueryOperator operator, String... taskId); /** only select details after the given time */ HistoryDetailQuery timeAfter(Date time); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryProcessInstanceQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; /** query for ongoing and finished @@ -68,23 +68,23 @@ HistoryProcessInstanceQuery superProcessInstanceId(String processInstanceId); /** select only the process instances with the given id, allows to specify query operand */ - HistoryProcessInstanceQuery processInstanceId(String processInstanceId, QueryOperand operand); + HistoryProcessInstanceQuery processInstanceId(QueryOperator operator, String... processInstanceId); /** select only process instances with the given process definition, allows to specify query operand */ - HistoryProcessInstanceQuery processDefinitionId(String processDefinitionId, QueryOperand operand); + HistoryProcessInstanceQuery processDefinitionId(QueryOperator operator, String... processDefinitionId); /** select only process instances with the given business key, allows to specify query operand */ - HistoryProcessInstanceQuery processInstanceKey(String processInstanceKey, QueryOperand operand); + HistoryProcessInstanceQuery processInstanceKey(QueryOperator operator, String... processInstanceKey); /** select only process instances in the given state, allows to specify query operand */ - HistoryProcessInstanceQuery state(String state, QueryOperand operand); + HistoryProcessInstanceQuery state(QueryOperator operator, String... state); /** select only process instances that were started be given user, allows to specify query operand */ - HistoryProcessInstanceQuery initiator(String user, QueryOperand operand); + HistoryProcessInstanceQuery initiator(QueryOperator operator, String... userId); /** select only the process instances with the super process instance as given id, * in other words sub process instances, allows to specify query operand */ - HistoryProcessInstanceQuery superProcessInstanceId(String processInstanceId, QueryOperand operand); + HistoryProcessInstanceQuery superProcessInstanceId(QueryOperator operator, String... processInstanceId); /** order selected process instances ascending for certain {@link #PROPERTY_STARTTIME properties} */ HistoryProcessInstanceQuery orderAsc(String property); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/history/HistoryTaskQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; /** query for history tasks. @@ -67,25 +67,25 @@ HistoryTaskQuery state(String state); /** only select the history task for the given id, allows to specify query operand */ - HistoryTaskQuery taskId(String taskId, QueryOperand operand); + HistoryTaskQuery taskId(QueryOperator operator, String... taskId); /** only select history tasks within the given processInstanceId, allows to specify query operand */ - HistoryTaskQuery processInstanceId(String processInstanceId, QueryOperand operand); + HistoryTaskQuery processInstanceId(QueryOperator operator, String... processInstanceId); /** only select history tasks within the given execution, allows to specify query operand */ - HistoryTaskQuery executionId(String executionId, QueryOperand operand); + HistoryTaskQuery executionId(QueryOperator operator, String... executionId); /** only select history tasks for the given assignee, allows to specify query operand */ - HistoryTaskQuery assignee(String assignee, QueryOperand operand); + HistoryTaskQuery assignee(QueryOperator operator, String... assignee); /** only select history tasks in the given state, allows to specify query operand */ - HistoryTaskQuery state(String state, QueryOperand operand); + HistoryTaskQuery state(QueryOperator operator, String... state); /** only select history tasks that have the given outcome */ HistoryTaskQuery outcome(String outcome); /** only select history tasks that have the given outcome, allows to specify query operand */ - HistoryTaskQuery outcome(String outcome, QueryOperand operand); + HistoryTaskQuery outcome(QueryOperator operator, String... outcome); /** order selected history tasks ascending for certain {@link #PROPERTY_ID properties} */ HistoryTaskQuery orderAsc(String property); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -31,7 +31,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.Environment; import org.jbpm.pvm.internal.cmd.CommandService; @@ -52,11 +52,11 @@ protected boolean count; protected boolean uniqueResult; - protected Map<String, QueryOperand> parameterOperands = new HashMap<String, QueryOperand>(); + protected Map<String, QueryOperator> parameterOperators = new HashMap<String, QueryOperator>(); protected abstract void applyParameters(Query query); - public abstract String hql(); + protected abstract String hql(); /* reuse by copy and paste: * (return type can't be changed) @@ -161,11 +161,11 @@ } } - protected QueryOperand getOperand(String param) { - if (parameterOperands.containsKey(param)) { - return parameterOperands.get(param); + protected QueryOperator getOperator(String param) { + if (parameterOperators.containsKey(param)) { + return parameterOperators.get(param); } - return QueryOperand.EQUALS; + return QueryOperator.EQUALS; } /** @@ -206,32 +206,27 @@ } } - protected void appendWhereClauseWithOperand(String where, String namedParam, StringBuilder hql) { - QueryOperand operand = getOperand(namedParam); - switch (operand) { + protected void appendWhereClauseWithOperator(String where, String namedParam, StringBuilder hql) { + QueryOperator operator = getOperator(namedParam); + switch (operator) { case IN: case NOT_IN: - appendWhereClause(where + " " + operand + " (:" + namedParam + ") ", hql); + appendWhereClause(where + " " + operator + " (:" + namedParam + ") ", hql); break; default: - appendWhereClause(where + " " + operand + " :" + namedParam + " ", hql); + appendWhereClause(where + " " + operator + " :" + namedParam + " ", hql); } } - protected void applyParameterWithOperand(String parameter, String namedParam, Class<?> clazz, - Query query) { - switch (getOperand(namedParam)) { - case IN: - case NOT_IN: - query.setParameterList(namedParam, transformToArray(parameter, clazz)); + protected void applyParameterWithOperator(String name, Object[] values, Query query) { + switch (values.length) { + case 0: break; + case 1: + query.setParameter(name, values[0]); + break; default: - if (clazz == Long.class) { - query.setLong(namedParam, Long.parseLong(parameter)); - } - else { - query.setString(namedParam, parameter); - } + query.setParameterList(name, values); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -26,7 +26,7 @@ import org.hibernate.Query; import org.jbpm.api.Deployment; import org.jbpm.api.DeploymentQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -38,10 +38,10 @@ private static final long serialVersionUID = 1L; - protected String deploymentId; + protected Long[] deploymentId; protected Boolean suspended; - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -57,7 +57,7 @@ hql.append(" as d "); if (deploymentId != null) { - appendWhereClauseWithOperand("d.dbid", "deploymentId", hql); + appendWhereClauseWithOperator("d.dbid", "deploymentId", hql); } if (suspended != null) { @@ -76,12 +76,12 @@ protected void applyParameters(Query query) { if (deploymentId != null) { - applyParameterWithOperand(deploymentId, "deploymentId", Long.class, query); + applyParameterWithOperator("deploymentId", deploymentId, query); } } public DeploymentQuery deploymentId(String deploymentId) { - this.deploymentId = deploymentId; + this.deploymentId = new Long[] { Long.valueOf(deploymentId) }; return this; } @@ -118,9 +118,12 @@ return (Deployment) untypedUniqueResult(); } - public DeploymentQuery deploymentId(String id, QueryOperand operand) { - this.deploymentId = id; - parameterOperands.put("deploymentId", operand); + public DeploymentQuery deploymentId(QueryOperator operator, String... deploymentId) { + this.deploymentId = new Long[deploymentId.length]; + for (int i = 0; i < deploymentId.length; i++) { + this.deploymentId[i] = Long.valueOf(deploymentId[i]); + } + parameterOperators.put("deploymentId", operator); return this; } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -26,7 +26,7 @@ import org.hibernate.Query; import org.jbpm.api.JbpmException; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryActivityInstance; import org.jbpm.api.history.HistoryActivityInstanceQuery; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; @@ -41,17 +41,17 @@ private static final long serialVersionUID = 1L; - protected String processDefinitionId; + protected String[] processDefinitionId; protected Long tookLessThen; protected Long tookLongerThen; protected Date startedBefore; protected Date startedAfter; - protected String executionId; - protected String processInstanceId; - protected String activityName; + protected String[] executionId; + protected String[] processInstanceId; + protected String[] activityName; protected boolean completedOnly; - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -66,7 +66,7 @@ hql.append(" as hai "); if (processDefinitionId!=null) { - appendWhereClauseWithOperand("hai.historyProcessInstance.processDefinitionId", "processDefinitionId", hql); + appendWhereClauseWithOperator("hai.historyProcessInstance.processDefinitionId", "processDefinitionId", hql); } if (tookLessThen!=null) { @@ -86,15 +86,15 @@ } if (processInstanceId!=null) { - appendWhereClauseWithOperand("hai.historyProcessInstance.processInstanceId", "processInstanceId", hql); + appendWhereClauseWithOperator("hai.historyProcessInstance.processInstanceId", "processInstanceId", hql); } if (executionId!=null) { - appendWhereClauseWithOperand("hai.executionId", "executionId", hql); + appendWhereClauseWithOperator("hai.executionId", "executionId", hql); } if (activityName!=null) { - appendWhereClauseWithOperand("hai.activityName", "activityName", hql); + appendWhereClauseWithOperator("hai.activityName", "activityName", hql); } if (completedOnly) { @@ -124,19 +124,19 @@ } if (processDefinitionId!=null) { - applyParameterWithOperand(processDefinitionId, "processDefinitionId", String.class, query); + applyParameterWithOperator("processDefinitionId", processDefinitionId, query); } if (processInstanceId!=null) { - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } if (executionId!=null) { - applyParameterWithOperand(executionId, "executionId", String.class, query); + applyParameterWithOperator("executionId", executionId, query); } if (activityName!=null) { - applyParameterWithOperand(activityName, "activityName", String.class, query); + applyParameterWithOperator("activityName", activityName, query); } } @@ -149,17 +149,17 @@ } public HistoryActivityInstanceQuery activityName(String activityName) { - this.activityName = activityName; + this.activityName = new String[] { activityName }; return this; } public HistoryActivityInstanceQuery executionId(String executionId) { - this.executionId = executionId; + this.executionId = new String[] { executionId }; return this; } public HistoryActivityInstanceQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } @@ -182,7 +182,7 @@ if (processDefinitionId==null) { throw new JbpmException("processInstanceId is null"); } - this.processDefinitionId = processDefinitionId; + this.processDefinitionId = new String[] { processDefinitionId }; return this; } @@ -211,30 +211,30 @@ return this; } - public HistoryActivityInstanceQuery activityName(String activityName, QueryOperand operand) { + public HistoryActivityInstanceQuery activityName(QueryOperator operator, String... activityName) { this.activityName = activityName; - parameterOperands.put("activityName", operand); + parameterOperators.put("activityName", operator); return this; } - public HistoryActivityInstanceQuery executionId(String executionId, QueryOperand operand) { + public HistoryActivityInstanceQuery executionId(QueryOperator operator, String... executionId) { this.executionId = executionId; - parameterOperands.put("executionId", operand); + parameterOperators.put("executionId", operator); return this; } - public HistoryActivityInstanceQuery processDefinitionId(String processDefinitionId, QueryOperand operand) { + public HistoryActivityInstanceQuery processDefinitionId(QueryOperator operator, String... processDefinitionId) { this.processDefinitionId = processDefinitionId; - parameterOperands.put("processDefinitionId", operand); + parameterOperators.put("processDefinitionId", operator); return this; } - public HistoryActivityInstanceQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public HistoryActivityInstanceQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -25,14 +25,14 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.api.QueryOperand; + +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryDetail; import org.jbpm.api.history.HistoryDetailQuery; import org.jbpm.pvm.internal.history.model.HistoryCommentImpl; import org.jbpm.pvm.internal.history.model.HistoryDetailImpl; import org.jbpm.pvm.internal.util.CollectionUtil; - /** * @author Tom Baeyens * @author Maciej Swiderski @@ -44,11 +44,13 @@ protected Date timeBefore; protected Date timeAfter; - protected String processInstanceId; - protected String activityInstanceId; - protected String taskId; + protected String[] processInstanceId; + protected String[] activityInstanceId; + protected String[] taskId; - public String hql() { + private static final long serialVersionUID = 1L; + + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); if (count) { @@ -61,15 +63,15 @@ hql.append(" as hd "); if (taskId!=null) { - appendWhereClauseWithOperand("hd.historyTask.dbid", "taskId", hql); + appendWhereClauseWithOperator("hd.historyTask.dbid", "taskId", hql); } if (processInstanceId!=null) { - appendWhereClauseWithOperand("hd.historyProcessInstance.processInstanceId", "processInstanceId", hql); + appendWhereClauseWithOperator("hd.historyProcessInstance.processInstanceId", "processInstanceId", hql); } if (activityInstanceId!=null) { - appendWhereClauseWithOperand("hd.historyActivityInstance.dbid", "activityInstanceId", hql); + appendWhereClauseWithOperator("hd.historyActivityInstance.dbid", "activityInstanceId", hql); } if (timeBefore!=null) { @@ -95,15 +97,15 @@ } if (taskId!=null) { - applyParameterWithOperand(taskId, "taskId", Long.class, query); + applyParameterWithOperator("taskId", taskId, query); } if (processInstanceId!=null) { - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } if (activityInstanceId!=null) { - applyParameterWithOperand(activityInstanceId, "activityInstanceId", Long.class, query); + applyParameterWithOperator("activityInstanceId", activityInstanceId, query); } } @@ -116,7 +118,7 @@ } public HistoryDetailQuery taskId(String taskId) { - this.taskId = taskId; + this.taskId = new String[] { taskId }; return this; } @@ -136,12 +138,12 @@ } public HistoryDetailQuery activityInstanceId(String activityInstanceId) { - this.activityInstanceId = activityInstanceId; + this.activityInstanceId = new String[] { activityInstanceId }; return this; } public HistoryDetailQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } @@ -160,23 +162,23 @@ return this; } - public HistoryDetailQuery activityInstanceId(String activityInstanceId, QueryOperand operand) { + public HistoryDetailQuery activityInstanceId(QueryOperator operator, String... activityInstanceId) { this.activityInstanceId = activityInstanceId; - parameterOperands.put("activityInstanceId", operand); + parameterOperators.put("activityInstanceId", operator); return this; } - public HistoryDetailQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public HistoryDetailQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } - public HistoryDetailQuery taskId(String taskId, QueryOperand operand) { + public HistoryDetailQuery taskId(QueryOperator operator, String... taskId) { this.taskId = taskId; - parameterOperands.put("taskId", operand); + parameterOperators.put("taskId", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -25,7 +25,7 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.history.HistoryProcessInstanceQuery; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; @@ -40,19 +40,19 @@ private static final long serialVersionUID = 1L; - protected String processDefinitionId; - protected String state; - protected String processInstanceId; - protected String processInstanceKey; - protected String initiator; - protected String superProcessInstanceId; + protected String[] processDefinitionId; + protected String[] state; + protected String[] processInstanceId; + protected String[] processInstanceKey; + protected String[] initiator; + protected String[] superProcessInstanceId; protected boolean ended; protected Date endedBefore; protected Date endedAfter; - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -67,27 +67,27 @@ hql.append(" as hpi "); if (processInstanceId!=null) { - appendWhereClauseWithOperand("hpi.processInstanceId", "processInstanceId", hql); + appendWhereClauseWithOperator("hpi.processInstanceId", "processInstanceId", hql); } if (processDefinitionId!=null) { - appendWhereClauseWithOperand("hpi.processDefinitionId", "processDefinitionId", hql); + appendWhereClauseWithOperator("hpi.processDefinitionId", "processDefinitionId", hql); } if (state!=null) { - appendWhereClauseWithOperand("hpi.state", "state", hql); + appendWhereClauseWithOperator("hpi.state", "state", hql); } if (processInstanceKey!=null) { - appendWhereClauseWithOperand("hpi.key", "processInstanceKey", hql); + appendWhereClauseWithOperator("hpi.key", "processInstanceKey", hql); } if (initiator!=null) { - appendWhereClauseWithOperand("hpi.initiator", "initiator", hql); + appendWhereClauseWithOperator("hpi.initiator", "initiator", hql); } if (superProcessInstanceId!=null) { - appendWhereClauseWithOperand("hpi.superProcessInstanceId", "superProcessInstanceId", hql); + appendWhereClauseWithOperator("hpi.superProcessInstanceId", "superProcessInstanceId", hql); } if (ended) { @@ -114,27 +114,27 @@ } if (processInstanceId!=null) { - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } if (processDefinitionId!=null) { - applyParameterWithOperand(processDefinitionId, "processDefinitionId", String.class, query); + applyParameterWithOperator("processDefinitionId", processDefinitionId, query); } if (state!=null) { - applyParameterWithOperand(state, "state", String.class, query); + applyParameterWithOperator("state", state, query); } if (processInstanceKey!=null) { - applyParameterWithOperand(processInstanceKey, "processInstanceKey", String.class, query); + applyParameterWithOperator("processInstanceKey", processInstanceKey, query); } if (initiator!=null) { - applyParameterWithOperand(initiator, "initiator", String.class, query); + applyParameterWithOperator("initiator", initiator, query); } if (superProcessInstanceId!=null) { - applyParameterWithOperand(superProcessInstanceId, "superProcessInstanceId", String.class, query); + applyParameterWithOperator("superProcessInstanceId", superProcessInstanceId, query); } } @@ -147,7 +147,7 @@ } public HistoryProcessInstanceQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } @@ -167,22 +167,22 @@ } public HistoryProcessInstanceQuery processDefinitionId(String processDefinitionId) { - this.processDefinitionId = processDefinitionId; + this.processDefinitionId = new String[] { processDefinitionId }; return this; } public HistoryProcessInstanceQuery processInstanceKey(String processInstanceKey) { - this.processInstanceKey = processInstanceKey; + this.processInstanceKey = new String[] { processInstanceKey }; return this; } public HistoryProcessInstanceQuery state(String state) { - this.state = state; + this.state = new String[] { state }; return this; } public HistoryProcessInstanceQuery initiator(String user) { - this.initiator = user; + this.initiator = new String[] { user }; return this; } @@ -210,50 +210,50 @@ return this; } - public HistoryProcessInstanceQuery processDefinitionId(String processDefinitionId, QueryOperand operand) { + public HistoryProcessInstanceQuery processDefinitionId(QueryOperator operator, String... processDefinitionId) { this.processDefinitionId = processDefinitionId; - parameterOperands.put("processDefinitionId", operand); + parameterOperators.put("processDefinitionId", operator); return this; } - public HistoryProcessInstanceQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public HistoryProcessInstanceQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } - public HistoryProcessInstanceQuery processInstanceKey(String processInstanceKey, QueryOperand operand) { + public HistoryProcessInstanceQuery processInstanceKey(QueryOperator operator, String... processInstanceKey) { this.processInstanceKey = processInstanceKey; - parameterOperands.put("processInstanceKey", operand); + parameterOperators.put("processInstanceKey", operator); return this; } - public HistoryProcessInstanceQuery state(String state, QueryOperand operand) { + public HistoryProcessInstanceQuery state(QueryOperator operator, String... state) { this.state = state; - parameterOperands.put("state", operand); + parameterOperators.put("state", operator); return this; } - public HistoryProcessInstanceQuery initiator(String user, QueryOperand operand) { - this.initiator = user; - parameterOperands.put("initiator", operand); + public HistoryProcessInstanceQuery initiator(QueryOperator operator, String... userId) { + this.initiator = userId; + parameterOperators.put("initiator", operator); return this; } public HistoryProcessInstanceQuery superProcessInstanceId(String processInstanceId) { - this.superProcessInstanceId = processInstanceId; + this.superProcessInstanceId = new String[] { processInstanceId }; return this; } - public HistoryProcessInstanceQuery superProcessInstanceId(String processInstanceId, QueryOperand operand) { + public HistoryProcessInstanceQuery superProcessInstanceId(QueryOperator operator, String... processInstanceId) { this.superProcessInstanceId = processInstanceId; - parameterOperands.put("superProcessInstanceId", operand); + parameterOperators.put("superProcessInstanceId", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryTaskQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryTaskQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryTaskQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -26,7 +26,7 @@ import org.hibernate.Query; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryTask; import org.jbpm.api.history.HistoryTaskQuery; import org.jbpm.pvm.internal.history.model.HistoryTaskImpl; @@ -39,18 +39,20 @@ */ public class HistoryTaskQueryImpl extends AbstractQuery implements HistoryTaskQuery { - protected String taskId; - protected String executionId; - protected String processInstanceId; - protected String assignee; - protected String state; - protected String outcome; + protected Long[] taskId; + protected String[] executionId; + protected String[] processInstanceId; + protected String[] assignee; + protected String[] state; + protected String[] outcome; protected Long tookLessThen; protected Long tookLongerThen; protected Date startedBefore; protected Date startedAfter; - public String hql() { + private static final long serialVersionUID = 1L; + + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -69,27 +71,27 @@ hql.append(HistoryTaskInstanceImpl.class.getName()); hql.append(" as hti "); appendWhereClause("ht = hti.historyTask", hql); - appendWhereClauseWithOperand("hti.historyProcessInstance.processInstanceId", "processInstanceId", hql); + appendWhereClauseWithOperator("hti.historyProcessInstance.processInstanceId", "processInstanceId", hql); } if (taskId!=null) { - appendWhereClauseWithOperand("ht.dbid", "taskId", hql); + appendWhereClauseWithOperator("ht.dbid", "taskId", hql); } if (executionId!=null) { - appendWhereClauseWithOperand("ht.executionId", "executionId", hql); + appendWhereClauseWithOperator("ht.executionId", "executionId", hql); } if (assignee!=null) { - appendWhereClauseWithOperand("ht.assignee", "assignee", hql); + appendWhereClauseWithOperator("ht.assignee", "assignee", hql); } if (state!=null) { - appendWhereClauseWithOperand("ht.state", "state", hql); + appendWhereClauseWithOperator("ht.state", "state", hql); } if (outcome!=null) { - appendWhereClauseWithOperand("ht.outcome", "outcome", hql); + appendWhereClauseWithOperator("ht.outcome", "outcome", hql); } if (tookLessThen!=null) { @@ -131,27 +133,27 @@ } if (processInstanceId!=null) { - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } if (taskId!=null) { - applyParameterWithOperand(taskId, "taskId", Long.class, query); + applyParameterWithOperator("taskId", taskId, query); } if (executionId!=null) { - applyParameterWithOperand(executionId, "executionId", String.class, query); + applyParameterWithOperator("executionId", executionId, query); } if (assignee!=null) { - applyParameterWithOperand(assignee, "assignee", String.class, query); + applyParameterWithOperator("assignee", assignee, query); } if (state!=null) { - applyParameterWithOperand(state, "state", String.class, query); + applyParameterWithOperator("state", state, query); } if (outcome!=null) { - applyParameterWithOperand(outcome, "outcome", String.class, query); + applyParameterWithOperator("outcome", outcome, query); } } @@ -164,32 +166,32 @@ } public HistoryTaskQuery taskId(String taskId) { - this.taskId = taskId; + this.taskId = new Long[] { Long.valueOf(taskId) }; return this; } public HistoryTaskQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } public HistoryTaskQuery executionId(String executionId) { - this.executionId = executionId; + this.executionId = new String[] { executionId }; return this; } public HistoryTaskQuery assignee(String assignee) { - this.assignee = assignee; + this.assignee = new String[] { assignee }; return this; } public HistoryTaskQuery state(String state) { - this.state = state; + this.state = new String[] { state }; return this; } public HistoryTaskQuery outcome(String outcome) { - this.outcome = outcome; + this.outcome = new String[] { outcome }; return this; } @@ -228,44 +230,47 @@ return this; } - public HistoryTaskQuery assignee(String assignee, QueryOperand operand) { + public HistoryTaskQuery assignee(QueryOperator operator, String... assignee) { this.assignee = assignee; - parameterOperands.put("assignee", operand); + parameterOperators.put("assignee", operator); return this; } - public HistoryTaskQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public HistoryTaskQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } - public HistoryTaskQuery executionId(String executionId, QueryOperand operand) { + public HistoryTaskQuery executionId(QueryOperator operator, String... executionId) { this.executionId = executionId; - parameterOperands.put("executionId", operand); + parameterOperators.put("executionId", operator); return this; } - public HistoryTaskQuery state(String state, QueryOperand operand) { + public HistoryTaskQuery state(QueryOperator operator, String... state) { this.state = state; - parameterOperands.put("state", operand); + parameterOperators.put("state", operator); return this; } - public HistoryTaskQuery taskId(String taskId, QueryOperand operand) { - this.taskId = taskId; - parameterOperands.put("taskId", operand); + public HistoryTaskQuery taskId(QueryOperator operator, String... taskId) { + this.taskId = new Long[taskId.length]; + for (int i = 0; i < taskId.length; i++) { + this.taskId[i] = Long.valueOf(taskId[i]); + } + parameterOperators.put("taskId", operator); return this; } - public HistoryTaskQuery outcome(String outcome, QueryOperand operand) { + public HistoryTaskQuery outcome(QueryOperator operator, String... outcome) { this.outcome = outcome; - parameterOperands.put("outcome", operand); + parameterOperators.put("outcome", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -24,15 +24,15 @@ import java.util.List; import org.hibernate.Query; + import org.jbpm.api.JobQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.job.Job; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.util.CollectionUtil; - /** * @author Tom Baeyens * @author Maciej Swiderski @@ -41,14 +41,12 @@ private static final long serialVersionUID = 1L; - protected boolean messagesOnly = false; - protected boolean timersOnly = false; - protected String processInstanceId = null; + protected boolean messagesOnly; + protected boolean timersOnly; + protected String[] processInstanceId; protected Boolean exception; - - - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -69,10 +67,9 @@ hql.append(" j "); if (processInstanceId!=null) { - appendWhereClauseWithOperand("j.processInstance.id", "processInstanceId", hql); + appendWhereClauseWithOperator("j.processInstance.id", "processInstanceId", hql); } - if (exception!=null) { if (exception) { appendWhereClause("j.exception is not null ", hql); @@ -88,7 +85,7 @@ protected void applyParameters(Query query) { if (processInstanceId != null) { - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } } @@ -131,13 +128,13 @@ } public JobQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } - public JobQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public JobQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -31,7 +31,7 @@ import org.jbpm.api.Deployment; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.pvm.internal.env.EnvironmentImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.repository.DeploymentImpl; @@ -58,12 +58,11 @@ private static final long serialVersionUID = 1L; - protected String id; - protected String key; - protected String nameLike; - protected String name; + protected String[] id; + protected String[] key; + protected String[] name; protected Boolean suspended; - protected String deploymentId; + protected Long[] deploymentId; public Object execute(Session session) { Object result = super.execute(session); @@ -94,7 +93,7 @@ return (ProcessDefinitionImpl) repositorySession.getObject(deploymentId, objectName); } - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select new map( idProperty.objectName as objectName, " + "idProperty.deployment.dbid as deploymentDbid ) "); @@ -128,25 +127,20 @@ appendWhereClause("versionProperty.deployment = deployment ", hql); if (id!=null) { - appendWhereClauseWithOperand("idProperty.stringValue", "id", hql); + appendWhereClauseWithOperator("idProperty.stringValue", "id", hql); } if (name!=null) { - appendWhereClauseWithOperand("idProperty.objectName", "name", hql); + appendWhereClauseWithOperator("idProperty.objectName", "name", hql); } if (key!=null) { - appendWhereClauseWithOperand("keyProperty.stringValue", "key", hql); + appendWhereClauseWithOperator("keyProperty.stringValue", "key", hql); } if (deploymentId!=null) { - appendWhereClauseWithOperand("idProperty.deployment.dbid", "deploymentId", hql); + appendWhereClauseWithOperator("idProperty.deployment.dbid", "deploymentId", hql); } - - // @deprecated, should be used with operand - if (nameLike!=null) { - appendWhereClause("idProperty.objectName like '"+nameLike+"' ", hql); - } appendOrderByClause(hql); @@ -155,21 +149,20 @@ protected void applyParameters(Query query) { if (id != null) { - applyParameterWithOperand(id, "id", String.class, query); + applyParameterWithOperator("id", id, query); } if (name != null) { - applyParameterWithOperand(name, "name", String.class, query); + applyParameterWithOperator("name", name, query); } if (key != null) { - applyParameterWithOperand(key, "key", String.class, query); + applyParameterWithOperator("key", key, query); } if (deploymentId != null) { - applyParameterWithOperand(deploymentId, "deploymentId", Long.class, query); + applyParameterWithOperator("deploymentId", deploymentId, query); } - } public List<ProcessDefinition> list() { @@ -186,12 +179,12 @@ } public ProcessDefinitionQuery processDefinitionId(String id) { - this.id = id; + this.id = new String[] { id }; return this; } public ProcessDefinitionQuery processDefinitionKey(String key) { - this.key = key; + this.key = new String[] { key }; return this; } @@ -206,17 +199,18 @@ } public ProcessDefinitionQuery processDefinitionNameLike(String name) { - this.nameLike = name; + this.name = new String[] { name }; + parameterOperators.put("name", QueryOperator.LIKE); return this; } public ProcessDefinitionQuery processDefinitionName(String name) { - this.name = name; + this.name = new String[] { name }; return this; } public ProcessDefinitionQuery deploymentId(String deploymentId) { - this.deploymentId = deploymentId; + this.deploymentId = new Long[] { Long.valueOf(deploymentId) }; return this; } @@ -235,30 +229,33 @@ return this; } - public ProcessDefinitionQuery deploymentId(String deploymentId, QueryOperand operand) { - this.deploymentId = deploymentId; - parameterOperands.put("deploymentId", operand); + public ProcessDefinitionQuery deploymentId(QueryOperator operator, String... deploymentId) { + this.deploymentId = new Long[deploymentId.length]; + for (int i = 0; i < deploymentId.length; i++) { + this.deploymentId[i] = Long.valueOf(deploymentId[i]); + } + parameterOperators.put("deploymentId", operator); return this; } - public ProcessDefinitionQuery processDefinitionId(String processDefinitionId, QueryOperand operand) { + public ProcessDefinitionQuery processDefinitionId(QueryOperator operator, String... processDefinitionId) { this.id = processDefinitionId; - parameterOperands.put("processDefinitionId", operand); + parameterOperators.put("processDefinitionId", operator); return this; } - public ProcessDefinitionQuery processDefinitionKey(String key, QueryOperand operand) { - this.key = key; - parameterOperands.put("key", operand); + public ProcessDefinitionQuery processDefinitionKey(QueryOperator operator, String... processDefinitionKey) { + this.key = processDefinitionKey; + parameterOperators.put("key", operator); return this; } - public ProcessDefinitionQuery processDefinitionName(String name, QueryOperand operand) { - this.name = name; - parameterOperands.put("name", operand); + public ProcessDefinitionQuery processDefinitionName(QueryOperator operator, String... processDefinitionName) { + this.name = processDefinitionName; + parameterOperators.put("name", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessInstanceQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -26,7 +26,7 @@ import org.hibernate.Query; import org.jbpm.api.ProcessInstance; import org.jbpm.api.ProcessInstanceQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -38,11 +38,11 @@ private static final long serialVersionUID = 1L; - protected String processDefinitionId; - protected String processInstanceId; - protected String processInstanceKey; + protected String[] processDefinitionId; + protected String[] processInstanceId; + protected String[] processInstanceKey; protected Boolean suspended; - protected String initiator; + protected String[] initiator; public ProcessInstance uniqueResult() { return (ProcessInstance)untypedUniqueResult(); @@ -52,7 +52,7 @@ return CollectionUtil.checkList(untypedList(), ProcessInstance.class); } - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -77,19 +77,19 @@ } if (processInstanceId != null) { - appendWhereClauseWithOperand("processInstance.processInstance.id", "processInstanceId", hql); + appendWhereClauseWithOperator("processInstance.processInstance.id", "processInstanceId", hql); } if (processDefinitionId != null) { - appendWhereClauseWithOperand("processInstance.processDefinitionId", "processDefinitionId", hql); + appendWhereClauseWithOperator("processInstance.processDefinitionId", "processDefinitionId", hql); } if (processInstanceKey != null) { - appendWhereClauseWithOperand("processInstance.key", "processInstanceKey", hql); + appendWhereClauseWithOperator("processInstance.key", "processInstanceKey", hql); } if (initiator!=null) { - appendWhereClauseWithOperand("processInstance.initiator", "initiator", hql); + appendWhereClauseWithOperator("processInstance.initiator", "initiator", hql); } appendOrderByClause(hql); @@ -99,19 +99,19 @@ protected void applyParameters(Query query) { if (processInstanceId != null) { - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } if (processDefinitionId != null) { - applyParameterWithOperand(processDefinitionId, "processDefinitionId", String.class, query); + applyParameterWithOperator("processDefinitionId", processDefinitionId, query); } if (processInstanceKey != null) { - applyParameterWithOperand(processInstanceKey, "processInstanceKey", String.class, query); + applyParameterWithOperator("processInstanceKey", processInstanceKey, query); } if (initiator!=null) { - applyParameterWithOperand(initiator, "initiator", String.class, query); + applyParameterWithOperator("initiator", initiator, query); } } @@ -131,12 +131,12 @@ } public ProcessInstanceQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } public ProcessInstanceQuery processDefinitionId(String processDefinitionId) { - this.processDefinitionId = processDefinitionId; + this.processDefinitionId = new String[] { processDefinitionId }; return this; } @@ -146,12 +146,12 @@ } public ProcessInstanceQuery processInstanceKey(String processInstanceKey) { - this.processInstanceKey = processInstanceKey; + this.processInstanceKey = new String[] { processInstanceKey }; return this; } public ProcessInstanceQuery initiator(String user) { - this.initiator = user; + this.initiator = new String[] { user }; return this; } @@ -159,33 +159,33 @@ this.suspended = false; return this; } - public String operand(String parameter, QueryOperand operand) { - parameterOperands.put(parameter, operand); + public String operator(String parameter, QueryOperator operator) { + parameterOperators.put(parameter, operator); return parameter; } - public ProcessInstanceQuery processDefinitionId(String processDefinitionId, QueryOperand operand) { + public ProcessInstanceQuery processDefinitionId(QueryOperator operator, String... processDefinitionId) { this.processDefinitionId = processDefinitionId; - parameterOperands.put("processDefinitionId", operand); + parameterOperators.put("processDefinitionId", operator); return this; } - public ProcessInstanceQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public ProcessInstanceQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } - public ProcessInstanceQuery processInstanceKey(String processInstanceKey, QueryOperand operand) { + public ProcessInstanceQuery processInstanceKey(QueryOperator operator, String... processInstanceKey) { this.processInstanceKey = processInstanceKey; - parameterOperands.put("processInstanceKey", operand); + parameterOperators.put("processInstanceKey", operator); return this; } - public ProcessInstanceQuery initiator(String user, QueryOperand operand) { - this.initiator = user; - parameterOperands.put("initiator", operand); + public ProcessInstanceQuery initiator(QueryOperator operator, String... userId) { + this.initiator = userId; + parameterOperators.put("initiator", operator); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -30,7 +30,7 @@ import org.hibernate.Session; import org.jbpm.api.JbpmException; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.TaskQuery; import org.jbpm.api.identity.Group; import org.jbpm.api.task.Task; @@ -54,13 +54,13 @@ private static final Log log = Log.getLog(TaskQueryImpl.class.getName()); protected boolean unassigned; - protected String assignee; + protected String[] assignee; protected String candidate; protected Boolean suspended; - protected String executionId; - protected String processInstanceId; - protected String processDefinitionId; - protected String activityName; + protected String[] executionId; + protected String[] processInstanceId; + protected String[] processDefinitionId; + protected String[] activityName; /* groupIds transports the groupIds from the hql to the applyParameters */ protected List<String> groupIds; @@ -69,7 +69,7 @@ if (candidate != null) { throw new JbpmException("assignee(...) cannot be combined with candidate(...) in one query"); } - this.assignee = assignee; + this.assignee = new String[] { assignee }; return this; } @@ -79,22 +79,22 @@ } public TaskQuery executionId(String executionId) { - this.executionId = executionId; + this.executionId = new String[] { executionId }; return this; } public TaskQuery processInstanceId(String processInstanceId) { - this.processInstanceId = processInstanceId; + this.processInstanceId = new String[] { processInstanceId }; return this; } public TaskQuery processDefinitionId(String processDefinitionId) { - this.processDefinitionId = processDefinitionId; + this.processDefinitionId = new String[] { processDefinitionId }; return this; } public TaskQuery activityName(String activityName) { - this.activityName = activityName; + this.activityName = new String[] { activityName }; return this; } @@ -135,7 +135,7 @@ if (log.isDebugEnabled()) { log.debug("setting parameter assignee: " + assignee); } - applyParameterWithOperand(assignee, "assignee", String.class, query); + applyParameterWithOperator("assignee", assignee, query); } // canidate parameter @@ -158,32 +158,32 @@ if (log.isDebugEnabled()) { log.debug("setting parameter executionId: " + executionId); } - applyParameterWithOperand(executionId, "executionId", String.class, query); + applyParameterWithOperator("executionId", executionId, query); } if (processInstanceId != null) { if (log.isDebugEnabled()) { log.debug("setting parameter processInstanceId: " + processInstanceId); } - applyParameterWithOperand(processInstanceId, "processInstanceId", String.class, query); + applyParameterWithOperator("processInstanceId", processInstanceId, query); } if (activityName != null) { if (log.isDebugEnabled()) { log.debug("setting parameter activityName: " + activityName); } - applyParameterWithOperand(activityName, "activityName", String.class, query); + applyParameterWithOperator("activityName", activityName, query); } if (processDefinitionId != null) { if (log.isDebugEnabled()) { log.debug("setting parameter processDefinitionId: " + processDefinitionId); } - applyParameterWithOperand(processDefinitionId, "processDefinitionId", String.class, query); + applyParameterWithOperator("processDefinitionId", processDefinitionId, query); } } - public String hql() { + protected String hql() { StringBuilder hql = new StringBuilder(); hql.append("select "); @@ -236,23 +236,23 @@ } if (executionId != null) { - appendWhereClauseWithOperand("task.execution.id", "executionId", hql); + appendWhereClauseWithOperator("task.execution.id", "executionId", hql); } if (processInstanceId != null) { - appendWhereClauseWithOperand("task.processInstance.id", "processInstanceId", hql); + appendWhereClauseWithOperator("task.processInstance.id", "processInstanceId", hql); } if (activityName != null) { - appendWhereClauseWithOperand("task.execution.activityName", "activityName", hql); + appendWhereClauseWithOperator("task.execution.activityName", "activityName", hql); } if (processDefinitionId != null) { - appendWhereClauseWithOperand("task.processInstance.processDefinitionId", "processDefinitionId", hql); + appendWhereClauseWithOperator("task.processInstance.processDefinitionId", "processDefinitionId", hql); } if (assignee != null) { - appendWhereClauseWithOperand("task.assignee", "assignee", hql); + appendWhereClauseWithOperator("task.assignee", "assignee", hql); } else if (unassigned) { appendWhereClause("task.assignee is null ", hql); } @@ -298,37 +298,37 @@ return (Task) untypedUniqueResult(); } - public TaskQuery activityName(String activityName, QueryOperand operand) { + public TaskQuery activityName(QueryOperator operator, String... activityName) { this.activityName = activityName; - parameterOperands.put("activityName", operand); + parameterOperators.put("activityName", operator); return this; } - public TaskQuery assignee(String userId, QueryOperand operand) { + public TaskQuery assignee(QueryOperator operator, String... userId) { this.assignee = userId; - parameterOperands.put("assignee", operand); + parameterOperators.put("assignee", operator); return this; } - public TaskQuery executionId(String executionId, QueryOperand operand) { + public TaskQuery executionId(QueryOperator operator, String... executionId) { this.executionId = executionId; - parameterOperands.put("executionId", operand); + parameterOperators.put("executionId", operator); return this; } - public TaskQuery processDefinitionId(String processDefinitionId, QueryOperand operand) { + public TaskQuery processDefinitionId(QueryOperator operator, String... processDefinitionId) { this.processDefinitionId = processDefinitionId; - parameterOperands.put("processDefinitionId", operand); + parameterOperators.put("processDefinitionId", operator); return this; } - public TaskQuery processInstanceId(String processInstanceId, QueryOperand operand) { + public TaskQuery processInstanceId(QueryOperator operator, String... processInstanceId) { this.processInstanceId = processInstanceId; - parameterOperands.put("processInstanceId", operand); + parameterOperators.put("processInstanceId", operator); return this; } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessEndTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -30,7 +30,7 @@ import org.jbpm.api.Execution; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.task.Task; import org.jbpm.test.JbpmTestCase; @@ -71,12 +71,12 @@ taskService.completeTask(taskList.get(0).getId()); - List<HistoryProcessInstance> history = historyService.createHistoryProcessInstanceQuery().processInstanceId("sp2%", QueryOperand.LIKE).list(); + List<HistoryProcessInstance> history = historyService.createHistoryProcessInstanceQuery().processInstanceId(QueryOperator.LIKE, "sp2%").list(); assertNotNull(history); assertNotNull(history.get(0).getSuperProcessInstanceId()); assertEquals(execIdSp2, history.get(0).getSuperProcessInstanceId()); - history = historyService.createHistoryProcessInstanceQuery().processInstanceId("sp1%", QueryOperand.LIKE).list(); + history = historyService.createHistoryProcessInstanceQuery().processInstanceId(QueryOperator.LIKE, "sp1%").list(); assertNotNull(history); assertNotNull(history.get(0).getSuperProcessInstanceId()); assertEquals(execIdSp1, history.get(0).getSuperProcessInstanceId()); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -27,7 +27,7 @@ import java.util.List; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.task.Task; import org.jbpm.test.JbpmTestCase; @@ -154,7 +154,7 @@ assertEquals(0, executionService.createProcessInstanceQuery().list().size()); - List<HistoryProcessInstance> history = historyService.createHistoryProcessInstanceQuery().processInstanceId("SubProcessReview%", QueryOperand.LIKE).list(); + List<HistoryProcessInstance> history = historyService.createHistoryProcessInstanceQuery().processInstanceId(QueryOperator.LIKE, "SubProcessReview%").list(); assertNotNull(history); assertNotNull(history.get(0).getSuperProcessInstanceId()); assertEquals(processInstance.getId(), history.get(0).getSuperProcessInstanceId()); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskReassignTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskReassignTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskReassignTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -23,7 +23,6 @@ import java.util.List; -import org.jbpm.api.ProcessInstance; import org.jbpm.api.history.HistoryTask; import org.jbpm.api.task.Task; import org.jbpm.test.JbpmTestCase; @@ -46,7 +45,7 @@ "</process>" ); - ProcessInstance pi = executionService.startProcessInstanceByKey("ReassignTest"); + executionService.startProcessInstanceByKey("ReassignTest"); List<Task> tasks = taskService.findPersonalTasks("shekharv"); assertTrue(tasks.size() == 1); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -22,14 +22,15 @@ package org.jbpm.test.query; import java.util.ArrayList; -import java.util.HashSet; +import java.util.Arrays; +import java.util.Collections; import java.util.List; -import java.util.Set; import org.hibernate.exception.SQLGrammarException; + import org.jbpm.api.Deployment; import org.jbpm.api.DeploymentQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; @@ -40,44 +41,27 @@ public class DeploymentQueryTest extends JbpmTestCase { public void testSuspendDeployment() { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); - repositoryService.suspendDeployment(deploymentIds.get(2)); + // suspend one deployment + repositoryService.suspendDeployment(deploymentIds[2]); // find all deployments - List<Deployment> deployments = repositoryService.createDeploymentQuery().list(); + assertEquals(Arrays.asList("Claim", "Hire", "Fire"), getDeploymentNames(deployments)); - Set<String> expectedDeploymentNames = new HashSet<String>(); - expectedDeploymentNames.add("Claim"); - expectedDeploymentNames.add("Hire"); - expectedDeploymentNames.add("Fire"); - - assertEquals(expectedDeploymentNames, getDeploymentNames(deployments)); - // find suspended deployments - deployments = repositoryService.createDeploymentQuery().suspended().list(); + assertEquals(Collections.singletonList("Fire"), getDeploymentNames(deployments)); - expectedDeploymentNames = new HashSet<String>(); - expectedDeploymentNames.add("Hire"); - - assertEquals(expectedDeploymentNames, getDeploymentNames(deployments)); - // find active deployments - deployments = repositoryService.createDeploymentQuery().notSuspended().list(); + assertEquals(Arrays.asList("Claim", "Hire"), getDeploymentNames(deployments)); - expectedDeploymentNames = new HashSet<String>(); - expectedDeploymentNames.add("Claim"); - expectedDeploymentNames.add("Fire"); - - assertEquals(expectedDeploymentNames, getDeploymentNames(deployments)); - deleteCascade(deploymentIds); } - private void deleteCascade(List<String> deploymentIds) { + private void deleteCascade(String[] deploymentIds) { for (String deploymentId : deploymentIds) { repositoryService.deleteDeploymentCascade(deploymentId); } @@ -88,7 +72,7 @@ } public void testCount() { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); assertEquals(3, repositoryService.createDeploymentQuery().count()); for (String deploymentId : deploymentIds) { @@ -98,7 +82,7 @@ } Deployment deployment = repositoryService.createDeploymentQuery() - .deploymentId(deploymentIds.get(0)) + .deploymentId(deploymentIds[0]) .uniqueResult(); repositoryService.suspendDeployment(deployment.getId()); @@ -109,21 +93,21 @@ } public void testEquals() { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); assertEquals(1, repositoryService.createDeploymentQuery() - .deploymentId(deploymentIds.get(0), QueryOperand.EQUALS) + .deploymentId(QueryOperator.EQUALS, deploymentIds[0]) .count()); deleteCascade(deploymentIds); } public void testLike() { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); try { assertEquals(1, repositoryService.createDeploymentQuery() - .deploymentId(deploymentIds.get(0), QueryOperand.LIKE) + .deploymentId(QueryOperator.LIKE, deploymentIds[0]) .count()); } catch (SQLGrammarException e) { @@ -134,20 +118,20 @@ } public void testIn() { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); assertEquals(2, repositoryService.createDeploymentQuery() - .deploymentId(deploymentIds.get(0) + "," + deploymentIds.get(1), QueryOperand.IN) + .deploymentId(QueryOperator.IN, deploymentIds[0], deploymentIds[1]) .count()); deleteCascade(deploymentIds); } public void testNotIn() { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); assertEquals(2, repositoryService.createDeploymentQuery() - .deploymentId(deploymentIds.get(0), QueryOperand.NOT_IN) + .deploymentId(QueryOperator.NOT_IN, deploymentIds[0]) .count()); deleteCascade(deploymentIds); @@ -157,17 +141,15 @@ * HELPER METHODS * -------------- */ - private Set<String> getDeploymentNames(List<Deployment> deployments) { - Set<String> deploymentNames = new HashSet<String>(); + private static List<String> getDeploymentNames(List<Deployment> deployments) { + List<String> deploymentNames = new ArrayList<String>(); for (Deployment deployment : deployments) { deploymentNames.add(deployment.getName()); } return deploymentNames; } - private List<String> deployTestProcesses() { - List<String> processIds = new ArrayList<String>(); - + private String[] deployTestProcesses() { String deploymentClaimId = repositoryService.createDeployment() .setName("Claim") .addResourceFromString("process.jpdl.xml", @@ -201,11 +183,7 @@ "</process>") .deploy(); - processIds.add(deploymentClaimId); - processIds.add(deploymentFireId); - processIds.add(deploymentHireId); - - return processIds; + return new String[] { deploymentClaimId, deploymentHireId, deploymentFireId }; } private void testOrderByNaturalOrdening(String property, int expectedNrOfResults) { @@ -216,7 +194,7 @@ private void testOrderBy(String property, List expectedValues, Integer expectedNrOfResults, boolean naturalOrderCheck) { - List<String> deploymentIds = deployTestProcesses(); + String[] deploymentIds = deployTestProcesses(); List<Deployment> deploymentsAsc = repositoryService.createDeploymentQuery() .orderAsc(property) Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -30,7 +30,7 @@ import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryActivityInstance; import org.jbpm.api.history.HistoryActivityInstanceQuery; import org.jbpm.pvm.internal.util.Clock; @@ -108,43 +108,49 @@ public void testQueryByExecutionIdLike() { deployStartAndSignalTestProcesses(); - assertEquals(9, historyService.createHistoryActivityInstanceQuery().executionId("abc%", QueryOperand.LIKE).list().size()); - + assertEquals(9, historyService.createHistoryActivityInstanceQuery() + .executionId(QueryOperator.LIKE, "abc%") + .count()); } public void testQueryByExecutionIdIn() { List<String> ids = deployStartAndSignalTestProcesses(); - assertEquals(6, historyService.createHistoryActivityInstanceQuery().executionId(ids.get(0) + "," + ids.get(1), QueryOperand.IN).list().size()); - + assertEquals(6, historyService.createHistoryActivityInstanceQuery() + .executionId(QueryOperator.IN, ids.get(0), ids.get(1)) + .count()); } public void testQueryByExecutionIdNotIn() { List<String> ids = deployStartAndSignalTestProcesses(); - assertEquals(3, historyService.createHistoryActivityInstanceQuery().executionId(ids.get(0) + "," + ids.get(1), QueryOperand.NOT_IN).list().size()); - + assertEquals(3, historyService.createHistoryActivityInstanceQuery() + .executionId(QueryOperator.NOT_IN, ids.get(0), ids.get(1)) + .count()); } public void testQueryByProcessInstanceIdLike() { deployStartAndSignalTestProcesses(); - assertEquals(9, historyService.createHistoryActivityInstanceQuery().processInstanceId("abc%", QueryOperand.LIKE).list().size()); - + assertEquals(9, historyService.createHistoryActivityInstanceQuery() + .processInstanceId(QueryOperator.LIKE, "abc%") + .count()); } public void testQueryByProcessInstanceIdIn() { List<String> ids = deployStartAndSignalTestProcesses(); - assertEquals(6, historyService.createHistoryActivityInstanceQuery().processInstanceId(ids.get(0) + "," + ids.get(1), QueryOperand.IN).list().size()); - + assertEquals(6, historyService.createHistoryActivityInstanceQuery() + .processInstanceId(QueryOperator.IN, ids.get(0), ids.get(1)) + .count()); } public void testQueryByProcessInstanceIdNotIn() { List<String> ids = deployStartAndSignalTestProcesses(); - assertEquals(3, historyService.createHistoryActivityInstanceQuery().processInstanceId(ids.get(0) + "," + ids.get(1), QueryOperand.NOT_IN).list().size()); - + assertEquals(3, historyService.createHistoryActivityInstanceQuery() + .processInstanceId(QueryOperator.NOT_IN, ids.get(0), ids.get(1)) + .count()); } public void testQueryByProcessDefinitionIdLike() { @@ -153,8 +159,9 @@ generateHistoryForTestProcessWithTask(); deployTestProcessWithTask(); - assertEquals(12, historyService.createHistoryActivityInstanceQuery().processInstanceId("abc%", QueryOperand.LIKE).list().size()); - + assertEquals(12, historyService.createHistoryActivityInstanceQuery() + .processInstanceId(QueryOperator.LIKE, "abc%") + .count()); } public void testQueryByProcessDefinitionIdIn() { @@ -163,9 +170,9 @@ List<String> idsTask = generateHistoryForTestProcessWithTask(); List<String> ids = deployStartAndSignalTestProcesses(); - - assertEquals(6, historyService.createHistoryActivityInstanceQuery().processInstanceId(ids.get(0) + "," + idsTask.get(0), QueryOperand.IN).list().size()); - + assertEquals(6, historyService.createHistoryActivityInstanceQuery() + .processInstanceId(QueryOperator.IN, ids.get(0), idsTask.get(0)) + .count()); } public void testQueryByProcessDefinitionIdNotIn() { @@ -174,8 +181,9 @@ List<String> idsTask = generateHistoryForTestProcessWithTask(); List<String> ids = deployStartAndSignalTestProcesses(); - assertEquals(15, historyService.createHistoryActivityInstanceQuery().processInstanceId(ids.get(0) + "," + idsTask.get(0), QueryOperand.NOT_IN).list().size()); - + assertEquals(15, historyService.createHistoryActivityInstanceQuery() + .processInstanceId(QueryOperator.NOT_IN, ids.get(0), idsTask.get(0)) + .count()); } // Currently only verifies the size of the result set @@ -222,20 +230,23 @@ public void testQueryByActivityNameLike() { deployStartAndSignalTestProcesses(); - assertEquals(9, historyService.createHistoryActivityInstanceQuery().activityName("%", QueryOperand.LIKE).list().size()); - + assertEquals(9, historyService.createHistoryActivityInstanceQuery() + .activityName(QueryOperator.LIKE, "%") + .count()); } public void testQueryByActivityNameIn() { deployStartAndSignalTestProcesses(); - assertEquals(6, historyService.createHistoryActivityInstanceQuery().activityName("a,c", QueryOperand.IN).list().size()); - + assertEquals(6, historyService.createHistoryActivityInstanceQuery() + .activityName(QueryOperator.IN, "a", "c") + .count()); } public void testQueryByActivityNameNotIn() { deployStartAndSignalTestProcesses(); - assertEquals(2, historyService.createHistoryActivityInstanceQuery().activityName("a,b", QueryOperand.NOT_IN).list().size()); - + assertEquals(2, historyService.createHistoryActivityInstanceQuery() + .activityName(QueryOperator.NOT_IN, "a", "b") + .count()); } //Currently only verifies the size of the result set @@ -434,7 +445,7 @@ // last check execution ids to illustrate that for task with timer it is not same as process instance id assertEquals(ids.get(0), history.get(0).getExecutionId()); - assertTrue(history.get(1).getExecutionId().startsWith(ids.get(0) + ".b.")); + assertTrue(history.get(1).getExecutionId().startsWith(ids.get(0) + ".b.")); assertEquals(ids.get(0), history.get(2).getExecutionId()); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryProcessInstanceQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -30,7 +30,7 @@ import java.util.List; import org.jbpm.api.ProcessDefinition; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.api.history.HistoryProcessInstanceQuery; import org.jbpm.pvm.internal.util.Clock; @@ -92,58 +92,51 @@ createTestHistoryProcessInstances(7); assertEquals(7, historyService.createHistoryProcessInstanceQuery() - .processInstanceId("theProcess%", QueryOperand.LIKE) + .processInstanceId(QueryOperator.LIKE, "theProcess%") .count()); - } public void testQueryByProcessInstanceIdIn() { List<String> procInstIds = createTestHistoryProcessInstances(7); assertEquals(2, historyService.createHistoryProcessInstanceQuery() - .processInstanceId(procInstIds.get(0) + "," + procInstIds.get(1), QueryOperand.IN) + .processInstanceId(QueryOperator.IN, procInstIds.get(0), procInstIds.get(1)) .count()); - } public void testQueryByProcessInstanceIdNotIn() { List<String> procInstIds = createTestHistoryProcessInstances(7); assertEquals(5, historyService.createHistoryProcessInstanceQuery() - .processInstanceId(procInstIds.get(0) + "," + procInstIds.get(1), QueryOperand.NOT_IN) + .processInstanceId(QueryOperator.NOT_IN, procInstIds.get(0), procInstIds.get(1)) .count()); - } public void testQueryByProcessInstanceKeyLike() { createTestHistoryProcessInstances(7); assertEquals(7, historyService.createHistoryProcessInstanceQuery() - .processInstanceKey("theProcess-%", QueryOperand.LIKE) + .processInstanceKey(QueryOperator.LIKE, "theProcess-%") .count()); - } public void testQueryByProcessInstanceKeyIn() { createTestHistoryProcessInstances(7); assertEquals(2, historyService.createHistoryProcessInstanceQuery() - .processInstanceKey("theProcess-1,theProcess-5", QueryOperand.IN) + .processInstanceKey(QueryOperator.IN, "theProcess-1", "theProcess-5") .count()); - } public void testQueryByProcessInstanceKeyNotIn() { createTestHistoryProcessInstances(7); assertEquals(4, historyService.createHistoryProcessInstanceQuery() - .processInstanceKey("theProcess-1,theProcess-5,theProcess-6", QueryOperand.NOT_IN) + .processInstanceKey(QueryOperator.NOT_IN, "theProcess-1", "theProcess-5", "theProcess-6") .count()); - } public void testQueryByInitiator() { - deployJpdlXmlString("<process name='theProcess'>" + " <start>" + " <transition to='wait' />" @@ -167,11 +160,9 @@ assertEquals(1, historyService.createHistoryProcessInstanceQuery().initiator("erik").count()); assertEquals(1, historyService.createHistoryProcessInstanceQuery().initiator("mike").count()); assertEquals(1, historyService.createHistoryProcessInstanceQuery().initiator("alex").count()); - } public void testQueryByInitiatorLike() { - deployJpdlXmlString("<process name='theProcess'>" + " <start>" + " <transition to='wait' />" @@ -191,9 +182,9 @@ processEngine.setAuthenticatedUserId("peter"); executionService.startProcessInstanceByKey("theProcess"); - assertEquals(4, historyService.createHistoryProcessInstanceQuery().initiator("%e%", QueryOperand.LIKE).count()); - - + assertEquals(4, historyService.createHistoryProcessInstanceQuery() + .initiator(QueryOperator.LIKE, "%e%") + .count()); } public void testOrderByStartTime() { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -30,7 +30,7 @@ import java.util.List; import org.jbpm.api.ProcessInstance; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryTask; import org.jbpm.api.history.HistoryTaskQuery; import org.jbpm.pvm.internal.util.Clock; @@ -110,7 +110,7 @@ createTestHistoryTasks(); assertEquals(2, historyService.createHistoryTaskQuery() - .assignee("%o%", QueryOperand.LIKE) + .assignee(QueryOperator.LIKE, "%o%") .count()); } @@ -118,7 +118,7 @@ createTestHistoryTasks(); assertEquals(2, historyService.createHistoryTaskQuery() - .assignee("Tom,Alex", QueryOperand.IN) + .assignee(QueryOperator.IN, "Tom", "Alex") .count()); } @@ -126,7 +126,7 @@ createTestHistoryTasks(); assertEquals(1, historyService.createHistoryTaskQuery() - .assignee("Tom,Alex", QueryOperand.NOT_IN) + .assignee(QueryOperator.NOT_IN, "Tom", "Alex") .count()); } @@ -134,7 +134,7 @@ createTestHistoryTasks(); try { - historyService.createHistoryTaskQuery().taskId("%", QueryOperand.LIKE).count(); + historyService.createHistoryTaskQuery().taskId(QueryOperator.LIKE, "%").count(); fail("expected number format exception"); } catch (NumberFormatException e) { @@ -146,7 +146,7 @@ List<String> taskIds = createTestHistoryTasks(); assertEquals(2, historyService.createHistoryTaskQuery() - .taskId(taskIds.get(0) + "," + taskIds.get(1), QueryOperand.IN) + .taskId(QueryOperator.IN, taskIds.get(0), taskIds.get(1)) .count()); } @@ -154,7 +154,7 @@ List<String> taskIds = createTestHistoryTasks(); assertEquals(1, historyService.createHistoryTaskQuery() - .taskId(taskIds.get(0) + "," + taskIds.get(1), QueryOperand.NOT_IN) + .taskId(QueryOperator.NOT_IN, taskIds.get(0), taskIds.get(1)) .count()); } @@ -162,7 +162,7 @@ createTestHistoryTasks(); assertEquals(3, historyService.createHistoryTaskQuery() - .executionId("theProcess%", QueryOperand.LIKE) + .executionId(QueryOperator.LIKE, "theProcess%") .count()); } @@ -170,7 +170,7 @@ createTestHistoryTasks(); assertEquals(3, historyService.createHistoryTaskQuery() - .state("%", QueryOperand.LIKE) + .state(QueryOperator.LIKE, "%") .count()); } @@ -178,7 +178,7 @@ createTestHistoryTasks(); assertEquals(3, historyService.createHistoryTaskQuery() - .state(HistoryTask.STATE_COMPLETED + "," + HistoryTask.STATE_OBSOLETE, QueryOperand.IN) + .state(QueryOperator.IN, HistoryTask.STATE_COMPLETED, HistoryTask.STATE_OBSOLETE) .count()); } @@ -186,7 +186,7 @@ createTestHistoryTasks(); assertEquals(0, historyService.createHistoryTaskQuery() - .state(HistoryTask.STATE_COMPLETED + "," + HistoryTask.STATE_OBSOLETE, QueryOperand.NOT_IN) + .state(QueryOperator.NOT_IN, HistoryTask.STATE_COMPLETED, HistoryTask.STATE_OBSOLETE) .count()); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/JobQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -26,7 +26,7 @@ import java.util.List; import org.jbpm.api.JobQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.job.Job; import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; @@ -141,39 +141,34 @@ assertEquals(1, managementService.createJobQuery().processInstanceId(id).count()); assertEquals(1, managementService.createJobQuery().processInstanceId(id).timers().count()); } - } public void testProcessIdLike() { startTestProcessInstances(6); JobQuery query = managementService.createJobQuery(); - assertEquals(6, query.processInstanceId("TimerQueryTest%", QueryOperand.LIKE).count()); - + assertEquals(6, query.processInstanceId(QueryOperator.LIKE, "TimerQueryTest%").count()); } public void testProcessIdEquals() { List<String> procInstIds = startTestProcessInstances(6); JobQuery query = managementService.createJobQuery(); - assertEquals(1, query.processInstanceId(procInstIds.get(0), QueryOperand.EQUALS).count()); - + assertEquals(1, query.processInstanceId(QueryOperator.EQUALS, procInstIds.get(0)).count()); } public void testProcessIdIn() { List<String> procInstIds = startTestProcessInstances(6); JobQuery query = managementService.createJobQuery(); - assertEquals(2, query.processInstanceId(""+procInstIds.get(0)+","+procInstIds.get(1)+"", QueryOperand.IN).count()); - + assertEquals(2, query.processInstanceId(QueryOperator.IN, procInstIds.get(0), procInstIds.get(1)).count()); } public void testProcessIdNotIn() { List<String> procInstIds = startTestProcessInstances(6); JobQuery query = managementService.createJobQuery(); - assertEquals(4, query.processInstanceId(""+procInstIds.get(0)+","+procInstIds.get(1)+"", QueryOperand.NOT_IN).count()); - + assertEquals(4, query.processInstanceId(QueryOperator.NOT_IN, procInstIds.get(0), procInstIds.get(1)).count()); } private List<String> startTestProcessInstances(int nrOfInstances) { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessDefinitionQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessDefinitionQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessDefinitionQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -25,10 +25,9 @@ import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.test.JbpmTestCase; - /** * @author Tom Baeyens */ @@ -127,7 +126,7 @@ ); List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery() - .processDefinitionNameLike("make%") + .processDefinitionKey(QueryOperator.LIKE, "make%") .orderAsc(ProcessDefinitionQuery.PROPERTY_ID) .list(); @@ -169,7 +168,8 @@ ); List<ProcessDefinition> processDefinitions = - repositoryService.createProcessDefinitionQuery().processDefinitionName("%make%", QueryOperand.LIKE) + repositoryService.createProcessDefinitionQuery() + .processDefinitionName(QueryOperator.LIKE, "%make%") .orderAsc(ProcessDefinitionQuery.PROPERTY_NAME) .list(); @@ -211,12 +211,11 @@ ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery(); List<ProcessDefinition> processDefinitions = - query.deploymentId(dbId1+","+dbId2, QueryOperand.IN) + query.deploymentId(QueryOperator.IN, dbId1, dbId2) .orderAsc(ProcessDefinitionQuery.PROPERTY_NAME) .list(); assertEquals(2, processDefinitions.size()); - } public void testQueryProcessDefinitionsNotIn() { @@ -252,11 +251,11 @@ List<ProcessDefinition> processDefinitions = - repositoryService.createProcessDefinitionQuery().deploymentId(dbId1+","+dbId2, QueryOperand.NOT_IN) + repositoryService.createProcessDefinitionQuery() + .deploymentId(QueryOperator.NOT_IN, dbId1, dbId2) .orderAsc(ProcessDefinitionQuery.PROPERTY_NAME) .list(); assertEquals(3, processDefinitions.size()); - } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/ProcessInstanceQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -31,11 +31,10 @@ import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessInstance; import org.jbpm.api.ProcessInstanceQuery; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.test.JbpmTestCase; - public class ProcessInstanceQueryTest extends JbpmTestCase { private static final String TEST_PROCESS_1_KEY = "testProcess1"; @@ -83,14 +82,12 @@ ProcessInstance pi = executionService.createProcessInstanceQuery() .processInstanceId(processInstanceId).uniqueResult(); assertNotNull(pi); - } for (String processInstanceId : idsForTestProcess2) { ProcessInstance pi = executionService.createProcessInstanceQuery() .processInstanceId(processInstanceId).uniqueResult(); assertNotNull(pi); - } } @@ -108,7 +105,6 @@ .processInstanceKey(TEST_PROCESS_2_KEY + "-" + i).uniqueResult(); assertNotNull(pi); } - } public void testQueryByProcessDefinitionId() { @@ -175,7 +171,6 @@ } else { assertTrue(processInstances.get(i).getKey().startsWith(TEST_PROCESS_2_KEY)); } - } } @@ -193,7 +188,6 @@ } else { assertTrue(processInstances.get(i).getKey().startsWith(TEST_PROCESS_1_KEY)); } - } } @@ -215,7 +209,6 @@ executionService.createProcessInstanceQuery().page(0, 3).count(); fail("expected exception"); } catch (JbpmException e) { } - } @@ -224,9 +217,9 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(4, executionService.createProcessInstanceQuery().processInstanceId("testProcess1.%", QueryOperand.LIKE).count()); + assertEquals(4, executionService.createProcessInstanceQuery().processInstanceId(QueryOperator.LIKE, "testProcess1.%").count()); - assertEquals(6, executionService.createProcessInstanceQuery().processInstanceId("testProcess2.%", QueryOperand.LIKE).count()); + assertEquals(6, executionService.createProcessInstanceQuery().processInstanceId(QueryOperator.LIKE, "testProcess2.%").count()); } public void testProcessDefinitionLike() { @@ -234,8 +227,7 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(10, executionService.createProcessInstanceQuery().processDefinitionId("testProcess%", QueryOperand.LIKE).count()); - + assertEquals(10, executionService.createProcessInstanceQuery().processDefinitionId(QueryOperator.LIKE, "testProcess%").count()); } public void testProcessInstanceKeyLike() { @@ -243,8 +235,7 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(4, executionService.createProcessInstanceQuery().processInstanceKey("testProcess1-%", QueryOperand.LIKE).count()); - + assertEquals(4, executionService.createProcessInstanceQuery().processInstanceKey(QueryOperator.LIKE, "testProcess1-%").count()); } public void testProcessInstanceIn() { @@ -254,18 +245,23 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(2, executionService.createProcessInstanceQuery().processInstanceId(idsForTestProcess1.get(0) + "," + idsForTestProcess1.get(1), QueryOperand.IN).count()); + assertEquals(2, executionService.createProcessInstanceQuery() + .processInstanceId(QueryOperator.IN, idsForTestProcess1.get(0), idsForTestProcess1.get(1)) + .count()); - assertEquals(2, executionService.createProcessInstanceQuery().processInstanceId(idsForTestProcess2.get(0) + "," + idsForTestProcess2.get(1), QueryOperand.IN).count()); + assertEquals(2, executionService.createProcessInstanceQuery() + .processInstanceId(QueryOperator.IN, idsForTestProcess2.get(0), idsForTestProcess2.get(1)) + .count()); } public void testProcessDefinitionIn() { - startTestProcesses(4, 6); + startTestProcesses(4, 6); assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(4, executionService.createProcessInstanceQuery().processDefinitionId("testProcess1-1,testProcess2", QueryOperand.IN).count()); - + assertEquals(4, executionService.createProcessInstanceQuery() + .processDefinitionId(QueryOperator.IN, "testProcess1-1", "testProcess2") + .count()); } public void testProcessInstanceKeyIn() { @@ -273,8 +269,9 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(2, executionService.createProcessInstanceQuery().processInstanceKey("testProcess1-0,testProcess1-1", QueryOperand.IN).count()); - + assertEquals(2, executionService.createProcessInstanceQuery() + .processInstanceKey(QueryOperator.IN, "testProcess1-0", "testProcess1-1") + .count()); } public void testProcessInstanceNotIn() { @@ -284,18 +281,23 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(8, executionService.createProcessInstanceQuery().processInstanceId(idsForTestProcess1.get(0) + "," + idsForTestProcess1.get(1), QueryOperand.NOT_IN).count()); + assertEquals(8, executionService.createProcessInstanceQuery() + .processInstanceId(QueryOperator.NOT_IN, idsForTestProcess1.get(0), idsForTestProcess1.get(1)) + .count()); - assertEquals(8, executionService.createProcessInstanceQuery().processInstanceId(idsForTestProcess2.get(0) + "," + idsForTestProcess2.get(1), QueryOperand.NOT_IN).count()); + assertEquals(8, executionService.createProcessInstanceQuery() + .processInstanceId(QueryOperator.NOT_IN, idsForTestProcess2.get(0), idsForTestProcess2.get(1)) + .count()); } public void testProcessDefinitionNotIn() { - startTestProcesses(4, 6); + startTestProcesses(4, 6); assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(6, executionService.createProcessInstanceQuery().processDefinitionId("testProcess1-1,testProcess2", QueryOperand.NOT_IN).count()); - + assertEquals(6, executionService.createProcessInstanceQuery() + .processDefinitionId(QueryOperator.NOT_IN, "testProcess1-1", "testProcess2") + .count()); } public void testProcessInstanceKeyNotIn() { @@ -303,8 +305,9 @@ assertEquals(10, executionService.createProcessInstanceQuery().count()); - assertEquals(8, executionService.createProcessInstanceQuery().processInstanceKey("testProcess1-0,testProcess1-1", QueryOperand.NOT_IN).count()); - + assertEquals(8, executionService.createProcessInstanceQuery() + .processInstanceKey(QueryOperator.NOT_IN, "testProcess1-0", "testProcess1-1") + .count()); } public void testQueryByProcessInstanceIdWithInitiator() { @@ -317,7 +320,7 @@ processEngine.setAuthenticatedUserId("alex"); ProcessInstance pi2 = executionService.startProcessInstanceByKey(TEST_PROCESS_2_KEY); - assertEquals(2, executionService.createProcessInstanceQuery().initiator("%e%", QueryOperand.LIKE).count()); + assertEquals(2, executionService.createProcessInstanceQuery().initiator(QueryOperator.LIKE, "%e%").count()); assertNotNull(pi.getInitiator()); assertEquals("mike", pi.getInitiator()); @@ -336,7 +339,7 @@ historypi = historyService.createHistoryProcessInstanceQuery().initiator("mike").uniqueResult(); assertNotNull(historypi); - assertEquals(2, historyService.createHistoryProcessInstanceQuery().initiator("%e%", QueryOperand.LIKE).count()); + assertEquals(2, historyService.createHistoryProcessInstanceQuery().initiator(QueryOperator.LIKE, "%e%").count()); } /** Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java 2010-09-10 22:51:00 UTC (rev 6657) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/TaskQueryTest.java 2010-09-14 04:04:29 UTC (rev 6658) @@ -29,26 +29,25 @@ import java.util.Date; import java.util.List; -import org.jbpm.api.QueryOperand; +import org.jbpm.api.QueryOperator; import org.jbpm.api.TaskQuery; import org.jbpm.api.task.Task; import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; - /** * @author Tom Baeyens */ public class TaskQueryTest extends JbpmTestCase { public void testPropertyNames() { - Task task = taskService.newTask(); - task.setName("write task query test"); - task.setAssignee("koen"); - task.setPriority(Integer.MAX_VALUE); - task.setDescription("make sure the test fails if property names are incorrect"); - task.setDuedate(new Date()); - String taskId = taskService.saveTask(task); + Task task = taskService.newTask(); + task.setName("write task query test"); + task.setAssignee("koen"); + task.setPriority(Integer.MAX_VALUE); + task.setDescription("make sure the test fails if property names are incorrect"); + task.setDuedate(new Date()); + String taskId = taskService.saveTask(task); checkProperty(taskService.createTaskQuery(), task, TaskQuery.PROPERTY_ASSIGNEE); checkProperty(taskService.createTaskQuery(), task, TaskQuery.PROPERTY_CREATEDATE); @@ -57,14 +56,14 @@ checkProperty(taskService.createTaskQuery(), task, TaskQuery.PROPERTY_PRIORITY); checkProperty(taskService.createTaskQuery(), task, TaskQuery.PROPERTY_PROGRESS); - taskService.deleteTaskCascade(taskId); + taskService.deleteTaskCascade(taskId); } private void checkProperty(TaskQuery taskQuery, Task task, String propertyName) { - List<Task> taskList = taskQuery.orderAsc(propertyName).list(); - assertNotNull(taskList); - assertContainsTask(taskList, task.getName()); - assertEquals(1, taskList.size()); + List<Task> taskList = taskQuery.orderAsc(propertyName).list(); + assertNotNull(taskList); + assertContainsTask(taskList, task.getName()); + assertEquals(1, taskList.size()); } public void testSimplestTaskQuery() { @@ -76,7 +75,7 @@ assertNotNull(taskList); assertContainsTask(taskList, "do laundry"); - assertContainsTask(taskList, "change dyper"); + assertContainsTask(taskList, "change diaper"); assertContainsTask(taskList, "start new business"); assertContainsTask(taskList, "find venture capital"); @@ -87,7 +86,7 @@ public void testOrderByName() { testOrderBy(TaskQuery.PROPERTY_NAME, - "change dyper", "do laundry", "find venture capital", "start new business"); + "change diaper", "do laundry", "find venture capital", "start new business"); } public void testOrderByAssignee() { @@ -136,7 +135,9 @@ public void testTaskQueryAssigneeLike() { List<Task> tasks = createTestTasks(); - assertEquals(2, taskService.createTaskQuery().assignee("%o%m", QueryOperand.LIKE).count()); + assertEquals(2, taskService.createTaskQuery() + .assignee(QueryOperator.LIKE, "%o%m") + .count()); deleteTasks(tasks); } @@ -144,7 +145,9 @@ public void testTaskQueryAssigneeIn() { List<Task> tasks = createTestTasks(); - assertEquals(2, taskService.createTaskQuery().assignee("Koen,Tom", QueryOperand.IN).count()); + assertEquals(2, taskService.createTaskQuery() + .assignee(QueryOperator.IN, "Koen", "Tom") + .count()); deleteTasks(tasks); } @@ -152,12 +155,13 @@ public void testTaskQueryAssigneeNotIn() { List<Task> tasks = createTestTasks(); - assertEquals(1, taskService.createTaskQuery().assignee("Koen,Tom,Alex", QueryOperand.NOT_IN).count()); + assertEquals(1, taskService.createTaskQuery() + .assignee(QueryOperator.NOT_IN, "Koen", "Tom", "Alex") + .count()); deleteTasks(tasks); } - /* ------------------------------------------------------------------- * HELPER METHODS * ------------------------------------------------------------------- */ @@ -173,7 +177,7 @@ task1.setProgress(15); Task task2 = taskService.newTask(); - task2.setName("change dyper"); + task2.setName("change diaper"); task2.setAssignee("Koen"); task2.setPriority(1); task2.setDuedate(stringToDate("28/06/1989")); @@ -232,7 +236,7 @@ try { return dateFormat.parse(dateString); } catch (ParseException e) { - throw new RuntimeException("Couldn't convert " + dateString); + throw new AssertionError(e); } }

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6657 - jbpm4/trunk/qa.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-10 18:51:00 -0400 (Fri, 10 Sep 2010) New Revision: 6657 Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh jbpm4/trunk/qa/hudson-jbpm4-jboss.sh jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh Log: make hudson shell scripts produce more information to aid in repairing failures Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-db.sh 2010-09-10 21:34:51 UTC (rev 6656) +++ jbpm4/trunk/qa/hudson-jbpm4-db.sh 2010-09-10 22:51:00 UTC (rev 6657) @@ -2,13 +2,14 @@ # # runs the database test suite +mvn -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +JBPM_VERSION=`grep '^4\.' $WORKSPACE/version.txt` + export MAVEN_OPTS="-Ddatabase=$DATABASE" - -JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION $MAVEN_OPTS" # build distribution -mvn -q -U -Pdistro clean install +mvn -U -Pdistro clean install # set up ant -f qa/build.xml testsuite.db.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-09-10 21:34:51 UTC (rev 6656) +++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-09-10 22:51:00 UTC (rev 6657) @@ -2,14 +2,15 @@ # # runs the jboss integration test suite +mvn -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +JBPM_VERSION=`grep '^4\.' $WORKSPACE/version.txt` + export MAVEN_OPTS="-Dbind.address=$MYTESTIP_1" - -JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION $MAVEN_OPTS" # build distribution -mvn -q -U -Pdistro,enterprise clean install +mvn -U -Pdistro,enterprise clean install # set up ant -f qa/build.xml testsuite.enterprise.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-09-10 21:34:51 UTC (rev 6656) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-09-10 22:51:00 UTC (rev 6657) @@ -2,14 +2,15 @@ # # runs the jboss integration test suite +mvn -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +JBPM_VERSION=`grep '^4\.' $WORKSPACE/version.txt` + export MAVEN_OPTS="-Dbind.address=$MYTESTIP_1" - -JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION $MAVEN_OPTS" # build distribution -mvn -q -U -Pdistro,integration clean install +mvn -U -Pdistro,integration clean install # set up ant -f qa/build.xml testsuite.jboss.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-09-10 21:34:51 UTC (rev 6656) +++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-09-10 22:51:00 UTC (rev 6657) @@ -2,14 +2,15 @@ # # runs the tomcat integration test suite +mvn -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +JBPM_VERSION=`grep '^4\.' $WORKSPACE/version.txt` + export MAVEN_OPTS="-Dbind.address=$MYTESTIP_1" - -JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ -Dtomcat.distro.dir=tomcat.downloads $MAVEN_OPTS" # build distribution -mvn -q -U -Pdistro,integration clean install +mvn -U -Pdistro,integration clean install # set up ant -f qa/build.xml testsuite.tomcat.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh 2010-09-10 21:34:51 UTC (rev 6656) +++ jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh 2010-09-10 22:51:00 UTC (rev 6657) @@ -2,14 +2,15 @@ # # runs the upgrade tests +mvn -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +JBPM_VERSION=`grep '^4\.' $WORKSPACE/version.txt` + export MAVEN_OPTS="-Dold.jbpm.version=$OLD_JBPM_VERSION -Ddatabase=$DATABASE" - -JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION $MAVEN_OPTS" # build distribution -mvn -q -f qa/upgrade/pom.xml dependency:copy -mvn -q -U -Pdistro,integration clean install +mvn -f qa/upgrade/pom.xml dependency:copy +mvn -U -Pdistro,integration clean install # set up ant -f qa/build.xml testsuite.upgrade.setup # run test suite

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6656 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-10 17:34:51 -0400 (Fri, 10 Sep 2010) New Revision: 6656 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java Log: JBPM-2813 avoid two successive calls to Clock.getTime; log past due date message at debug level Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java 2010-09-10 03:39:56 UTC (rev 6655) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/BusinessCalendarImpl.java 2010-09-10 21:34:51 UTC (rev 6656) @@ -27,7 +27,6 @@ import java.util.GregorianCalendar; import java.util.TimeZone; -import org.jbpm.api.JbpmException; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.util.Clock; @@ -109,16 +108,17 @@ end = dayPart.subtract(date, millis, duration.isBusinessTime()); } - if (end.before(Clock.getTime())) { - if (log.isWarnEnabled()) { - log.warn("Duedate : [" + end + "] in the past of start : [" + date + "]"); - } - return Clock.getTime(); + Date currentTime = Clock.getTime(); + if (end.before(currentTime)) { + // log at debug level to avoid attracting attention over a valid case + if (log.isDebugEnabled()) { + log.debug("due date is in the past: " + end); + } + return currentTime; } return end; } - public Date add(Date date, Duration duration) { Date end = null; DayPart dayPart = null; @@ -198,21 +198,21 @@ } protected Date findStartOfPreviousDay(Date date) { - Calendar calendar = createCalendar(); - calendar.setTime(date); - calendar.add(Calendar.DATE, -1); - calendar.set(Calendar.HOUR_OF_DAY, 23); - calendar.set(Calendar.MINUTE, 59); - calendar.set(Calendar.SECOND, 59); - calendar.set(Calendar.MILLISECOND, 999); - date = calendar.getTime(); - while(isHoliday(date)) { - calendar.setTime(date); - calendar.add(Calendar.DATE, -1); - date = calendar.getTime(); - } - return date; - } + Calendar calendar = createCalendar(); + calendar.setTime(date); + calendar.add(Calendar.DATE, -1); + calendar.set(Calendar.HOUR_OF_DAY, 23); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); + calendar.set(Calendar.MILLISECOND, 999); + date = calendar.getTime(); + while(isHoliday(date)) { + calendar.setTime(date); + calendar.add(Calendar.DATE, -1); + date = calendar.getTime(); + } + return date; + } public Calendar createCalendar() { return new GregorianCalendar(); @@ -267,8 +267,6 @@ return nextDayPart; } - - // getters and setters ////////////////////////////////////////////////////// public long getBusinessDayInMillis() {

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6655 - in jbpm3/branches/jbpm-3.2-soa/modules/core: scripts and 7 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-09 23:39:56 -0400 (Thu, 09 Sep 2010) New Revision: 6655 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition1.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition2.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml Log: JBPM-2908 prevent stack overflow when parsing alternate configuration resource from action handler; remember JbpmConfiguration in which ProcessClassLoader was created Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-09 16:22:28 UTC (rev 6654) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -163,6 +163,7 @@ <configuration> <tasks> <property name="database" value="${database}" /> + <property name="project.output.dir" value="${project.build.outputDirectory}" /> <ant antfile="scripts/antrun-config.xml" target="gen-hibernate-config" /> </tasks> </configuration> @@ -194,6 +195,85 @@ </profile>  + <profile> + <id>no-database</id> + <activation> + <property> + <name>!database</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>no-hibernate-auto-create</id> + <phase>process-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="project.output.dir" + value="${project.build.outputDirectory}" /> + <property name="project.test.output.dir" + value="${project.build.testOutputDirectory}" /> + <ant antfile="scripts/antrun-config.xml" + target="gen-hibernate-config-no-auto" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>hsqldb</id> + <activation> + <property> + <name>database</name> + <value>hsqldb</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>no-hibernate-auto-create</id> + <phase>process-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="project.output.dir" + value="${project.build.outputDirectory}" /> + <property name="project.test.output.dir" + value="${project.build.testOutputDirectory}" /> + <ant antfile="scripts/antrun-config.xml" + target="gen-hibernate-config-no-auto" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + +  Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-09-09 16:22:28 UTC (rev 6654) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -8,10 +8,9 @@  <project name="gen-config"> + <property name="project.output.dir" value="${basedir}/target/classes" /> + <property name="project.test.output.dir" value="${basedir}/target/classes" /> - <property name="project.build.directory" value="${basedir}/target" /> - <property name="build.resources.directory" value="${basedir}/target/classes" /> - <macrodef name="macro-disable"> <attribute name="file" /> <attribute name="section" /> @@ -41,7 +40,7 @@ <attribute name="database" /> <sequential> <available property="@{database}.properties.available" - file="${build.resources.directory}/hibernate.properties.(a){database}.xml" /> + file="${project.output.dir}/hibernate.properties.(a){database}.xml" /> <fail message="hibernate.properties.(a){database}.xml not available" unless="@{database}.properties.available" /> @@ -49,11 +48,11 @@ value="hibernate.mapping.(a){database}.xml" else="hibernate.mapping.default.xml"> <available property="@{database}.mapping.available" - file="${build.resources.directory}/hibernate.mapping.(a){database}.xml" /> + file="${project.output.dir}/hibernate.mapping.(a){database}.xml" /> </condition>  - <concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml" + <concat destfile="${project.output.dir}/hibernate.cfg.(a){database}.xml" outputencoding="UTF-8"> <header><![CDATA[<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE hibernate-configuration PUBLIC @@ -63,10 +62,10 @@ <hibernate-configuration> <session-factory> ]]></header> - <fileset file="${build.resources.directory}/hibernate.properties.(a){database}.xml" /> - <fileset file="${build.resources.directory}/hibernate.common.xml" /> - <fileset file="${build.resources.directory}/${hibernate.mapping.(a){database}.xml}" /> - <fileset file="${build.resources.directory}/hibernate.cache.xml" /> + <fileset file="${project.output.dir}/hibernate.properties.(a){database}.xml" /> + <fileset file="${project.output.dir}/hibernate.common.xml" /> + <fileset file="${project.output.dir}/${hibernate.mapping.(a){database}.xml}" /> + <fileset file="${project.output.dir}/hibernate.cache.xml" /> <footer><![CDATA[ </session-factory> </hibernate-configuration> ]]></footer> @@ -89,8 +88,16 @@ <cat-hibernate-config database="sapdb" /> <cat-hibernate-config database="sybase" /> - <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" - tofile="${project.build.directory}/classes/hibernate.cfg.xml" /> + <copy file="${project.output.dir}/hibernate.cfg.${database}.xml" + tofile="${project.output.dir}/hibernate.cfg.xml" /> </target> - + + <target name="gen-hibernate-config-no-auto"> + <copy file="${project.output.dir}/hibernate.cfg.xml" + tofile="${project.test.output.dir}/hibernate-no-auto.cfg.xml" /> + <macro-disable file="${project.test.output.dir}/hibernate-no-auto.cfg.xml" + section="Automatic schema creation" /> + <macro-enable file="${project.test.output.dir}/org/jbpm/jbpm2908/jbpm2.cfg.xml" + section="No automatic schema creation"/> + </target> </project> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2010-09-09 16:22:28 UTC (rev 6654) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2010-09-10 03:39:56 UTC (rev 6655) @@ -38,7 +38,6 @@ import org.jbpm.configuration.ObjectFactoryParser; import org.jbpm.configuration.ValueInfo; import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.instantiation.DefaultProcessClassLoaderFactory; import org.jbpm.instantiation.ProcessClassLoaderFactory; import org.jbpm.job.executor.JobExecutor; import org.jbpm.persistence.db.DbPersistenceServiceFactory; @@ -445,13 +444,8 @@ } public static ClassLoader getProcessClassLoader(ProcessDefinition processDefinition) { - ProcessClassLoaderFactory factory; - if (Configs.hasObject("process.class.loader.factory")) { - factory = (ProcessClassLoaderFactory) Configs.getObject("process.class.loader.factory"); - } - else { - factory = new DefaultProcessClassLoaderFactory(); - } + ProcessClassLoaderFactory factory = + (ProcessClassLoaderFactory) Configs.getObject("process.class.loader.factory"); return factory.getProcessClassLoader(processDefinition); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java 2010-09-09 16:22:28 UTC (rev 6654) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java 2010-09-10 03:39:56 UTC (rev 6655) @@ -30,6 +30,7 @@ import java.net.URLConnection; import java.net.URLStreamHandler; +import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.JbpmException; import org.jbpm.file.def.FileDefinition; @@ -39,6 +40,8 @@ private ProcessDefinition processDefinition; private long processDefinitionId; + + private final JbpmConfiguration jbpmConfiguration; private final URLStreamHandler urlStreamHandler = new URLStreamHandler() { protected URLConnection openConnection(URL url) throws IOException { @@ -84,20 +87,25 @@ // transient, keep full object this.processDefinition = processDefinition; } + // remember current jbpm configuration + JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); + jbpmConfiguration = jbpmContext != null ? jbpmContext.getJbpmConfiguration() : null; } protected ProcessDefinition getProcessDefinition() { if (processDefinition != null) return processDefinition; - JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); - if (jbpmContext != null) { - return jbpmContext.getGraphSession().loadProcessDefinition(processDefinitionId); + if (jbpmConfiguration != null) { + JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext(); + if (jbpmContext != null) { + return jbpmContext.getGraphSession().loadProcessDefinition(processDefinitionId); + } } return null; } - public URL findResource(String name) { + protected URL findResource(String name) { ProcessDefinition processDefinition = getProcessDefinition(); FileDefinition fileDefinition; if (processDefinition == null @@ -162,7 +170,7 @@ } } - public Class findClass(String className) throws ClassNotFoundException { + protected Class findClass(String className) throws ClassNotFoundException { ProcessDefinition processDefinition = getProcessDefinition(); FileDefinition fileDefinition; if (processDefinition == null Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2010-09-09 16:22:28 UTC (rev 6654) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -26,8 +26,9 @@ <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> </jbpm-context> -  +   Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java 2010-09-10 03:39:56 UTC (rev 6655) @@ -0,0 +1,32 @@ +package org.jbpm.jbpm2908; + +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.exe.ExecutionContext; +import org.jbpm.graph.exe.ProcessInstance; + +public class ChangeJbpmConfigurationAction implements ActionHandler { + + private static final long serialVersionUID = 1L; + + public void execute(ExecutionContext context) throws Exception { + // load another configuration + JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseResource("org/jbpm/jbpm2908/jbpm2.cfg.xml"); + try { + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + // start instance + ProcessInstance processInstance = jbpmContext.newProcessInstance("process2"); + processInstance.signal(); + jbpmContext.save(processInstance); + } + finally { + jbpmContext.close(); + } + } + finally { + jbpmConfiguration.close(); + } + } +} Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java 2010-09-10 03:39:56 UTC (rev 6655) @@ -0,0 +1,63 @@ +/* + * 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.jbpm2908; + +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; +import org.jbpm.persistence.JbpmPersistenceException; + +/** + * Change {@link JbpmConfiguration} and start a process instance in an action handler. This test + * is only for detecting {@link StackOverflowError}. This nested {@link JbpmContext} usage may + * not be properly asserted except in an integration test using JTA, so this test ignores many + * {@link JbpmPersistenceException}s. + * + * @see <a href="https://jira.jboss.org/jira/browse/JBPM-2908">JBPM-2908</a> + * @author Toshiya Kobayashi + */ +public class JBPM2908Test extends AbstractDbTestCase { + + protected String getJbpmTestConfig() { + return "org/jbpm/jbpm2908/jbpm1.cfg.xml"; + } + + protected void tearDown() throws Exception { + super.tearDown(); + jbpmConfiguration.close(); + } + + public void testChangingJbpmConfigurationInActionHandler() throws Exception { + // deploy definition + ProcessDefinition processDefinition1 = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2908/processdefinition1.xml"); + ProcessDefinition processDefinition2 = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2908/processdefinition2.xml"); + deployProcessDefinition(processDefinition1); + deployProcessDefinition(processDefinition2); + + // start instance + ProcessInstance processInstance = jbpmContext.newProcessInstance("process1"); + processInstance.signal(); + assert processInstance.hasEnded() : processInstance; + } +} Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbpm-configuration /> Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbpm-configuration> +  +</jbpm-configuration> Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition1.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition1.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition1.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-definition name="process1" xmlns="urn:jbpm.org:jpdl-3.2"> + <start-state name="start"> + <transition to="node1" /> + </start-state> + + <node name="node1"> + <event type="node-enter"> + <action class="org.jbpm.jbpm2908.ChangeJbpmConfigurationAction" /> + </event> + <transition to="end" /> + </node> + + <end-state name="end" /> +</process-definition> Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition1.xml ___________________________________________________________________ Name: svn:eol-style + native Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition2.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition2.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition2.xml 2010-09-10 03:39:56 UTC (rev 6655) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-definition name="process2" xmlns="urn:jbpm.org:jpdl-3.2"> + <start-state name="start"> + <transition to="node1" /> + </start-state> + + <node name="node1"> + <transition to="end" /> + </node> + + <end-state name="end" /> +</process-definition> Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2908/processdefinition2.xml ___________________________________________________________________ Name: svn:eol-style + native

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6654 - in jbpm4/trunk: qa and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-09 12:22:28 -0400 (Thu, 09 Sep 2010) New Revision: 6654 Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/qa/build.xml Log: point build files to new tomcat distro location Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-09-09 01:01:28 UTC (rev 6653) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-09-09 16:22:28 UTC (rev 6654) @@ -37,13 +37,13 @@ <property name="examples.file" value="${jbpm.home}/examples/target/examples.jar" /> - <property name="tomcat.version" value="6.0.26" /> + <property name="tomcat.version" value="6.0.28" /> <property name="tomcat.parent.dir" value="${jbpm.home}" /> <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> <property name="tomcat.filename" value="apache-tomcat-${tomcat.version}.zip" /> <property name="tomcat.distro.dir" value="downloads" /> <property name="tomcat.distro.url" - value="http://www.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/${tomca..." /> + value="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/${t..." /> <property name="tomcat.distro.path" value="${tomcat.distro.dir}/${tomcat.filename}" /> <property name="tomcat.lib.dir" value="${tomcat.home}/lib" /> <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps" /> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-09-09 01:01:28 UTC (rev 6653) +++ jbpm4/trunk/qa/build.xml 2010-09-09 16:22:28 UTC (rev 6654) @@ -21,7 +21,7 @@ <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - <property name="tomcat.version" value="6.0.26" /> + <property name="tomcat.version" value="6.0.28" /> <property name="tomcat.parent.dir" value="${jbpm.home}" /> <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" />

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6653 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/test/query and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-08 21:01:28 -0400 (Wed, 08 Sep 2010) New Revision: 6653 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java Log: JBPM-2398 catch grammar exception thrown by postgresql when operator like is applied to long operands Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2010-09-08 06:51:48 UTC (rev 6652) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2010-09-09 01:01:28 UTC (rev 6653) @@ -21,8 +21,9 @@ */ package org.jbpm.pvm.internal.query; -import java.io.ObjectStreamException; import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -41,18 +42,18 @@ * @author Maciej Swiderski */ public abstract class AbstractQuery implements Command<Object> { - + private static final long serialVersionUID = 1L; - - protected CommandService commandService; + + protected transient CommandService commandService; protected String orderByClause; protected Page page; protected boolean isWhereAdded; protected boolean count; protected boolean uniqueResult; - + protected Map<String, QueryOperand> parameterOperands = new HashMap<String, QueryOperand>(); - + protected abstract void applyParameters(Query query); public abstract String hql(); @@ -66,7 +67,7 @@ */ public List<?> untypedList() { - if (commandService!=null) { + if (commandService != null) { return (List<?>) commandService.execute(this); } Session session = EnvironmentImpl.getFromCurrent(Session.class); @@ -76,18 +77,19 @@ protected Object untypedUniqueResult() { uniqueResult = true; - if (commandService!=null) { + if (commandService != null) { return commandService.execute(this); } Session session = EnvironmentImpl.getFromCurrent(Session.class); - return execute(session); + return execute(session); } public Object execute(Environment environment) throws Exception { Session session = environment.get(Session.class); try { return execute(session); - } finally { + } + finally { resetQuery(); // reset the query member fields so the query can be reused. } } @@ -98,7 +100,7 @@ applyPage(query); return uniqueResult ? query.uniqueResult() : query.list(); } - + /** * Returns the count of the query. * Query types that want to use this count method should @@ -107,15 +109,15 @@ */ public long count() { count = true; - - // Page and count cannot be used together, because paging is applied after the query is formed + + // Page and count are mutually exclusive because paging is applied after query is formed if (page != null) { throw new JbpmException("page(firstResult, maxResult) and count() cannot be used together"); } - + return (Long) untypedUniqueResult(); } - + /** * Resets the query so it can be reused after an invocation. */ @@ -128,7 +130,8 @@ protected void appendWhereClause(String whereClause, StringBuilder hql) { if (isWhereAdded) { hql.append(" and "); - } else { + } + else { isWhereAdded = true; hql.append("where "); } @@ -136,49 +139,35 @@ } protected void appendOrderByClause(StringBuilder hql) { - if (orderByClause!=null) { + if (orderByClause != null) { hql.append("order by "); hql.append(orderByClause); } } protected void applyPage(Query query) { - if (page!=null) { + if (page != null) { query.setFirstResult(page.firstResult); query.setMaxResults(page.maxResults); } } protected void addOrderByClause(String clause) { - if (orderByClause==null) { + if (orderByClause == null) { orderByClause = clause; - } else { + } + else { orderByClause += ", " + clause; } } - - protected Object writeReplace() throws ObjectStreamException { - this.commandService = null; - return this; - } - + protected QueryOperand getOperand(String param) { if (parameterOperands.containsKey(param)) { return parameterOperands.get(param); } return QueryOperand.EQUALS; } - - protected boolean isListOperand(String param) { - QueryOperand operand = getOperand(param); - - if (operand == QueryOperand.IN || operand == QueryOperand.NOT_IN) { - return true; - } else { - return false; - } - } - + /** * Transforms given string (<code>parameter</code>) to an array of given type (<code>clazz</code>). * <code>parameter</code> will be split using separator ',' (comma). @@ -187,36 +176,56 @@ * All exceptions will be silently skipped. */ @SuppressWarnings("unchecked") - protected <T> T[] transformToArray(String parameter, T clazz) { - String[] idsStr = parameter.split(","); - if (clazz instanceof String) { - return (T[]) idsStr; + protected <T> T[] transformToArray(String paramStr, Class<T> clazz) { + String[] parameters = paramStr.split(","); + if (clazz == String.class) { + return (T[]) parameters; } - T[] ids = (T[]) Array.newInstance( (Class)clazz, idsStr.length); - - for (int i = 0; i < idsStr.length; i++) { - try { - ids[i] = (T) ((Class)clazz).getConstructor(String.class).newInstance(idsStr[i]); - } catch (Exception e) { + T[] ids = (T[]) Array.newInstance(clazz, parameters.length); + try { + Constructor<T> constructor = clazz.getConstructor(String.class); + for (int i = 0; i < parameters.length; i++) { + try { + ids[i] = (T) constructor.newInstance(parameters[i]); + } + catch (InstantiationException e) { + throw new JbpmException("failed to instantiate " + clazz, e); + } + catch (IllegalAccessException e) { + throw new JbpmException(getClass() + " has no access to " + constructor); + } + catch (InvocationTargetException e) { + throw new JbpmException(constructor + " threw exception", e.getCause()); + } } + return ids; } - return ids; + catch (NoSuchMethodException e) { + throw new JbpmException("string constructor not found in " + clazz, e); + } } - + protected void appendWhereClauseWithOperand(String where, String namedParam, StringBuilder hql) { QueryOperand operand = getOperand(namedParam); - if (isListOperand(namedParam)) { + switch (operand) { + case IN: + case NOT_IN: appendWhereClause(where + " " + operand + " (:" + namedParam + ") ", hql); - } else { + break; + default: appendWhereClause(where + " " + operand + " :" + namedParam + " ", hql); } } - - protected void applyParameterWithOperand(String parameter, String namedParam, Class<?> clazz, Query query) { - if (isListOperand(namedParam)) { + + protected void applyParameterWithOperand(String parameter, String namedParam, Class<?> clazz, + Query query) { + switch (getOperand(namedParam)) { + case IN: + case NOT_IN: query.setParameterList(namedParam, transformToArray(parameter, clazz)); - } else { + break; + default: if (clazz == Long.class) { query.setLong(namedParam, Long.parseLong(parameter)); } @@ -225,7 +234,7 @@ } } } - + public void setCommandService(CommandService commandService) { this.commandService = commandService; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java 2010-09-08 06:51:48 UTC (rev 6652) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/DeploymentQueryImpl.java 2010-09-09 01:01:28 UTC (rev 6653) @@ -30,49 +30,51 @@ import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.util.CollectionUtil; - /** * @author Tom Baeyens * @author Maciej Swiderski */ public class DeploymentQueryImpl extends AbstractQuery implements DeploymentQuery { - - protected String deploymentId = null; - protected Boolean suspended = null; + private static final long serialVersionUID = 1L; + + protected String deploymentId; + protected Boolean suspended; + public String hql() { StringBuilder hql = new StringBuilder(); - + hql.append("select "); if (count) { hql.append("count(d) "); - } else { + } + else { hql.append("d "); } hql.append("from "); hql.append(DeploymentImpl.class.getName()); hql.append(" as d "); - - if (deploymentId!=null) { + + if (deploymentId != null) { appendWhereClauseWithOperand("d.dbid", "deploymentId", hql); } - if (suspended!=null) { + if (suspended != null) { if (suspended) { - appendWhereClause(" d.state = '"+Deployment.STATE_SUSPENDED+"' ", hql); - } else { - appendWhereClause(" d.state != '"+Deployment.STATE_SUSPENDED+"' ", hql); + appendWhereClause(" d.state = '" + Deployment.STATE_SUSPENDED + "' ", hql); } + else { + appendWhereClause(" d.state != '" + Deployment.STATE_SUSPENDED + "' ", hql); + } } - + appendOrderByClause(hql); - + return hql.toString(); } protected void applyParameters(Query query) { - if (deploymentId != null) { applyParameterWithOperand(deploymentId, "deploymentId", Long.class, query); } @@ -94,12 +96,12 @@ } public DeploymentQuery orderAsc(String property) { - addOrderByClause("d."+property+" asc"); + addOrderByClause("d." + property + " asc"); return this; } public DeploymentQuery orderDesc(String property) { - addOrderByClause("d."+property+" desc"); + addOrderByClause("d." + property + " desc"); return this; } @@ -115,7 +117,7 @@ public Deployment uniqueResult() { return (Deployment) untypedUniqueResult(); } - + public DeploymentQuery deploymentId(String id, QueryOperand operand) { this.deploymentId = id; parameterOperands.put("deploymentId", operand); Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2010-09-08 06:51:48 UTC (rev 6652) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2010-09-09 01:01:28 UTC (rev 6653) @@ -26,14 +26,13 @@ import java.util.List; import java.util.Set; -import org.hibernate.HibernateException; +import org.hibernate.exception.SQLGrammarException; import org.jbpm.api.Deployment; import org.jbpm.api.DeploymentQuery; import org.jbpm.api.QueryOperand; import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; - /** * @author Tom Baeyens * @author Joram Barrez @@ -43,203 +42,200 @@ public void testSuspendDeployment() { List<String> deploymentIds = deployTestProcesses(); - repositoryService.suspendDeployment(deploymentIds.get(2)); - + repositoryService.suspendDeployment(deploymentIds.get(2)); + // find all deployments - - List<Deployment> deployments = repositoryService - .createDeploymentQuery() - .list(); - + + List<Deployment> deployments = repositoryService.createDeploymentQuery().list(); + Set<String> expectedDeploymentNames = new HashSet<String>(); expectedDeploymentNames.add("Claim"); expectedDeploymentNames.add("Hire"); expectedDeploymentNames.add("Fire"); - + assertEquals(expectedDeploymentNames, getDeploymentNames(deployments)); - + // find suspended deployments - - deployments = repositoryService - .createDeploymentQuery() - .suspended() - .list(); - + + deployments = repositoryService.createDeploymentQuery().suspended().list(); + expectedDeploymentNames = new HashSet<String>(); expectedDeploymentNames.add("Hire"); - + assertEquals(expectedDeploymentNames, getDeploymentNames(deployments)); // find active deployments - - deployments = repositoryService - .createDeploymentQuery() - .notSuspended() - .list(); - + + deployments = repositoryService.createDeploymentQuery().notSuspended().list(); + expectedDeploymentNames = new HashSet<String>(); expectedDeploymentNames.add("Claim"); expectedDeploymentNames.add("Fire"); - + assertEquals(expectedDeploymentNames, getDeploymentNames(deployments)); - + deleteCascade(deploymentIds); } - - private void deleteCascade(List<String> deploymentIds) { for (String deploymentId : deploymentIds) { repositoryService.deleteDeploymentCascade(deploymentId); } } - + public void testOrderByTimeStamp() { testOrderByNaturalOrdening(DeploymentQuery.PROPERTY_TIMESTAMP, 3); } - + public void testCount() { List<String> deploymentIds = deployTestProcesses(); - + assertEquals(3, repositoryService.createDeploymentQuery().count()); for (String deploymentId : deploymentIds) { - assertEquals(1, repositoryService.createDeploymentQuery().deploymentId(deploymentId).count()); + assertEquals(1, repositoryService.createDeploymentQuery() + .deploymentId(deploymentId) + .count()); } - - Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0)).uniqueResult(); + + Deployment deployment = repositoryService.createDeploymentQuery() + .deploymentId(deploymentIds.get(0)) + .uniqueResult(); repositoryService.suspendDeployment(deployment.getId()); - + assertEquals(1, repositoryService.createDeploymentQuery().suspended().count()); assertEquals(2, repositoryService.createDeploymentQuery().notSuspended().count()); - + deleteCascade(deploymentIds); } - + public void testEquals() { List<String> deploymentIds = deployTestProcesses(); - - assertEquals(1, repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0), QueryOperand.EQUALS).count()); - - + + assertEquals(1, repositoryService.createDeploymentQuery() + .deploymentId(deploymentIds.get(0), QueryOperand.EQUALS) + .count()); + deleteCascade(deploymentIds); } - + public void testLike() { List<String> deploymentIds = deployTestProcesses(); try { - repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0), QueryOperand.LIKE).count(); - fail("expected sql grammar exception"); + assertEquals(1, repositoryService.createDeploymentQuery() + .deploymentId(deploymentIds.get(0), QueryOperand.LIKE) + .count()); } - catch (HibernateException e) { - // operator like does not apply to long dbid field + catch (SQLGrammarException e) { + // in postgres, operator like does not apply to long operands } - + deleteCascade(deploymentIds); } - + public void testIn() { List<String> deploymentIds = deployTestProcesses(); - - assertEquals(2, repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0) + ","+deploymentIds.get(1), QueryOperand.IN).count()); - - + + assertEquals(2, repositoryService.createDeploymentQuery() + .deploymentId(deploymentIds.get(0) + "," + deploymentIds.get(1), QueryOperand.IN) + .count()); + deleteCascade(deploymentIds); } - + public void testNotIn() { List<String> deploymentIds = deployTestProcesses(); - - assertEquals(2, repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0), QueryOperand.NOT_IN).count()); - - + + assertEquals(2, repositoryService.createDeploymentQuery() + .deploymentId(deploymentIds.get(0), QueryOperand.NOT_IN) + .count()); + deleteCascade(deploymentIds); } - + /* -------------- * HELPER METHODS * -------------- */ - + private Set<String> getDeploymentNames(List<Deployment> deployments) { Set<String> deploymentNames = new HashSet<String>(); - for (Deployment deployment: deployments) { + for (Deployment deployment : deployments) { deploymentNames.add(deployment.getName()); } return deploymentNames; } - + private List<String> deployTestProcesses() { List<String> processIds = new ArrayList<String>(); - - String deploymentClaimId = repositoryService - .createDeployment() - .setName("Claim") - .addResourceFromString("process.jpdl.xml", - "<process name='claim'>" + - " <start>" + - " <transition to='c' />" + - " </start>" + - " <state name='c' />" + - "</process>" - ) - .deploy(); - String deploymentHireId = repositoryService - .createDeployment() + String deploymentClaimId = repositoryService.createDeployment() + .setName("Claim") + .addResourceFromString("process.jpdl.xml", + "<process name='claim'>" + + " <start>" + + " <transition to='c' />" + + " </start>" + + " <state name='c' />" + + "</process>") + .deploy(); + + String deploymentHireId = repositoryService.createDeployment() .setName("Hire") - .addResourceFromString("process.jpdl.xml", + .addResourceFromString("process.jpdl.xml", "<process name='hire'>" + " <start>" + " <transition to='h' />" + " </start>" + " <state name='h' />" + - "</process>" - ) + "</process>") .deploy(); - - String deploymentFireId = repositoryService - .createDeployment() - .setName("Fire") - .addResourceFromString("process.jpdl.xml", - "<process name='fire'>" + - " <start>" + - " <transition to='f' />" + - " </start>" + - " <state name='f' />" + - "</process>" - ) - .deploy(); - + + String deploymentFireId = repositoryService.createDeployment() + .setName("Fire") + .addResourceFromString("process.jpdl.xml", + "<process name='fire'>" + + " <start>" + + " <transition to='f' />" + + " </start>" + + " <state name='f' />" + + "</process>") + .deploy(); + processIds.add(deploymentClaimId); processIds.add(deploymentFireId); processIds.add(deploymentHireId); - + return processIds; } - + private void testOrderByNaturalOrdening(String property, int expectedNrOfResults) { testOrderBy(property, null, expectedNrOfResults, true); } - + @SuppressWarnings("unchecked") - private void testOrderBy(String property, List expectedValues, - Integer expectedNrOfResults, boolean naturalOrderCheck) { - + private void testOrderBy(String property, List expectedValues, Integer expectedNrOfResults, + boolean naturalOrderCheck) { + List<String> deploymentIds = deployTestProcesses(); - - List<Deployment> deploymentsAsc = - repositoryService.createDeploymentQuery().orderAsc(property).list(); - - List<Deployment> deploymentsDesc = - repositoryService.createDeploymentQuery().orderDesc(property).list(); + List<Deployment> deploymentsAsc = repositoryService.createDeploymentQuery() + .orderAsc(property) + .list(); + + List<Deployment> deploymentsDesc = repositoryService.createDeploymentQuery() + .orderDesc(property) + .list(); + if (naturalOrderCheck) { - QueryAssertions.assertOrderIsNatural(Deployment.class, property, deploymentsAsc, deploymentsDesc, 3); - } else { - QueryAssertions.assertOrderOnProperty(Deployment.class, property, deploymentsAsc, deploymentsDesc, expectedValues); + QueryAssertions.assertOrderIsNatural(Deployment.class, property, deploymentsAsc, + deploymentsDesc, 3); } - + else { + QueryAssertions.assertOrderOnProperty(Deployment.class, property, deploymentsAsc, + deploymentsDesc, expectedValues); + } + deleteCascade(deploymentIds); } - + } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2010-09-08 06:51:48 UTC (rev 6652) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2010-09-09 01:01:28 UTC (rev 6653) @@ -41,36 +41,36 @@ * @author Joram Barrez */ public class HistoryTaskQueryTest extends JbpmTestCase { - + protected void tearDown() throws Exception { Clock.setExplicitTime(null); super.tearDown(); } - + public void testOrderByName() { testOrderBy(HistoryTaskQuery.PROPERTY_ASSIGNEE, Arrays.asList("Alex", "Joram", "Tom")); } - + public void testOrderByStartTime() { testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_CREATETIME, 3); } - + public void testOrderByEndTime() { testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_ENDTIME, 3); } - + public void testOrderByDuration() { testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_DURATION, 3); } - + public void testOrderByexecutionId() { testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_EXECUTIONID, 3); } - + public void testOrderByOutcome() { testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_OUTCOME, 3); } - + public void testOrderByState() { testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_STATE, 3); } @@ -82,50 +82,57 @@ private void testOrderByNaturalOrdening(String property, int expectedNrOfResults) { testOrderBy(property, null, expectedNrOfResults, true); } - + public void testCount() { List<String> taskIds = createTestHistoryTasks(); - + assertEquals(3, historyService.createHistoryTaskQuery().count()); assertEquals(1, historyService.createHistoryTaskQuery().assignee("Tom").count()); - + for (String taskid : taskIds) { assertEquals(1, historyService.createHistoryTaskQuery().taskId(taskid).count()); } - - assertEquals(0, historyService.createHistoryTaskQuery().startedBefore(new Date(CLOCK_TEST_TIME - 10000L)).count()); - assertEquals(1, - historyService.createHistoryTaskQuery().startedAfter(new Date(CLOCK_TEST_TIME - 10000L)) - .taskId(taskIds.get(0)).count()); - assertEquals(0, - historyService.createHistoryTaskQuery().startedAfter(new Date(CLOCK_TEST_TIME - 10000L)) - .taskId("-1").count()); + + assertEquals(0, historyService.createHistoryTaskQuery() + .startedBefore(new Date(CLOCK_TEST_TIME - 10000L)) + .count()); + assertEquals(1, historyService.createHistoryTaskQuery() + .startedAfter(new Date(CLOCK_TEST_TIME - 10000L)) + .taskId(taskIds.get(0)) + .count()); + assertEquals(0, historyService.createHistoryTaskQuery() + .startedAfter(new Date(CLOCK_TEST_TIME - 10000L)) + .taskId("-1") + .count()); } - + public void testAssigneeLike() { createTestHistoryTasks(); - - assertEquals(2, historyService.createHistoryTaskQuery().assignee("%o%", QueryOperand.LIKE).count()); - + + assertEquals(2, historyService.createHistoryTaskQuery() + .assignee("%o%", QueryOperand.LIKE) + .count()); } - + public void testAssigneeIn() { createTestHistoryTasks(); - - assertEquals(2, historyService.createHistoryTaskQuery().assignee("Tom,Alex", QueryOperand.IN).count()); - + + assertEquals(2, historyService.createHistoryTaskQuery() + .assignee("Tom,Alex", QueryOperand.IN) + .count()); } - + public void testAssigneeNotIn() { createTestHistoryTasks(); - - assertEquals(1, historyService.createHistoryTaskQuery().assignee("Tom,Alex", QueryOperand.NOT_IN).count()); - + + assertEquals(1, historyService.createHistoryTaskQuery() + .assignee("Tom,Alex", QueryOperand.NOT_IN) + .count()); } - + public void testTaskIdLike() { createTestHistoryTasks(); - + try { historyService.createHistoryTaskQuery().taskId("%", QueryOperand.LIKE).count(); fail("expected number format exception"); @@ -134,72 +141,82 @@ // non-numeric argument does not apply to long dbid field } } - + public void testTaskIdIn() { List<String> taskIds = createTestHistoryTasks(); - - assertEquals(2, historyService.createHistoryTaskQuery().taskId(taskIds.get(0) + "," + taskIds.get(1), QueryOperand.IN).count()); - + + assertEquals(2, historyService.createHistoryTaskQuery() + .taskId(taskIds.get(0) + "," + taskIds.get(1), QueryOperand.IN) + .count()); } - + public void testTaskIdNotIn() { List<String> taskIds = createTestHistoryTasks(); - - assertEquals(1, historyService.createHistoryTaskQuery().taskId(taskIds.get(0) + "," + taskIds.get(1), QueryOperand.NOT_IN).count()); - + + assertEquals(1, historyService.createHistoryTaskQuery() + .taskId(taskIds.get(0) + "," + taskIds.get(1), QueryOperand.NOT_IN) + .count()); } - + public void testExecutionIdLike() { createTestHistoryTasks(); - - assertEquals(3, historyService.createHistoryTaskQuery().executionId("theProcess%", QueryOperand.LIKE).count()); - + + assertEquals(3, historyService.createHistoryTaskQuery() + .executionId("theProcess%", QueryOperand.LIKE) + .count()); } + public void testStateLike() { createTestHistoryTasks(); - - assertEquals(3, historyService.createHistoryTaskQuery().state("%", QueryOperand.LIKE).count()); - + + assertEquals(3, historyService.createHistoryTaskQuery() + .state("%", QueryOperand.LIKE) + .count()); } - + public void testStateIn() { createTestHistoryTasks(); - - assertEquals(3, historyService.createHistoryTaskQuery().state(HistoryTask.STATE_COMPLETED + "," + HistoryTask.STATE_OBSOLETE, QueryOperand.IN).count()); - + + assertEquals(3, historyService.createHistoryTaskQuery() + .state(HistoryTask.STATE_COMPLETED + "," + HistoryTask.STATE_OBSOLETE, QueryOperand.IN) + .count()); } - + public void testStateNotIn() { createTestHistoryTasks(); - - assertEquals(0, historyService.createHistoryTaskQuery().state(HistoryTask.STATE_COMPLETED + "," + HistoryTask.STATE_OBSOLETE, QueryOperand.NOT_IN).count()); - + + assertEquals(0, historyService.createHistoryTaskQuery() + .state(HistoryTask.STATE_COMPLETED + "," + HistoryTask.STATE_OBSOLETE, QueryOperand.NOT_IN) + .count()); } - + @SuppressWarnings("unchecked") - private void testOrderBy(String property, List expectedValues, - Integer expectedNrOfResults, boolean naturalOrderCheck) { - + private void testOrderBy(String property, List expectedValues, Integer expectedNrOfResults, + boolean naturalOrderCheck) { createTestHistoryTasks(); - - List<HistoryTask> historyTasksAsc = - historyService.createHistoryTaskQuery().orderAsc(property).list(); - - List<HistoryTask> historyTasksDesc = - historyService.createHistoryTaskQuery().orderDesc(property).list(); + List<HistoryTask> historyTasksAsc = historyService.createHistoryTaskQuery() + .orderAsc(property) + .list(); + + List<HistoryTask> historyTasksDesc = historyService.createHistoryTaskQuery() + .orderDesc(property) + .list(); + if (naturalOrderCheck) { - QueryAssertions.assertOrderIsNatural(HistoryTask.class, property, historyTasksAsc, historyTasksDesc, expectedNrOfResults); - } else { - QueryAssertions.assertOrderOnProperty(HistoryTask.class, property, historyTasksAsc, historyTasksDesc, expectedValues); + QueryAssertions.assertOrderIsNatural(HistoryTask.class, property, historyTasksAsc, + historyTasksDesc, expectedNrOfResults); } - + else { + QueryAssertions.assertOrderOnProperty(HistoryTask.class, property, historyTasksAsc, + historyTasksDesc, expectedValues); + } } - + private static final Long CLOCK_TEST_TIME = 30000L; - + private List<String> createTestHistoryTasks() { - String processXml1 = + String processXml1 = "<process name='theProcess1'>" + " <start>" + " <transition to='theTask' />" + @@ -209,32 +226,32 @@ " </task>" + " <end name='theEnd' />" + "</process>"; - + Clock.setExplicitTime(new Date(CLOCK_TEST_TIME)); - + String processXml3 = processXml1.replace("1", "2").replace("Alex", "Tom"); String processXml2 = processXml1.replace("1", "3").replace("Alex", "Joram"); - + deployJpdlXmlString(processXml1); deployJpdlXmlString(processXml2); deployJpdlXmlString(processXml3); - + executionService.startProcessInstanceByKey("theProcess1"); executionService.startProcessInstanceByKey("theProcess2"); executionService.startProcessInstanceByKey("theProcess3"); - + List<String> taskIds = new ArrayList<String>(); taskIds.add(taskService.findPersonalTasks("Alex").get(0).getId()); taskIds.add(taskService.findPersonalTasks("Joram").get(0).getId()); taskIds.add(taskService.findPersonalTasks("Tom").get(0).getId()); - + for (String taskId : taskIds) { taskService.completeTask(taskId); } - + return taskIds; } - + public void testHistoryTaskQuerySingleTaskByProcessId() { deployJpdlXmlString( "<process name='TaskAssignee'>" + @@ -248,18 +265,19 @@ " <state name='wait'/>" + "</process>" ); - + ProcessInstance pi = executionService.startProcessInstanceByKey("TaskAssignee"); - + taskService.completeTask(taskService.findPersonalTasks("johndoe").get(0).getId()); - - HistoryTask task = historyService.createHistoryTaskQuery().processInstanceId(pi.getId()).uniqueResult(); + + HistoryTask task = historyService.createHistoryTaskQuery() + .processInstanceId(pi.getId()) + .uniqueResult(); assertNotNull(task.getName()); assertEquals("review", task.getName()); assertEquals("completed", task.getState()); - } - + public void testHistoryTaskQueryTaskByProcessId() { deployJpdlXmlString( "<process name='TaskAssignee'>" + @@ -281,21 +299,24 @@ " <state name='wait'/>" + "</process>" ); - + ProcessInstance pi = executionService.startProcessInstanceByKey("TaskAssignee"); - + taskService.completeTask(taskService.findPersonalTasks("johndoe").get(0).getId()); - + taskService.completeTask(taskService.findPersonalTasks("mike").get(0).getId()); - + taskService.completeTask(taskService.findPersonalTasks("peter").get(0).getId()); - - List<HistoryTask> tasks = historyService.createHistoryTaskQuery().processInstanceId(pi.getId()).list(); + + List<HistoryTask> tasks = historyService.createHistoryTaskQuery() + .processInstanceId(pi.getId()) + .orderAsc(HistoryTaskQuery.PROPERTY_ASSIGNEE) + .list(); assertNotNull(tasks); assertEquals(3, tasks.size()); - - String[] expectedTasks = new String[] {"review", "review-mgmt", "review-top-mgmt"}; - String[] expectedAssignees = new String[] {"johndoe", "mike", "peter"}; + + String[] expectedTasks = { "review", "review-mgmt", "review-top-mgmt" }; + String[] expectedAssignees = { "johndoe", "mike", "peter" }; int i = 0; for (HistoryTask task : tasks) { assertEquals(expectedTasks[i], task.getName()); @@ -303,9 +324,8 @@ assertEquals("completed", task.getState()); i++; } - } - + public void testHistoryTaskQueryTaskByProcessIdWithTimer() { deployJpdlXmlString( "<process name='TaskAssignee'>" + @@ -330,21 +350,23 @@ " <state name='wait'/>" + "</process>" ); - + ProcessInstance pi = executionService.startProcessInstanceByKey("TaskAssignee"); - + taskService.completeTask(taskService.findPersonalTasks("johndoe").get(0).getId()); - + taskService.completeTask(taskService.findPersonalTasks("mike").get(0).getId()); - + taskService.completeTask(taskService.findPersonalTasks("peter").get(0).getId()); - - List<HistoryTask> tasks = historyService.createHistoryTaskQuery().processInstanceId(pi.getId()).list(); - assertNotNull(tasks); + + List<HistoryTask> tasks = historyService.createHistoryTaskQuery() + .processInstanceId(pi.getId()) + .orderAsc(HistoryTaskQuery.PROPERTY_ASSIGNEE) + .list(); assertEquals(3, tasks.size()); - - String[] expectedTasks = new String[] {"review", "review-mgmt", "review-top-mgmt"}; - String[] expectedAssignees = new String[] {"johndoe", "mike", "peter"}; + + String[] expectedTasks = { "review", "review-mgmt", "review-top-mgmt" }; + String[] expectedAssignees = { "johndoe", "mike", "peter" }; int i = 0; for (HistoryTask task : tasks) { assertEquals(expectedTasks[i], task.getName()); @@ -352,8 +374,5 @@ assertEquals("completed", task.getState()); i++; } - } - - }

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6652 - in jbpm4/trunk/modules: db and 8 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-08 02:51:48 -0400 (Wed, 08 Sep 2010) New Revision: 6652 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/scripts/antrun-schema.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/mysql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/oracle.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/postgresql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/logging.properties Log: JBPM-2398 add new history columns to create/drop sql scripts; observe parameter operand type in AbstractQuery Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/QueryOperand.java 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,26 +1,21 @@ package org.jbpm.api; - public enum QueryOperand { - EQUALS(0, "="), - LIKE(1, "like"), - IN(2, "in"), - NOT_IN(3, "not in"); - - @SuppressWarnings("unused") - private int id; - private String value; - - QueryOperand(int id, String value) { - this.id = id; + EQUALS("="), + LIKE("like"), + IN("in"), + NOT_IN("not in"); + + private final String value; + + QueryOperand(String value) { this.value = value; } @Override public String toString() { - return this.value; + return value; } - - + } Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/db/pom.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -153,5 +153,10 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: jbpm4/trunk/modules/db/scripts/antrun-schema.xml =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> - - - - - + + + + + + - - <project>  @@ -17,7 +16,7 @@ <target name="create-schema"> <taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" - classpathref="maven.compile.classpath" /> + classpathref="maven.runtime.classpath" /> <mkdir dir="${project.output.dir}" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/hsqldb.hibernate.cfg.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" +<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> @@ -11,7 +10,9 @@ <property name="hibernate.connection.url">@jdbc.url@</property> <property name="hibernate.connection.username">@jdbc.username@</property> <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> <mapping resource="jbpm.repository.hbm.xml" /> <mapping resource="jbpm.execution.hbm.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/mysql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/mysql.hibernate.cfg.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/mysql.hibernate.cfg.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" +<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> @@ -11,7 +10,9 @@ <property name="hibernate.connection.url">@jdbc.url@</property> <property name="hibernate.connection.username">@jdbc.username@</property> <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> <mapping resource="jbpm.repository.hbm.xml" /> <mapping resource="jbpm.execution.hbm.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/oracle.hibernate.cfg.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/oracle.hibernate.cfg.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" +<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> @@ -11,7 +10,9 @@ <property name="hibernate.connection.url">@jdbc.url@</property> <property name="hibernate.connection.username">@jdbc.username@</property> <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> <mapping resource="jbpm.repository.hbm.xml" /> <mapping resource="jbpm.execution.hbm.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/postgresql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/postgresql.hibernate.cfg.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/jdbc/postgresql.hibernate.cfg.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" +<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> @@ -11,7 +10,9 @@ <property name="hibernate.connection.url">@jdbc.url@</property> <property name="hibernate.connection.username">@jdbc.username@</property> <property name="hibernate.connection.password">@jdbc.password@</property> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> <mapping resource="jbpm.repository.hbm.xml" /> <mapping resource="jbpm.execution.hbm.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2010-09-08 06:51:48 UTC (rev 6652) @@ -31,6 +31,7 @@ SUSPHISTSTATE_ varchar(255), PRIORITY_ integer, HISACTINST_ bigint, + INITIATOR_ varchar(255), PARENT_ bigint, INSTANCE_ bigint, SUPEREXEC_ bigint, @@ -94,6 +95,8 @@ DURATION_ bigint, STATE_ varchar(255), ENDACTIVITY_ varchar(255), + SUPERPROCID_ varchar(255), + INITIATOR_ varchar(255), NEXTIDX_ integer, primary key (DBID_) ); @@ -101,6 +104,7 @@ create table JBPM4_HIST_TASK ( DBID_ bigint not null, DBVERSION_ integer not null, + NAME_ varchar(255), EXECUTION_ varchar(255), OUTCOME_ varchar(255), ASSIGNEE_ varchar(255), @@ -109,6 +113,7 @@ CREATE_ timestamp, END_ timestamp, DURATION_ bigint, + DUEDATE_ timestamp, NEXTIDX_ integer, SUPERTASK_ bigint, primary key (DBID_) Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2010-09-08 06:51:48 UTC (rev 6652) @@ -31,6 +31,7 @@ SUSPHISTSTATE_ varchar(255), PRIORITY_ integer, HISACTINST_ bigint, + INITIATOR_ varchar(255), PARENT_ bigint, INSTANCE_ bigint, SUPEREXEC_ bigint, @@ -93,6 +94,8 @@ DURATION_ bigint, STATE_ varchar(255), ENDACTIVITY_ varchar(255), + SUPERPROCID_ varchar(255), + INITIATOR_ varchar(255), NEXTIDX_ integer, primary key (DBID_) ) type=InnoDB; @@ -100,6 +103,7 @@ create table JBPM4_HIST_TASK ( DBID_ bigint not null, DBVERSION_ integer not null, + NAME_ varchar(255), EXECUTION_ varchar(255), OUTCOME_ varchar(255), ASSIGNEE_ varchar(255), @@ -108,6 +112,7 @@ CREATE_ datetime, END_ datetime, DURATION_ bigint, + DUEDATE_ datetime, NEXTIDX_ integer, SUPERTASK_ bigint, primary key (DBID_) Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2010-09-08 06:51:48 UTC (rev 6652) @@ -31,6 +31,7 @@ SUSPHISTSTATE_ varchar2(255 char), PRIORITY_ number(10,0), HISACTINST_ number(19,0), + INITIATOR_ varchar2(255 char), PARENT_ number(19,0), INSTANCE_ number(19,0), SUPEREXEC_ number(19,0), @@ -93,6 +94,8 @@ DURATION_ number(19,0), STATE_ varchar2(255 char), ENDACTIVITY_ varchar2(255 char), + SUPERPROCID_ varchar2(255 char), + INITIATOR_ varchar2(255 char), NEXTIDX_ number(10,0), primary key (DBID_) ); @@ -100,6 +103,7 @@ create table JBPM4_HIST_TASK ( DBID_ number(19,0) not null, DBVERSION_ number(10,0) not null, + NAME_ varchar2(255 char), EXECUTION_ varchar2(255 char), OUTCOME_ varchar2(255 char), ASSIGNEE_ varchar2(255 char), @@ -108,6 +112,7 @@ CREATE_ timestamp, END_ timestamp, DURATION_ number(19,0), + DUEDATE_ timestamp, NEXTIDX_ number(10,0), SUPERTASK_ number(19,0), primary key (DBID_) Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2010-09-08 06:51:48 UTC (rev 6652) @@ -31,6 +31,7 @@ SUSPHISTSTATE_ varchar(255), PRIORITY_ int4, HISACTINST_ int8, + INITIATOR_ varchar(255), PARENT_ int8, INSTANCE_ int8, SUPEREXEC_ int8, @@ -93,6 +94,8 @@ DURATION_ int8, STATE_ varchar(255), ENDACTIVITY_ varchar(255), + SUPERPROCID_ varchar(255), + INITIATOR_ varchar(255), NEXTIDX_ int4, primary key (DBID_) ); @@ -100,6 +103,7 @@ create table JBPM4_HIST_TASK ( DBID_ int8 not null, DBVERSION_ int4 not null, + NAME_ varchar(255), EXECUTION_ varchar(255), OUTCOME_ varchar(255), ASSIGNEE_ varchar(255), @@ -108,6 +112,7 @@ CREATE_ timestamp, END_ timestamp, DURATION_ int8, + DUEDATE_ timestamp, NEXTIDX_ int4, SUPERTASK_ int8, primary key (DBID_) Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,25 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> <session-factory> - - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password" /> + + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> </session-factory> </hibernate-configuration> Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/pvm/pom.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -150,11 +150,6 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <scope>runtime</scope> </dependency> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2010-09-08 06:51:48 UTC (rev 6652) @@ -217,7 +217,12 @@ if (isListOperand(namedParam)) { query.setParameterList(namedParam, transformToArray(parameter, clazz)); } else { - query.setString(namedParam, parameter); + if (clazz == Long.class) { + query.setLong(namedParam, Long.parseLong(parameter)); + } + else { + query.setString(namedParam, parameter); + } } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/DeploymentQueryTest.java 2010-09-08 06:51:48 UTC (rev 6652) @@ -26,6 +26,7 @@ import java.util.List; import java.util.Set; +import org.hibernate.HibernateException; import org.jbpm.api.Deployment; import org.jbpm.api.DeploymentQuery; import org.jbpm.api.QueryOperand; @@ -125,10 +126,15 @@ public void testLike() { List<String> deploymentIds = deployTestProcesses(); + + try { + repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0), QueryOperand.LIKE).count(); + fail("expected sql grammar exception"); + } + catch (HibernateException e) { + // operator like does not apply to long dbid field + } - assertEquals(1, repositoryService.createDeploymentQuery().deploymentId(deploymentIds.get(0), QueryOperand.LIKE).count()); - - deleteCascade(deploymentIds); } @@ -211,10 +217,6 @@ return processIds; } - private void testOrderBy(String property, List expectedValues) { - testOrderBy(property, expectedValues, null, false); - } - private void testOrderByNaturalOrdening(String property, int expectedNrOfResults) { testOrderBy(property, null, expectedNrOfResults, true); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryDetailQueryTest.java 2010-09-08 06:51:48 UTC (rev 6652) @@ -31,11 +31,9 @@ import org.jbpm.api.history.HistoryDetailQuery; import org.jbpm.api.history.HistoryDetailUpdate; import org.jbpm.api.task.Task; -import org.jbpm.pvm.internal.util.Clock; import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; - /** * @author Tom Baeyens */ @@ -154,43 +152,41 @@ @SuppressWarnings("unchecked") public void testHistoryVariable() { - - deployJpdlXmlString("<process name='HistoryTaskDetail'>" + - " <variable name='variable-to-update' type='string' init-expr='alex' history='true'/> " + - " <start>" + - " <transition to='review' />" + - " </start>" + - " <task name='review' " + - " assignee='johndoe'>" + - " <transition to='wait' />" + - " </task>" + - " <state name='wait'/>" + - "</process>"); + + deployJpdlXmlString("<process name='HistoryTaskDetail'>" + + " <variable name='variable-to-update' type='string' init-expr='alex' history='true'/> " + + " <start>" + " <transition to='review' />" + " </start>" + + " <task name='review' " + " assignee='johndoe'>" + + " <transition to='wait' />" + " </task>" + " <state name='wait'/>" + "</process>"); ProcessInstance pi = executionService.startProcessInstanceByKey("HistoryTaskDetail"); assertEquals("alex", executionService.getVariable(pi.getId(), "variable-to-update")); - + executionService.setVariable(pi.getId(), "variable-to-update", "peter"); - + List<Task> tasks = taskService.findPersonalTasks("johndoe"); assertEquals(1, tasks.size()); - + assertEquals("peter", executionService.getVariable(pi.getId(), "variable-to-update")); - - executionService.setVariable(pi.getId(), "variable-to-update", "jack"); + + executionService.setVariable(pi.getId(), "variable-to-update", "jack"); assertEquals("jack", historyService.getVariable(pi.getId(), "variable-to-update")); - - List<HistoryDetail> history = historyService.createHistoryDetailQuery().processInstanceId(pi.getId()).list(); - assertNotNull(history); + + List<HistoryDetail> history = historyService.createHistoryDetailQuery() + .processInstanceId(pi.getId()) + .orderAsc(HistoryDetailQuery.PROPERTY_TIME) + .list(); assertEquals(2, history.size()); - assertEquals("updated variable variable-to-update from alex to peter", history.get(0).toString()); - assertEquals("updated variable variable-to-update from peter to jack", history.get(1).toString()); - - assertEquals("alex", ((HistoryDetailUpdate)history.get(0)).getOldValue()); - assertEquals("peter", ((HistoryDetailUpdate)history.get(0)).getNewValue()); - - assertEquals("peter", ((HistoryDetailUpdate)history.get(1)).getOldValue()); - assertEquals("jack", ((HistoryDetailUpdate)history.get(1)).getNewValue()); + assertEquals("updated variable variable-to-update from alex to peter", history.get(0) + .toString()); + assertEquals("updated variable variable-to-update from peter to jack", history.get(1) + .toString()); + + assertEquals("alex", ((HistoryDetailUpdate) history.get(0)).getOldValue()); + assertEquals("peter", ((HistoryDetailUpdate) history.get(0)).getNewValue()); + + assertEquals("peter", ((HistoryDetailUpdate) history.get(1)).getOldValue()); + assertEquals("jack", ((HistoryDetailUpdate) history.get(1)).getNewValue()); } @SuppressWarnings("unchecked") Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryTaskQueryTest.java 2010-09-08 06:51:48 UTC (rev 6652) @@ -24,9 +24,6 @@ */ package org.jbpm.test.query; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -40,7 +37,6 @@ import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; - /** * @author Joram Barrez */ @@ -79,7 +75,7 @@ testOrderByNaturalOrdening(HistoryTaskQuery.PROPERTY_STATE, 3); } - private void testOrderBy(String property, List expectedValues) { + private void testOrderBy(String property, List<?> expectedValues) { testOrderBy(property, expectedValues, null, false); } @@ -130,8 +126,13 @@ public void testTaskIdLike() { createTestHistoryTasks(); - assertEquals(3, historyService.createHistoryTaskQuery().taskId("%", QueryOperand.LIKE).count()); - + try { + historyService.createHistoryTaskQuery().taskId("%", QueryOperand.LIKE).count(); + fail("expected number format exception"); + } + catch (NumberFormatException e) { + // non-numeric argument does not apply to long dbid field + } } public void testTaskIdIn() { @@ -354,14 +355,5 @@ } - private Date stringToDate(String dateString) { - DateFormat dateFormat = new SimpleDateFormat("dd/mm/yyyy"); - try { - return dateFormat.parse(dateString); - } catch (ParseException e) { - throw new RuntimeException("Couldn't convert " + dateString); - } - } - } Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2010-09-08 06:51:48 UTC (rev 6652) @@ -1,37 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> <session-factory> - -  - -  <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.password"/> - - <property name="hibernate.hbm2ddl.auto">create-drop</property> <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> <mapping resource="jbpm.repository.hbm.xml" /> <mapping resource="jbpm.execution.hbm.xml" /> <mapping resource="jbpm.history.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> <mapping resource="jbpm.identity.hbm.xml" /> - </session-factory> </hibernate-configuration> Modified: jbpm4/trunk/modules/test-db/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/logging.properties 2010-09-07 09:37:19 UTC (rev 6651) +++ jbpm4/trunk/modules/test-db/src/test/resources/logging.properties 2010-09-08 06:51:48 UTC (rev 6652) @@ -12,7 +12,7 @@ org.hibernate.level=INFO #org.hibernate.cfg.SettingsFactory.level=SEVERE #org.hibernate.cfg.HbmBinder.level=SEVERE -#org.hibernate.SQL.level=FINEST +org.hibernate.SQL.level=FINEST #org.hibernate.type.level=FINEST # org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST # org.hibernate.transaction.level=FINEST \ No newline at end of file

13 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r6651 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-09-07 05:37:19 -0400 (Tue, 07 Sep 2010) New Revision: 6651 Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh Log: update snapshots when building project in continuous integration scripts Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-09-05 07:15:02 UTC (rev 6650) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-09-07 09:37:19 UTC (rev 6651) @@ -49,7 +49,7 @@ fi # Set up Maven -export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" +export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms32m -Xmx256m" cp -u hudson/profiles.redhat.qa.xml profiles.xml # Determine jBPM version @@ -57,7 +57,7 @@ JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt` # Build jBPM -mvn -s /dev/null -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ +mvn -s /dev/null -U -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install if [ $? -ne 0 ]; then echo "ERROR: failed to build distro" Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh 2010-09-05 07:15:02 UTC (rev 6650) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh 2010-09-07 09:37:19 UTC (rev 6651) @@ -21,11 +21,11 @@ fi # Set up Maven -export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" +export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms32m -Xmx256m" cp -u hudson/profiles.redhat.qa.xml profiles.xml # Build jBPM -mvn -s /dev/null -Pdistro clean install +mvn -s /dev/null -U -Pdistro clean install if [ $? -ne 0 ]; then echo "ERROR: failed to build distro" exit 1

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits September 2010