JBoss JBPM SVN: r5530 - jbpm4/trunk/qa.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 05:05:41 -0400 (Tue, 25 Aug 2009)
New Revision: 5530
Added:
jbpm4/trunk/qa/hudson-jbpm4-cfg.sh
Log:
added configuration hudson ci driver script
Added: jbpm4/trunk/qa/hudson-jbpm4-cfg.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-cfg.sh (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2009-08-25 09:05:41 UTC (rev 5530)
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# runs the configuration test suite
+
+mvn clean install
+cd modules/test-cfg
+mvn clean test
+cd ../..
16 years, 8 months
JBoss JBPM SVN: r5529 - jbpm4/trunk/modules/distro/src/main/files/install.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 04:58:43 -0400 (Tue, 25 Aug 2009)
New Revision: 5529
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
changed os family from linux to unix
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-25 08:33:42 UTC (rev 5528)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-25 08:58:43 UTC (rev 5529)
@@ -288,9 +288,9 @@
depends="get.tomcat"
description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
<unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
- <condition property="isLinuxOrMac">
+ <condition property="isLinuxUnixOrMac">
<or>
- <os family="linux" />
+ <os family="unix" />
<os family="mac" />
</or>
</condition>
16 years, 8 months
JBoss JBPM SVN: r5528 - in jbpm4/trunk: qa and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 04:33:42 -0400 (Tue, 25 Aug 2009)
New Revision: 5528
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
Log:
another tomcat script launch debugging attempt: appending the env vars BASEDIR and CATALINE_HOME to the setclasspath.sh and catalina.sh respectively
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-25 08:03:16 UTC (rev 5527)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-25 08:33:42 UTC (rev 5528)
@@ -288,12 +288,35 @@
depends="get.tomcat"
description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
<unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
+ <condition property="isLinuxOrMac">
+ <or>
+ <os family="linux" />
+ <os family="mac" />
+ </or>
+ </condition>
+ <antcall target="install.tomcat.linuxandmac" />
+ </target>
+
+ <target name="install.tomcat.linuxandmac" if="isLinuxOrMac">
<chmod perm="a+x" os="Linux, Mac OS X">
- <fileset dir="${tomcat.home}/bin">
- <include name="*.sh" />
+ <fileset dir="${tomcat.home}/bin">
+ <include name="*.sh" />
</fileset>
</chmod>
- </target>
+ <!-- see http://wiki.apache.org/tomcat/HowTo#head-b4cd273179175e013471674e1c2a6003... -->
+ <move file="${tomcat.home}/bin/setclasspath.sh" tofile="${tomcat.home}/bin/setclasspath-src.sh" />
+ <concat destfile="${tomcat.home}/bin/setclasspath.sh" >
+ <filelist dir="${tomcat.home}/bin" files="setclasspath-src.sh" />
+ <footer>
+BASEDIR=${tomcat.home}</footer>
+ </concat>
+ <move file="${tomcat.home}/bin/catalina.sh" tofile="${tomcat.home}/bin/catalina-src.sh" />
+ <concat destfile="${tomcat.home}/bin/catalina.sh" >
+ <filelist dir="${tomcat.home}/bin" files="catalina-src.sh" />
+ <footer>
+CATALINE_HOME=${tomcat.home}</footer>
+ </concat>
+ </target>
<!-- ### GET TOMCAT ###################################################### -->
<condition property="is.tomcat.distro.available">
Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2009-08-25 08:03:16 UTC (rev 5527)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2009-08-25 08:33:42 UTC (rev 5528)
@@ -4,15 +4,14 @@
MAVEN_OPTS="-Xms1024M -Xmx1024M"
export CATALINA_HOME=`pwd`/jbpm-4.1-SNAPSHOT/apache-tomcat-6.0.20
-export BASEDIR=$CATALINA_HOME
ANT_PROPERTIES="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss -Dtomcat.distro.dir=tomcat.downloads"
mvn -U -Pdistro,integration clean install
ant -f qa/build.xml $ANT_PROPERTIES tomcat.integration.testsuite.setup
-cd modules\test-cactus
+cd modules/test-cactus
mvn -Pruntest test
-cd ..\..
+cd ../..
ant -f qa/build.xml $ANT_PROPERTIES tomcat.integration.testsuite.teardown
16 years, 8 months
JBoss JBPM SVN: r5527 - jbpm4/trunk/qa.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 04:03:16 -0400 (Tue, 25 Aug 2009)
New Revision: 5527
Modified:
jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
Log:
also set BASEDIR env variable
Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2009-08-25 07:19:01 UTC (rev 5526)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2009-08-25 08:03:16 UTC (rev 5527)
@@ -4,6 +4,7 @@
MAVEN_OPTS="-Xms1024M -Xmx1024M"
export CATALINA_HOME=`pwd`/jbpm-4.1-SNAPSHOT/apache-tomcat-6.0.20
+export BASEDIR=$CATALINA_HOME
ANT_PROPERTIES="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss -Dtomcat.distro.dir=tomcat.downloads"
16 years, 8 months
JBoss JBPM SVN: r5526 - jbpm4/trunk/modules/distro/src/main/files/install.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 03:19:01 -0400 (Tue, 25 Aug 2009)
New Revision: 5526
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
added wildcard to chmod +x to include setclasspath.sh in tomcat installation script
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-25 07:16:44 UTC (rev 5525)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-25 07:19:01 UTC (rev 5526)
@@ -288,9 +288,11 @@
depends="get.tomcat"
description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
<unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
- <chmod perm="a+x" file="${tomcat.home}/bin/catalina.sh" os="Linux, Mac OS X" />
- <chmod perm="a+x" file="${tomcat.home}/bin/startup.sh" os="Linux, Mac OS X" />
- <chmod perm="a+x" file="${tomcat.home}/bin/shutdown.sh" os="Linux, Mac OS X" />
+ <chmod perm="a+x" os="Linux, Mac OS X">
+ <fileset dir="${tomcat.home}/bin">
+ <include name="*.sh" />
+ </fileset>
+ </chmod>
</target>
<!-- ### GET TOMCAT ###################################################### -->
16 years, 8 months
JBoss JBPM SVN: r5525 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 03:16:44 -0400 (Tue, 25 Aug 2009)
New Revision: 5525
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java
Log:
improved command logging of launcher used by ant tasks
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-08-25 06:53:46 UTC (rev 5524)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-08-25 07:16:44 UTC (rev 5525)
@@ -45,7 +45,11 @@
public void run() {
try {
- task.log("starting '" + command + "'...");
+ String logCommand = "";
+ for (String commandPart: command) {
+ logCommand += commandPart+" ";
+ }
+ task.log("starting '" + logCommand + "'...");
Process process = new ProcessBuilder(command)
.redirectErrorStream(true)
.directory(dir)
16 years, 8 months
JBoss JBPM SVN: r5524 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-25 02:53:46 -0400 (Tue, 25 Aug 2009)
New Revision: 5524
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java
Log:
JBPM-2498 improved exception message when no execution is found
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java 2009-08-24 21:18:02 UTC (rev 5523)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java 2009-08-25 06:53:46 UTC (rev 5524)
@@ -56,6 +56,9 @@
DbSession dbSession = environment.get(DbSession.class);
ClientExecution execution = dbSession.findExecutionById(executionId);
+ if (execution==null) {
+ throw new JbpmException("execution "+executionId+" doesn't exist");
+ }
for (String variableName : variableNames) {
Object value = execution.getVariable(variableName);
variables.put(variableName, value);
16 years, 8 months
JBoss JBPM SVN: r5523 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx.
by do-not-reply＠jboss.org
Author: ainze
Date: 2009-08-24 17:18:02 -0400 (Mon, 24 Aug 2009)
New Revision: 5523
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
Log:
JBPM-2445 : integration with spring 1.2.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-08-24 16:12:20 UTC (rev 5522)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-08-24 21:18:02 UTC (rev 5523)
@@ -30,7 +30,6 @@
import org.jbpm.pvm.internal.svc.Interceptor;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
@@ -65,16 +64,15 @@
}
try {
- DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
+
+ TransactionTemplate template = new TransactionTemplate(platformTransactionManager);
-
if (useCurrent) {
- definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
+ template.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
} else {
- definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+ template.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
}
- TransactionTemplate template = new TransactionTemplate(platformTransactionManager, definition);
TransactionCallback transactionCallback = new CommandTransactionCallback<T>(command, next, platformTransactionManager);
T t = (T) template.execute(transactionCallback);
16 years, 8 months
JBoss JBPM SVN: r5522 - jbpm4/trunk/qa.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-24 12:12:20 -0400 (Mon, 24 Aug 2009)
New Revision: 5522
Modified:
jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
Log:
adding catalina_home for tomcat ci script
Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2009-08-24 15:38:00 UTC (rev 5521)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2009-08-24 16:12:20 UTC (rev 5522)
@@ -3,6 +3,7 @@
# runs the jboss integration test suite
MAVEN_OPTS="-Xms1024M -Xmx1024M"
+export CATALINA_HOME=`pwd`/jbpm-4.1-SNAPSHOT/apache-tomcat-6.0.20
ANT_PROPERTIES="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss -Dtomcat.distro.dir=tomcat.downloads"
16 years, 8 months
JBoss JBPM SVN: r5521 - jbpm4/trunk/modules/distro/src/main/files/install.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-24 11:38:00 -0400 (Mon, 24 Aug 2009)
New Revision: 5521
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
added chmod of catalina.sh
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-24 15:07:54 UTC (rev 5520)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-24 15:38:00 UTC (rev 5521)
@@ -288,6 +288,7 @@
depends="get.tomcat"
description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
<unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
+ <chmod perm="a+x" file="${tomcat.home}/bin/catalina.sh" os="Linux, Mac OS X" />
<chmod perm="a+x" file="${tomcat.home}/bin/startup.sh" os="Linux, Mac OS X" />
<chmod perm="a+x" file="${tomcat.home}/bin/shutdown.sh" os="Linux, Mac OS X" />
</target>
16 years, 8 months