3:54 a.m.
Author: alex.guizar(a)jboss.com
Date: 2010-07-01 04:54:37 -0400 (Thu, 01 Jul 2010)
New Revision: 6447
Added:
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml
Removed:
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/
Modified:
jbpm4/trunk/build.xml
jbpm4/trunk/modules/bpmn/pom.xml
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties
jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml
jbpm4/trunk/modules/enterprise/pom.xml
jbpm4/trunk/modules/examples/src/test/config/jndi.properties
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java
jbpm4/trunk/modules/test-cactus/pom.xml
jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties
jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties
jbpm4/trunk/modules/test-db/pom.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties
jbpm4/trunk/pom.xml
jbpm4/trunk/qa/build.xml
jbpm4/trunk/qa/hudson-jbpm4-cfg.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/jdbc/hsqldb.properties
Log:
JBPM-2893: revive hudson enterprise and jboss jobs
address bind address issues
Modified: jbpm4/trunk/build.xml
===================================================================
--- jbpm4/trunk/build.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/build.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -18,7 +18,7 @@
<!-- <property name="windows.browser" value="C:/Program
Files/Internet Explorer/IEXPLORE.EXE" /> -->
<property name="windows.browser" value="C:/Program Files/Mozilla
Firefox/firefox.exe" />
<property name="macos.browser" value="/usr/bin/open" />
- <property name="linux.browser" value="mozilla" />
+ <property name="linux.browser" value="firefox" />
<property name="distro.installation.dir" value="c:/software"
/>
<property name="distro.version" value="4.4-SNAPSHOT" />
@@ -34,13 +34,13 @@
</target>
<target name="install">
- <exec executable="${mvn.executable}" os="Windows Vista, Windows
XP,Windows 2000,Windows 98">
+ <exec executable="${mvn.executable}" os="Windows Vista, Windows
XP,Windows 2000">
<arg line="-DskipTests install" />
</exec>
</target>
<target name="javadoc">
- <exec executable="${mvn.executable}" dir="modules/api"
os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <exec executable="${mvn.executable}" dir="modules/api"
os="Windows Vista, Windows XP,Windows 2000">
<arg line="javadoc:javadoc" />
</exec>
<antcall target="show.html">
@@ -49,7 +49,7 @@
</target>
<target name="test.pvm">
- <exec dir="modules/pvm" executable="${mvn.executable}"
os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <exec dir="modules/pvm" executable="${mvn.executable}"
os="Windows Vista, Windows XP,Windows 2000">
<arg line="${mvn.executable} surefire-report:report" />
</exec>
<antcall target="show.html">
@@ -157,7 +157,7 @@
<target name="test.configuration" description="create test
configuration in target/config">
<ant antfile="modules/distro/src/main/resources/config-tool/build.xml"
target="db.drop.create" inheritall="false">
- <property name="jboss.bind.address" value="localhost" />
+ <property name="bind.address" value="localhost" />
<property name="config.files.dir"
value="${basedir}/target/config.tool/config.files" />
<property name="tmp.dir"
value="${basedir}/target/config.tool/tmp" />
<property name="libs.dir" value="${basedir}/target/libs"
/>
Modified: jbpm4/trunk/modules/bpmn/pom.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/pom.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/bpmn/pom.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -97,7 +97,7 @@
<id>integration.test</id>
<activation>
<property>
- <name>jboss.bind.address</name>
+ <name>bind.address</name>
</property>
</activation>
<properties>
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-06-30 20:45:31 UTC
(rev 6446)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-01 08:54:37 UTC
(rev 6447)
@@ -17,12 +17,8 @@
<!-- USER CUSTOMIZABLE PROPERTIES -->
<!-- {hsqldb | mysql | oracle | postgresql} -->
<property name="database" value="hsqldb" />
- <echo message="database......... ${database}" />
<!-- {standalone | jta | spring} -->
<property name="tx" value="standalone" />
- <echo message="tx............... ${tx}" />
- <property name="mail.smtp.host" value="localhost" />
- <echo message="mail.smtp.host... ${mail.smtp.host}" />
<!-- INTERNAL PROPERTY DEFAULTS -->
<property name="jbpm.version" value="4.4-SNAPSHOT" />
@@ -34,9 +30,11 @@
<property name="logging" value="jdk" />
<property name="cfg.dest.dir"
value="${jbpm.home}/install/generated/cfg" />
<property name="install.src.dir"
value="${jbpm.home}/install/src" />
+ <!-- default | testsuite -->
<property name="mail.cfg" value="default" />
- <property name="hsql.bind.address" value="localhost" />
+ <property name="bind.address" value="localhost" />
+
<property name="jdbc.properties.dir"
value="${jbpm.home}/install/jdbc" />
<property file="${jdbc.properties.dir}/${database}.properties" />
@@ -59,7 +57,6 @@
<property name="jboss.version" value="5.1.0.GA" />
<property name="jboss.parent.dir" value="${jbpm.home}" />
<property name="jboss.home"
value="${jboss.parent.dir}/jboss-${jboss.version}" />
- <property name="jboss.bind.address" value="localhost" />
<property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
<property name="jboss.distro.dir" value="downloads" />
<property name="jboss.distro.url"
@@ -173,8 +170,8 @@
<filterset filtersfile="${jdbc.properties.dir}/${database}.properties"
/>
</copy>
<replace file="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
- token="$${hsql.bind.address}"
- value="${hsql.bind.address}" />
+ token="$${bind.address}"
+ value="${bind.address}" />
<copy todir="${cfg.dest.dir}" overwrite="true">
<fileset dir="${install.src.dir}/cfg/logging/${logging}" />
</copy>
@@ -182,7 +179,7 @@
file="${install.src.dir}/cfg/mail/jbpm.mail.${mail.cfg}.properties"
overwrite="true">
<filterset>
- <filter token="mail.smtp.host" value="${mail.smtp.host}"
/>
+ <filter token="bind.address" value="${bind.address}"
/>
</filterset>
</copy>
@@ -284,7 +281,9 @@
</target>
<!-- ### INSTALL JBPM INTO JBOSS ######################### -->
- <target name="install.jbpm.into.jboss" description="Installs jBPM
into JBoss">
+ <target name="install.jbpm.into.jboss"
+ depends="create.cfg"
+ description="Installs jBPM into JBoss">
<!-- copy static configuration files -->
<copy todir="${jboss.server.config.dir}" overwrite="true">
<fileset dir="${jbpm.home}/install/src/jboss/config" />
@@ -297,16 +296,19 @@
<!-- copy the right datasource configuration file and replace the jdbc properties
with
the values in the jdbc/${database}.properties file -->
- <copy todir="${jboss.server.config.dir}/deploy/jbpm"
overwrite="true">
+ <copy
file="${jbpm.home}/install/src/jboss/datasources/jbpm-${database}-ds.xml"
+ todir="${jboss.server.config.dir}/deploy/jbpm"
overwrite="true">
<filterset filtersfile="${jdbc.properties.dir}/${database}.properties"
/>
- <fileset dir="${jbpm.home}/install/src/jboss/datasources">
- <include name="jbpm-${database}-ds.xml" />
- </fileset>
</copy>
<replace
file="${jboss.server.config.dir}/deploy/jbpm/jbpm-${database}-ds.xml"
- token="$${hsql.bind.address}"
- value="${hsql.bind.address}" />
+ token="$${bind.address}"
+ value="${bind.address}" />
+ <!-- copy the right mail properties file -->
+ <copy file="${cfg.dest.dir}/jbpm.mail.properties"
+ todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar"
+ overwrite="true" />
+
<!-- unzip console.war -->
<mkdir dir="${jboss.server.config.dir}/deploy/jbpm/gwt-console-jbpm.war"
/>
<unzip src="${jbpm.home}/lib/gwt-console-jbpm.war"
@@ -399,18 +401,18 @@
<exec executable="${jboss.home}/bin/run.bat" spawn="yes"
os="Windows 7,Windows Vista,Windows XP,Windows 2000">
<arg value="-b" />
- <arg value="${jboss.bind.address}" />
+ <arg value="${bind.address}" />
</exec>
<exec executable="${jboss.home}/bin/run.sh" spawn="yes"
os="Linux,Mac OS X">
<arg value="-b" />
- <arg value="${jboss.bind.address}" />
+ <arg value="${bind.address}" />
</exec>
<waitfor maxwait="5"
maxwaitunit="minute"
checkevery="30"
checkeveryunit="second"
timeoutproperty="jboss.timeout">
- <socket server="${jboss.bind.address}" port="8080" />
+ <socket server="${bind.address}" port="8080" />
</waitfor>
<fail if="jboss.timeout" message="jboss did not start within 5
minutes" />
</target>
@@ -421,12 +423,12 @@
<exec executable="${jboss.home}/bin/shutdown.bat"
os="Windows 7,Windows Vista,Windows XP,Windows 2000">
<arg value="-s" />
- <arg value="jnp://${jboss.bind.address}:1099" />
+ <arg value="jnp://${bind.address}:1099" />
<arg value="-S" />
</exec>
<exec executable="${jboss.home}/bin/shutdown.sh" os="Linux,Mac OS
X">
<arg value="-s" />
- <arg value="jnp://${jboss.bind.address}:1099" />
+ <arg value="jnp://${bind.address}:1099" />
<arg value="-S" />
</exec>
</target>
@@ -588,8 +590,8 @@
<filterset filtersfile="${jdbc.properties.dir}/${database}.properties"
/>
</copy>
<replace file="${tomcat.home}/conf/server.xml"
- token="$${hsql.bind.address}"
- value="${hsql.bind.address}" />
+ token="@bind.address(a)"
+ value="${bind.address}" />
</target>
<!-- ### INSTALL EXAMPLES INTO TOMCAT
################################################ -->
@@ -619,7 +621,7 @@
<java classname="org.hsqldb.Server" fork="yes"
spawn="yes">
<classpath location="${hsqldb.server.install.dir}/hsqldb.jar" />
<arg value="-address" />
- <arg value="${hsql.bind.address}" />
+ <arg value="${bind.address}" />
<arg value="-port" />
<arg value="1701" />
<arg value="-dbname.0" />
@@ -630,7 +632,7 @@
checkevery="10"
checkeveryunit="second"
timeoutproperty="hsqldb.timeout">
- <socket server="${hsql.bind.address}" port="1701" />
+ <socket server="${bind.address}" port="1701" />
</waitfor>
<fail if="hsqldb.timeout" message="hsqldb server did not start
within one minute" />
</target>
@@ -766,7 +768,7 @@
<target name="hsqldb.databasemanager" description="start the hsqldb
database manager">
<java classname="org.hsqldb.util.DatabaseManager"
fork="true">
<arg value="-url" />
- <arg value="jdbc:hsqldb:hsql://${hsql.bind.address}:1701" />
+ <arg value="jdbc:hsqldb:hsql://${bind.address}:1701" />
<classpath>
<fileset dir="${jbpm.home}/lib">
<include name="hsqldb.jar" />
Modified: jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties 2010-06-30
20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1,4 +1,4 @@
jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.url=jdbc\:hsqldb\:hsql\://${hsql.bind.address}\:1701
+jdbc.url=jdbc\:hsqldb\:hsql\://${bind.address}\:1701
jdbc.username=sa
jdbc.password=
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1,3 +1,4 @@
-mail.smtp.host=(a)mail.smtp.host@
+mail.smtp.host=(a)bind.address@
mail.smtp.port=25
mail.from=noreply(a)jbpm.org
+
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1,3 +1,4 @@
-mail.smtp.host localhost
-mail.smtp.port 2525
-mail.from noreply(a)jbpm.org
\ No newline at end of file
+mail.smtp.host=(a)bind.address@
+mail.smtp.port=2525
+mail.from=noreply(a)jbpm.org
+
Deleted:
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.mail.properties 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1,3 +0,0 @@
-mail.smtp.host=localhost
-mail.smtp.port=25
-mail.from=noreply(a)jbpm.org
Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2010-06-30
20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2010-07-01
08:54:37 UTC (rev 6447)
@@ -23,9 +23,9 @@
<Service name="Catalina">
- <Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000" redirectPort="8443" />
+ <Connector address="@bind.address(a)" port="8080"
protocol="HTTP/1.1" connectionTimeout="20000"
redirectPort="8443" />
- <Connector port="8009" protocol="AJP/1.3"
redirectPort="8443" />
+ <Connector address="@bind.address(a)" port="8009"
protocol="AJP/1.3" redirectPort="8443" />
<Engine name="Catalina" defaultHost="localhost">
Modified: jbpm4/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/pom.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/enterprise/pom.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -144,10 +144,10 @@
<profiles>
<profile>
- <id>no-jboss-bind-address</id>
+ <id>no-bind-address</id>
<activation>
<property>
- <name>!jboss.bind.address</name>
+ <name>!bind.address</name>
</property>
</activation>
<build>
Modified: jbpm4/trunk/modules/examples/src/test/config/jndi.properties
===================================================================
--- jbpm4/trunk/modules/examples/src/test/config/jndi.properties 2010-06-30 20:45:31 UTC
(rev 6446)
+++ jbpm4/trunk/modules/examples/src/test/config/jndi.properties 2010-07-01 08:54:37 UTC
(rev 6447)
@@ -1,3 +1,3 @@
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming\:org.jnp.interfaces
-java.naming.provider.url=jnp\://@jboss.bind.address@\:1099
+java.naming.provider.url=jnp\://@bind.address@\:1099
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -11,7 +11,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<name>jBPM 4 - jPDL</name>
@@ -44,6 +43,11 @@
<!-- 3rd Party -->
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<scope>provided</scope>
@@ -96,5 +100,4 @@
</properties>
</profile>
</profiles>
-
</project>
\ No newline at end of file
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
===================================================================
---
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2010-07-01
08:54:37 UTC (rev 6447)
@@ -81,7 +81,7 @@
if (textElement != null) {
String expressionText = XmlUtil.getContentText(textElement);
jmsActivity.setType("text");
- Expression expression = Expression.create(expressionText,
Expression.LANGUAGE_UEL);
+ Expression expression = Expression.create(expressionText,
Expression.LANGUAGE_UEL_VALUE);
jmsActivity.setTextExpression(expression);
}
@@ -89,7 +89,7 @@
if (objectElement != null) {
jmsActivity.setType("object");
String expressionText = XmlUtil.attribute(objectElement, "expr");
- Expression expression = Expression.create(expressionText,
Expression.LANGUAGE_UEL);
+ Expression expression = Expression.create(expressionText,
Expression.LANGUAGE_UEL_VALUE);
jmsActivity.setObjectExpression(expression);
}
Copied: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant (from rev 6438,
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant)
Deleted: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java
===================================================================
---
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java 2010-06-28
23:26:55 UTC (rev 6438)
+++
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1,86 +0,0 @@
-/*
- * 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.test.ant;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.List;
-
-import org.apache.tools.ant.Main;
-
-import org.jbpm.api.Deployment;
-import org.jbpm.test.JbpmTestCase;
-
-/**
- * @author Alejandro Guizar
- */
-public class DeployTaskTest extends JbpmTestCase {
-
- public void testDeployXml() {
- runTarget("deploy-xml");
- checkDeployment();
- }
-
- public void testDeployZip() {
- runTarget("deploy-zip");
- checkDeployment();
- }
-
- public void testDeployBar() {
- runTarget("deploy-bar");
- checkDeployment();
- }
-
- private void runTarget(String target) {
- PrintStream stdout = System.out;
- PrintStream stderr = System.err;
-
- ByteArrayOutputStream memout = new ByteArrayOutputStream();
- PrintStream prnout = new PrintStream(memout);
-
- try {
- System.setOut(prnout);
- System.setErr(prnout);
-
- Main antMain = new Main() {
-
- protected void exit(int exitCode) {
- // prevent ant from terminating the VM
- }
- };
- String[] args = { "-f",
getClass().getResource("build.xml").getPath(), target };
- antMain.startAnt(args, System.getProperties(), getClass().getClassLoader());
- }
- finally {
- System.setOut(stdout);
- System.setErr(stderr);
-
- log.info(new String(memout.toByteArray()));
- }
- }
-
- private void checkDeployment() {
- List<Deployment> deployments =
repositoryService.createDeploymentQuery().list();
- assertEquals(1, deployments.size());
- repositoryService.deleteDeploymentCascade(deployments.get(0).getId());
- }
-}
Copied: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java (from
rev 6439,
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/ant/DeployTaskTest.java)
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java
(rev 0)
+++
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/ant/DeployTaskTest.java 2010-07-01
08:54:37 UTC (rev 6447)
@@ -0,0 +1,89 @@
+/*
+ * 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.test.ant;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.List;
+
+import org.apache.tools.ant.Main;
+
+import org.jbpm.api.Deployment;
+import org.jbpm.test.JbpmTestCase;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class DeployTaskTest extends JbpmTestCase {
+
+ public void testDeployXml() {
+ runTarget("deploy-xml");
+ checkDeployment("valid.jpdl.xml");
+ }
+
+ public void testDeployZip() {
+ runTarget("deploy-zip");
+ checkDeployment("valid.zip");
+ }
+
+ public void testDeployBar() {
+ runTarget("deploy-bar");
+ checkDeployment("valid.bar");
+ }
+
+ private void runTarget(String target) {
+ PrintStream stdout = System.out;
+ PrintStream stderr = System.err;
+
+ ByteArrayOutputStream memout = new ByteArrayOutputStream();
+ PrintStream prnout = new PrintStream(memout);
+
+ try {
+ System.setOut(prnout);
+ System.setErr(prnout);
+
+ Main antMain = new Main() {
+
+ protected void exit(int exitCode) {
+ // prevent ant from terminating the VM
+ }
+ };
+ String[] args = { "-f",
getClass().getResource("build.xml").getPath(), target };
+ antMain.startAnt(args, System.getProperties(), getClass().getClassLoader());
+ }
+ finally {
+ System.setOut(stdout);
+ System.setErr(stderr);
+ }
+
+ log.info(memout.toString());
+ }
+
+ private void checkDeployment(String deploymentName) {
+ List<Deployment> deployments =
repositoryService.createDeploymentQuery().list();
+ assertEquals(1, deployments.size());
+
+ Deployment deployment = deployments.get(0);
+ assertEquals(deploymentName, deployment.getName());
+ repositoryService.deleteDeploymentCascade(deployment.getId());
+ }
+}
Copied: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant (from rev 6438,
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant)
Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml 2010-06-28
23:26:55 UTC (rev 6438)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project name="test-ant">
- <target name="init">
- <taskdef name="jbpm-deploy"
classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" />
- </target>
-
- <target name="deploy-xml" depends="init">
- <jbpm-deploy file="valid.jpdl.xml" />
- </target>
-
- <target name="deploy-zip" depends="init">
- <jbpm-deploy file="valid.zip" />
- </target>
-
- <target name="deploy-bar" depends="init">
- <jbpm-deploy file="valid.bar" />
- </target>
-</project>
\ No newline at end of file
Copied: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml (from rev
6439, jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/ant/build.xml)
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml
(rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/ant/build.xml 2010-07-01
08:54:37 UTC (rev 6447)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project name="test-ant">
+ <target name="init">
+ <dirname file="${ant.file}" property="base.dir" />
+ <echo>base directory: ${base.dir}</echo>
+ <taskdef name="jbpm-deploy"
classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" />
+ </target>
+
+ <target name="deploy-xml" depends="init">
+ <jbpm-deploy file="${base.dir}/valid.jpdl.xml" />
+ </target>
+
+ <target name="deploy-zip" depends="init">
+ <jbpm-deploy file="${base.dir}/valid.zip" />
+ </target>
+
+ <target name="deploy-bar" depends="init">
+ <jbpm-deploy file="${base.dir}/valid.bar" />
+ </target>
+</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java 2010-07-01
08:54:37 UTC (rev 6447)
@@ -34,7 +34,6 @@
import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
-
/** handles all expression resolving
*
* @author Tom Baeyens
@@ -43,12 +42,12 @@
private static final long serialVersionUID = 1L;
- public static final String LANGUAGE_UEL = "uel";
- public static final String LANGUAGE_UEL_METHOD = "uel-method";
- public static final String LANGUAGE_UEL_VALUE = "uel-value";
+ private static final String LANGUAGE_UEL = "uel";
+ public static final String LANGUAGE_UEL_METHOD = LANGUAGE_UEL + "-method";
+ public static final String LANGUAGE_UEL_VALUE = LANGUAGE_UEL + "-value";
- private static ExpressionFactory expressionFactory = null;
- private static ELContext elContext = null;
+ private static ExpressionFactory expressionFactory;
+ private static ELContext elContext;
public static Expression create(String expressionText, String language) {
// if there is an expr specified
Modified: jbpm4/trunk/modules/test-cactus/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-cactus/pom.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/test-cactus/pom.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: pom.xml 5319 2009-07-17 10:03:46Z tom.baeyens(a)jboss.com $ -->
+<!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
@@ -60,30 +58,6 @@
<filtering>true</filtering>
</testResource>
</testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>delete.previous.generated.files</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete>
- <fileset dir=".">
- <include
name="src/test/java/org/jbpm/test/AllIntegrationTests.java*" />
- </fileset>
- </delete>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<profiles>
@@ -235,9 +209,8 @@
<id>runtest</id>
<dependencies>
<dependency>
- <groupId>apache-httpclient</groupId>
+ <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -271,6 +244,7 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -284,38 +258,33 @@
</goals>
<configuration>
<tasks>
- <property name="test_classpath"
refid="maven.test.classpath" />
- <echo message="${test_classpath}" />
- <delete>
- <fileset dir=".">
- <include
name="src/test/java/org/jbpm/test/AllIntegrationTests.java*" />
- </fileset>
- </delete>
- <java
classname="org.jbpm.cactustool.CactusTestGenerator">
- <classpath path="${test_classpath}" />
- <arg line="src/test/java ../examples/src/test/java
../test-db/src/test/java" />
+ <echo>Bind address: ${bind.address}</echo>
+ <java
classname="org.jbpm.cactustool.CactusTestGenerator"
classpathref="maven.test.classpath">
+ <arg file="${project.build.testSourceDirectory}"
/>
+ <arg file="${basedir}/../examples/src/test/java"
/>
+ <arg file="${basedir}/../test-db/src/test/java" />
</java>
</tasks>
</configuration>
</execution>
+
<execution>
<id>remove-generated-cactus-test</id>
- <phase>package</phase>
+ <phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<delete>
- <fileset dir=".">
- <include
name="src/test/java/org/jbpm/test/AllIntegrationTests.java*" />
- </fileset>
+ <fileset dir="src/test/java"
includes="org/jbpm/test/AllIntegrationTests.java" />
</delete>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -328,5 +297,4 @@
</build>
</profile>
</profiles>
-
</project>
Property changes on: jbpm4/trunk/modules/test-cactus/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties
===================================================================
--- jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties 2010-06-30
20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1 +1 @@
-cactus.contextURL=http\://@jboss.bind.address@\:8080/jbpm-test-webapp
+cactus.contextURL=http\://${bind.address}\:8080/jbpm-test-webapp
Modified: jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties
===================================================================
--- jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties 2010-06-30 20:45:31
UTC (rev 6446)
+++ jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties 2010-07-01 08:54:37
UTC (rev 6447)
@@ -1,3 +1,3 @@
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.factory.url.pkgs=org.jboss.naming\:org.jnp.interfaces
-java.naming.provider.url=jnp\://@jboss.bind.address@\:1099
+java.naming.provider.url=jnp\://${bind.address}\:1099
Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/modules/test-db/pom.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -66,11 +66,6 @@
<artifactId>spring</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml 2010-06-30 20:45:31
UTC (rev 6446)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml 2010-07-01 08:54:37
UTC (rev 6447)
@@ -1,140 +1,147 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <modelVersion>4.0.0</modelVersion>
+<!-- $Id$ -->
- <name>jBPM 4 - Test Enterprise Suite</name>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-enterprise-suite</artifactId>
- <packaging>jar</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Parent -->
- <parent>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm</artifactId>
- <version>4.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
- <dependencies>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-enterprise-ejb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-base</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus.core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <name>jBPM 4 - Test Enterprise Suite</name>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test-enterprise-suite</artifactId>
+ <packaging>jar</packaging>
- <profiles>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>4.4-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
- <profile>
- <id>enterprise</id>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-jar</id>
- <phase>package</phase>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>jbpm-test-destinations-service.xml</exclude>
- <exclude>cactus.properties</exclude>
- <exclude>META-INF/*</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy.libs</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>cactus</groupId>
- <artifactId>cactus.core</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <dependencies>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test-enterprise-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test-base</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <profile>
- <id>runtest</id>
- <dependencies>
- <dependency>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus.core</artifactId>
- </dependency>
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
- </profiles>
+ <profiles>
+ <profile>
+ <id>enterprise</id>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>jbpm-test-destinations-service.xml</exclude>
+ <exclude>cactus.properties</exclude>
+ <exclude>META-INF/*</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy.libs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>target/jbpm.test.webapp.libs</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.core</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>runtest</id>
+ <dependencies>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java
===================================================================
---
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2010-07-01
08:54:37 UTC (rev 6447)
@@ -27,7 +27,6 @@
import junit.framework.Test;
import org.apache.cactus.ServletTestSuite;
-import org.jbpm.pvm.internal.tx.JtaTransaction;
import org.jbpm.test.JbpmTestCase;
public class QueueTextMessageTest extends JbpmTestCase {
Modified:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties
===================================================================
---
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties 2010-06-30
20:45:31 UTC (rev 6446)
+++
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties 2010-07-01
08:54:37 UTC (rev 6447)
@@ -1 +1 @@
-cactus.contextURL=http://localhost:8080/jbpm-test-webapp
+cactus.contextURL=http://${bind.address}:8080/jbpm-test-webapp
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/pom.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -50,6 +50,7 @@
<beanshell.version>2.0b5</beanshell.version>
<cactus.version>1.8.1</cactus.version>
<cdi.version>1.0</cdi.version>
+ <commons.httpclient.version>3.1</commons.httpclient.version>
<drools.version>5.0.1</drools.version>
<errai.version>1.1-M1</errai.version>
<freemarker.version>2.3.15</freemarker.version>
@@ -248,6 +249,11 @@
<version>${cdi.version}</version>
</dependency>
<dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>${drools.version}</version>
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/qa/build.xml 2010-07-01 08:54:37 UTC (rev 6447)
@@ -8,11 +8,12 @@
<fail message="property jbpm.parent.dir must be specified"
unless="jbpm.parent.dir" />
<!-- CONFIGURABLE PROPERTIES -->
- <property name="database" value="hsqldb" />
+ <property name="database" value="hsqldb" />
<property name="identity.component" value="jbpm-built-in" />
<property name="jbpm.version" value="4.4-SNAPSHOT" />
- <property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <!-- jbpm.home should
not be configured. change jbpm.parent.dir instead -->
- <property name="jboss.version" value="5.0.0.GA" />
+ <!-- jbpm.home should not be configured. change jbpm.parent.dir instead -->
+ <property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
+ <property name="jboss.version" value="5.1.0.GA" />
<property name="jboss.distro.dir" value="${jbpm.home}/downloads"
/>
<property name="jboss.parent.dir" value="${jbpm.home}" />
<property name="jboss.home"
value="${jboss.parent.dir}/jboss-${jboss.version}" />
@@ -23,6 +24,8 @@
<property name="tomcat.parent.dir" value="${jbpm.home}" />
<property name="tomcat.home"
value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" />
+ <property name="mail.cfg" value="testsuite" />
+
<!-- DERIVED PROPERTIES -->
<property name="jbpm.filename"
value="jbpm-distro-${jbpm.version}.zip" />
<property name="jbpm.distro.dir"
value="../modules/distro/target" />
@@ -35,13 +38,11 @@
<equals arg1="${database}" arg2="oracle" />
</condition>
-
<echo message="database.......... ${database}" />
<echo message="jbpm.version...... ${jbpm.version}" />
<echo message="jbpm.home......... ${jbpm.home}" />
<echo message="jbpm.distro.path.. ${jbpm.distro.path}" />
-
<!-- ####################################### -->
<!-- ### MAIN SETUP AND TEARDOWN TARGETS ### -->
<!-- ####################################### -->
Modified: jbpm4/trunk/qa/hudson-jbpm4-cfg.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/qa/hudson-jbpm4-cfg.sh 2010-07-01 08:54:37 UTC (rev 6447)
@@ -3,5 +3,6 @@
# runs the configuration test suite
mvn -U -Pdistro clean install
-cd modules/test-cfg
-mvn -Dmaven.test.failure.ignore=true clean test
+
+mvn -f modules/test-cfg/pom.xml -Dmaven.test.failure.ignore=true \
+ clean test
Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-07-01 08:54:37 UTC (rev 6447)
@@ -2,16 +2,20 @@
#
# runs the jboss integration test suite
-MAVEN_OPTS="-Xmx512M -Djboss.bind.address=$JBOSS_BINDADDR"
-ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \
--Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.bind.address=$JBOSS_BINDADDR \
--Dhsql.bind.address=$JBOSS_BINDADDR"
+# Give tests a max memory amount of at least 256 MB
+TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
+MAX_MEM=`expr $TOTAL_MEM / 4`
+[ $MAX_MEM -lt 256 ] && MAX_MEM=256
+MAX_MEM="$MAX_MEM"m
+export MAVEN_OPTS="-Xmx$MAX_MEM -Dbind.address=$JBOSS_BINDADDR"
+export ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \
+ -Djboss.distro.dir=$SOURCE_REPO/jboss -Dbind.address=$JBOSS_BINDADDR"
+
mvn -U -Pdistro,enterprise clean install
ant -f qa/build.xml testsuite.enterprise.setup
-cd modules/test-enterprise/test-enterprise-suite
-mvn -Pruntest test
-cd ../../..
+mvn -f modules/test-enterprise/test-enterprise-suite/pom.xml -Pruntest \
+ -Dmaven.test.failure.ignore=true clean test
ant -f qa/build.xml testsuite.enterprise.teardown
Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-07-01 08:54:37 UTC (rev 6447)
@@ -2,20 +2,20 @@
#
# runs the jboss integration test suite
-MAVEN_OPTS="-Xmx512M -Djboss.bind.address=$JBOSS_BINDADDR"
-ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \
--Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.bind.address=$JBOSS_BINDADDR \
--Dhsql.bind.address=$JBOSS_BINDADDR"
+# Give tests a max memory amount of at least 256 MB
+TOTAL_MEM=`free -mo | grep Mem | awk '{ print $2 }'`
+MAX_MEM=`expr $TOTAL_MEM / 4`
+[ $MAX_MEM -lt 256 ] && MAX_MEM=256
+MAX_MEM="$MAX_MEM"m
+export MAVEN_OPTS="-Xmx$MAX_MEM -Dbind.address=$JBOSS_BINDADDR"
-# just in case the previous run didnt complete ok, we stop jboss
-ant -f modules/distro/src/main/files/install/build.xml reinstall.jboss
-ant -f modules/distro/src/main/files/install/build.xml stop.jboss
+export ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE \
+ -Djboss.distro.dir=$SOURCE_REPO/jboss -Dbind.address=$JBOSS_BINDADDR"
mvn -U -Pdistro,integration clean install
ant -f qa/build.xml testsuite.jboss.setup
-cd modules/test-cactus
-mvn -Pruntest test
-cd ../..
+mvn -f modules/test-cactus/pom.xml -Pruntest \
+ -Dmaven.test.failure.ignore=true clean test
ant -f qa/build.xml testsuite.jboss.teardown
Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-07-01 08:54:37 UTC (rev 6447)
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# runs the jboss integration test suite
+# runs the tomcat integration test suite
-MAVEN_OPTS="-Xmx512M -Dtomcat.bind.address=$TOMCAT_BINDADDR"
-ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss \
--Dtomcat.distro.dir=tomcat.downloads -Dtomcat.bind.address=$TOMCAT_BINDADDR"
+MAVEN_OPTS="-Xmx512M -Dbind.address=$TOMCAT_BINDADDR"
+ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dtomcat.distro.dir=tomcat.downloads \
+-Dbind.address=$TOMCAT_BINDADDR"
mvn -U -Pdistro,integration clean install
ant -f qa/build.xml reinstall.jbpm
Modified: jbpm4/trunk/qa/jdbc/hsqldb.properties
===================================================================
--- jbpm4/trunk/qa/jdbc/hsqldb.properties 2010-06-30 20:45:31 UTC (rev 6446)
+++ jbpm4/trunk/qa/jdbc/hsqldb.properties 2010-07-01 08:54:37 UTC (rev 6447)
@@ -1,4 +1,4 @@
jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.url=jdbc\:hsqldb\:hsql\://${hsql.bind.address}\:1701
+jdbc.url=jdbc\:hsqldb\:hsql\://${bind.address}\:1701
jdbc.username=sa
jdbc.password=