[jbpm-commits] JBoss JBPM SVN: r5446 - in jbpm4/trunk: modules/distro/src/main/files/install/src and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 7 11:55:27 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-08-07 11:55:27 -0400 (Fri, 07 Aug 2009)
New Revision: 5446
Added:
jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/
jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/images/
jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/images/jbpm.png
jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/index.html
jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat
jbpm4/trunk/qa/jbpm.cfg/
jbpm4/trunk/qa/jbpm.cfg/tomcat/
jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.cfg.xml
jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.hibernate.cfg.xml
jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.properties
jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.templates.examples.xml
jbpm4/trunk/qa/jbpm.cfg/tomcat/logging.properties
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
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/StartJBossTask.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java
jbpm4/trunk/modules/test-cactus/pom.xml
jbpm4/trunk/qa/build.xml
Log:
JBPM-2409 JBPM-2411 work to get tomcat in the ci
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-07 13:39:29 UTC (rev 5445)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-07 15:55:27 UTC (rev 5446)
@@ -22,7 +22,7 @@
<property name="logging" value="jdk" /> <!-- jdk | provided -->
<property name="tomcat.version" value="6.0.20" />
- <property name="tomcat.parent.dir" value="generated" />
+ <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" />
@@ -30,18 +30,18 @@
<property name="tomcat.distro.path" value="${tomcat.distro.dir}/${tomcat.filename}" />
<property name="jboss.version" value="5.1.0.GA" />
- <property name="jboss.parent.dir" value="generated" />
+ <property name="jboss.parent.dir" value="${jbpm.home}" />
<property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" />
<property name="jboss.filename" value="jboss-${jboss.version}.zip" />
- <property name="jboss.distro.dir" value="downloads" />
- <property name="jboss.distro.url" value="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-5.1.0.GA/${jboss.filename}?use_mirror=surfnet"/>
+ <property name="jboss.distro.dir" value="downloads" />
+ <property name="jboss.distro.url" value="http://downloads.sourceforge.net/jboss/${jboss.filename}" />
<property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" />
<property name="jboss.server.configuration" value="default" />
<property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
<property name="jboss.server.data.dir" value="${jboss.home}/server/${jboss.server.configuration}/data" />
<!-- ### CREATE CONFIGURATION ########################################### -->
- <target name="generate.cfg" description="Generates a configuration in dir generated/cfg">
+ <target name="create.cfg" description="Creates a configuration in dir generated/cfg">
<delete dir="generated/cfg" />
<mkdir dir="generated/cfg" />
<copy tofile="generated/cfg/jbpm.cfg.xml"
@@ -61,6 +61,54 @@
</copy>
</target>
+ <!-- ### CREATE USER WEBAPP ########################################## -->
+ <target name="create.user.webapp"
+ depends="create.cfg"
+ description="Generates a configuration in dir generated/cfg">
+ <delete dir="generated/user.webapp" />
+ <mkdir dir="generated/user.webapp/WEB-INF/classes" />
+ <mkdir dir="generated/user.webapp/WEB-INF/lib" />
+ <copy todir="generated/user.webapp">
+ <fileset dir="src/user.webapp"/>
+ </copy>
+ <copy todir="generated/user.webapp/WEB-INF/classes">
+ <fileset dir="generated/cfg">
+ <exclude name="logging.properties" />
+ </fileset>
+ </copy>
+ <copy todir="generated/user.webapp/WEB-INF/lib">
+ <fileset dir="${jbpm.home}">
+ <include name="jbpm.jar" />
+ </fileset>
+ <fileset dir="${jbpm.home}/lib">
+ <include name="activation.jar" />
+ <include name="antlr.jar" />
+ <include name="commons-collections.jar" />
+ <include name="dom4j.jar" />
+ <include name="freemarker.jar" />
+ <include name="hibernate-core.jar" />
+ <include name="hibernate-cglib-repack.jar" />
+ <include name="javassist.jar" />
+ <include name="jta.jar" />
+ <include name="juel*.jar" />
+ <include name="livetribe-jsr223.jar" />
+ <include name="mail.jar" />
+ <include name="slf4j-api.jar" />
+ <include name="slf4j-jdk14.jar" />
+ <include name="gwt-console-server-integration.jar" />
+ <include name="gwt-console-rpc.jar" />
+ <include name="jbpm-console-integration.jar" />
+ <include name="jbpm-console-form-plugin.jar" />
+ <include name="jbpm-console-graphView-plugin.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- copy database driver -->
+ <property name="database.driver.destination.dir" value="generated/user.webapp/WEB-INF/lib" />
+ <property name="is.tomcat" value="true" />
+ <antcall target="internal.copy.database.driver" />
+ </target>
+
<!-- ### REINSTALL JBOSS ################################################ -->
<target name="reinstall.jboss"
depends="delete.jboss, install.jboss"
@@ -246,7 +294,7 @@
<!-- ### INSTALL JBPM INTO TOMCAT ####################################### -->
<target name="install.jbpm.into.tomcat"
- depends="generate.cfg"
+ depends="create.cfg"
description="Installs jBPM into tomcat">
<!-- create the jbpm configuration jar file -->
@@ -261,16 +309,25 @@
<include name="jbpm.jar" />
</fileset>
<fileset dir="${jbpm.home}/lib">
- <include name="gwt-console-server-integration.jar" />
+ <include name="activation.jar" />
+ <include name="antlr.jar" />
+ <include name="commons-collections.jar" />
+ <include name="dom4j.jar" />
+ <include name="freemarker.jar" />
+ <include name="hibernate-core.jar" />
+ <include name="hibernate-cglib-repack.jar" />
+ <include name="javassist.jar" />
+ <include name="jta.jar" />
+ <include name="juel*.jar" />
+ <include name="livetribe-jsr223.jar" />
+ <include name="mail.jar" />
+ <include name="slf4j-api.jar" />
+ <include name="slf4j-jdk14.jar" />
+ <include name="gwt-console-server-integration.jar" />
<include name="gwt-console-rpc.jar" />
<include name="jbpm-console-integration.jar" />
<include name="jbpm-console-form-plugin.jar" />
<include name="jbpm-console-graphView-plugin.jar"/>
- <include name="freemarker.jar" />
- <include name="livetribe-jsr223.jar" />
- <include name="juel*.jar" />
- <include name="hibernate-core.jar" />
- <include name="hibernate-cglib-repack.jar" />
</fileset>
</copy>
@@ -282,13 +339,14 @@
</copy>
<!-- reporting -->
- <property name="birt.dir" value="${jboss.server.data.dir}/birt"/>
+ <property name="birt.dir" value="${tomcat.home}/birt"/>
<mkdir dir="${birt.dir}"/>
<unzip src="${jbpm.home}/lib/report-engine.zip" dest="${birt.dir}"/>
<unzip src="${jbpm.home}/lib/jbpm-console-reports.jar" dest="${birt.dir}"/>
<!-- copy database driver -->
- <property name="container.lib.dir" value="${tomcat.home}/" />
+ <property name="driver.destination.dir" value="${tomcat.home}/" />
+ <property name="is.tomcat" value="true" />
<antcall target="internal.copy.database.driver" />
</target>
@@ -324,13 +382,26 @@
</condition>
<condition property="database.driver" value="ojdbc14.jar">
<equals arg1="${database}" arg2="oracle" />
- </condition>
+ </condition>
+ <condition property="database.driver" value="mysql-connector-java.jar">
+ <equals arg1="${database}" arg2="mysql" />
+ </condition>
<condition property="database.driver" value="postgresql.jar">
<equals arg1="${database}" arg2="postgresql" />
</condition>
+ <condition property="database.driver" value="hsqldb.jar">
+ <and>
+ <equals arg1="${database}" arg2="hsqldb" />
+ <equals arg1="${is.tomcat}" arg2="true" />
+ </and>
+ </condition>
+ <antcall target="internal.copy.database.driver.if.needed" />
+ </target>
+
+ <target name="internal.copy.database.driver.if.needed" if="database.driver">
<available file="${jbpm.home}/lib/${database.driver}" property="database.driver.jar.available" />
<fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" />
- <copy file="${jbpm.home}/lib/${database.driver}" todir="${container.lib.dir}" />
- </target>
+ <copy file="${jbpm.home}/lib/${database.driver}" todir="${database.driver.destination.dir}" />
+ </target>
</project>
Added: jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/images/jbpm.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/images/jbpm.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/index.html
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/index.html (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/index.html 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+ <head>
+ <meta http-equiv="content-type" content="text/html;">
+ <title>jBPM User Webapp</title>
+ </head>
+ <body>
+ <img src="images/jbpm.png" />
+ <span style="font-family:verdana;"> User Webapp</span>
+ </body>
+</html>
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/index.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-07 13:39:29 UTC (rev 5445)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-08-07 15:55:27 UTC (rev 5446)
@@ -22,6 +22,7 @@
package org.jbpm.pvm.internal.ant;
import java.io.BufferedReader;
+import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -33,27 +34,33 @@
Task task;
String command;
String endMsg;
+ File dir;
- public Launcher(Task task, String command, String endMsg) {
+ public Launcher(Task task, String command, String endMsg, String dir) {
this.task = task;
this.command = command;
this.endMsg = endMsg;
+ this.dir = (dir!=null ? new File(dir) : null);
}
public void run() {
try {
task.log("starting '" + command + "'...");
- Process process = Runtime.getRuntime().exec(command);
+ Process process = new ProcessBuilder(command)
+ .redirectErrorStream(true)
+ .directory(dir)
+ .start();
+
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line = "";
while (line.indexOf(endMsg) == -1) {
line = reader.readLine();
task.log(line);
}
+
task.log("'" + command + "' started.");
} catch (IOException e) {
throw new BuildException("couldn't start '" + command + "'", e);
}
}
-
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-08-07 13:39:29 UTC (rev 5445)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-08-07 15:55:27 UTC (rev 5446)
@@ -48,7 +48,7 @@
}
// launch the command and wait till the END_MESSAGE appears
- Thread launcher = new Launcher(this, command, END_MESSAGE);
+ Thread launcher = new Launcher(this, command, END_MESSAGE, null);
launcher.start();
launcher.join();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-07 13:39:29 UTC (rev 5445)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-07 15:55:27 UTC (rev 5446)
@@ -44,15 +44,15 @@
// build the command string
String command = null;
if ( os.indexOf( "windows" ) != -1 ) {
- command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "startup.bat";
+ command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "catalina.bat run";
} else if ( os.indexOf( "linux" ) != -1 || os.indexOf( "mac" ) != -1) {
- command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "startup.sh";
+ command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "catalina.sh run";
} else {
- throw new BuildException( "os '" + os + "' not supported in the starttomcat task." );
+ throw new BuildException( "os '" + os + "' not supported in the start-tomcat task." );
}
// launch the command and wait till the END_MESSAGE appears
- Thread launcher = new Launcher(this, command, END_MESSAGE);
+ Thread launcher = new Launcher(this, command, END_MESSAGE, getTomcatHome()+fileSeparator+"bin");
launcher.start();
launcher.join();
@@ -69,7 +69,7 @@
if (tomcatHomeSysProp!=null) {
return tomcatHomeSysProp;
}
- throw new BuildException("starttomcat couldn't figure out which tomcat to start: attribute tomcathome not specified and property tomcat.home was not set");
+ throw new BuildException("start-tomcat couldn't figure out which tomcat to start: attribute tomcathome not specified and property tomcat.home was not set");
}
public void setTomcathome(String tomcathome) {
Modified: jbpm4/trunk/modules/test-cactus/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-07 13:39:29 UTC (rev 5445)
+++ jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-07 15:55:27 UTC (rev 5446)
@@ -15,10 +15,10 @@
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 - Cactus</name>
+ <name>jBPM 4 - Test Cactus</name>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-test-cactus</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<!-- Parent -->
<parent>
@@ -28,112 +28,95 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <!-- Dependencies -->
<dependencies>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-examples</artifactId>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.subethamail</groupId>
- <artifactId>subethasmtp-wiser</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-db</artifactId>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.subethamail</groupId>
- <artifactId>subethasmtp-wiser</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus.core</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus.integration.shared.api</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus.integration.ant</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-examples</artifactId>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test-db</artifactId>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.core</artifactId>
+ </dependency>
</dependencies>
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-cactus-test-suite</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <echo message="${test_classpath}" />
- <java classname="org.jbpm.cactustool.CactusTestGenerator">
- <classpath path="${test_classpath}"/>
- <arg line="src/test/java ../examples/src/test/java" />
- </java>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/jbpm/test/AllIntegrationTests.java</include>
- </includes>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
<profiles>
<profile>
+ <id>integration</id>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <build>
+ <plugins>
+ <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/warlibs</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.core</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.integration.ant</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.integration.shared.api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-examples</artifactId>
+ <classifier>tests</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test-db</artifactId>
+ <classifier>tests</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.subethamail</groupId>
+ <artifactId>subethasmtp-wiser</artifactId>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
<id>runtest</id>
<dependencies>
<dependency>
@@ -151,7 +134,62 @@
<artifactId>jbpm-test-db</artifactId>
<classifier>tests</classifier>
</dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.integration.shared.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus.integration.ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-cactus-test-suite</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <echo message="${test_classpath}" />
+ <java classname="org.jbpm.cactustool.CactusTestGenerator">
+ <classpath path="${test_classpath}"/>
+ <arg line="src/test/java ../examples/src/test/java" />
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/jbpm/test/AllIntegrationTests.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-08-07 13:39:29 UTC (rev 5445)
+++ jbpm4/trunk/qa/build.xml 2009-08-07 15:55:27 UTC (rev 5446)
@@ -25,39 +25,69 @@
<property name="jbpm.distro.path" value="${jbpm.distro.dir}/jbpm-${jbpm.version}.zip" />
<property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
- <property name="jbossidm.version" value="1.0.0.Beta1" />
- <property name="jbossidm.home" value="${jbpm.parent.dir}/jbossidm-${jbossidm.version}" />
-
- <!-- ### LOG PROPERTIES ################################################# -->
- <target name="log.properties">
- <echo message="database.......... ${database}" />
- <echo message="jbpm.version...... ${jbpm.version}" />
- <echo message="jbpm.home......... ${jbpm.home}" />
- <echo message="jbpm.distro.path.. ${jbpm.distro.path}" />
- <echo message="jbossidm.home .... ${jbossidm.home}" />
- </target>
-
<condition property="jbpm.identity.idm">
<equals arg1="${identity.component}" arg2="jboss.idm"/>
</condition>
- <!-- TARGETS -->
+ <echo message="database.......... ${database}" />
+ <echo message="jbpm.version...... ${jbpm.version}" />
+ <echo message="jbpm.home......... ${jbpm.home}" />
+ <echo message="jbpm.distro.path.. ${jbpm.distro.path}" />
+
+
+ <!-- DELETE JBPM INSTALLATION -->
<target name="delete.jbpm.installation"
description="deletes ${jbpm.home}">
<delete dir="${jbpm.home}" />
</target>
+ <!-- INSTALL JBPM -->
<target name="install.jbpm"
description="unzips the jbpm distro file in the ${jbpm.parent.dir}">
<unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" />
</target>
+ <!-- REINSTALL JBPM -->
<target name="reinstall.jbpm"
depends="delete.jbpm.installation, install.jbpm"
description="deletes the jbpm installation and then reinstalls jbpm"/>
+ <!-- REINSTALL TOMCAT AND JBPM -->
+ <target name="reinstall.tomcat.and.jbpm">
+ <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat.and.jbpm" />
+ </target>
+
+ <!-- CUSTOMIZE TOMCAT FOR INTEGRATION TESTSUITE -->
+ <target name="customize.tomcat.for.integration.testsuite">
+ <!-- add the examples.jar to the tomcat libs dir -->
+ <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
+ <copy file="${jbpm.home}/examples/target/examples.jar" todir="${tomcat.home}/lib" />
+
+ <!-- add the junit.jar to the tomcat libs dir -->
+ <copy file="${jbpm.home}/lib/junit.jar" todir="${tomcat.home}/lib" />
+
+ <!-- customize the jbpm configuration for the testsuite -->
+ <jar destfile="${tomcat.home}/lib/jbpm.cfg.jar">
+ <fileset dir="jbpm.cfg/tomcat" />
+ </jar>
+
+ <!-- copy the cactus war file -->
+ <war destfile="${tomcat.home}/webapps/jbpm-test-cactus.war">
+ <fileset dir="modules/test-cactus/src/main/webapp" />
+ <classes dir="modules/test-cactus/target/test-classes" />
+ <lib dir="modules/test-cactus/target/lib">
+ </lib>
+ </war>
+ </target>
+
+ <!-- START TOMCAT -->
+ <target name="start.tomcat">
+ <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" />
+ </target>
+
+
<target name="integration.testrun.setup"
- depends="log.properties, reinstall.jbpm, post.install"
+ depends="reinstall.jbpm, post.install"
description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
<ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
Added: jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,15 @@
+set MAVEN_OPTS=-Xms1024M -Xmx1024M
+
+cmd /C mvn -U -Pdistro,integration clean install
+cmd /C ant -f qa/build.xml reinstall.jbpm
+cmd /C ant -f qa/build.xml reinstall.tomcat.and.jbpm
+cmd /C ant -f qa/build.xml customize.tomcat.for.integration.testsuite
+cmd /C ant -f qa/build.xml start.tomcat
+
+cd modules\test-cactus
+cmd /C mvn -Pruntest test
+cd ..\..
+
+cmd /C ant -f qa/build.xml stop.tomcat
+
+echo
Added: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.cfg.xml 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <import resource="jbpm.default.cfg.xml" />
+ <import resource="jbpm.tx.hibernate.cfg.xml" />
+ <import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.identity.cfg.xml" />
+ <import resource="jbpm.businesscalendar.cfg.xml" />
+ <!-- import resource="jbpm.jobexecutor.cfg.xml" / -->
+
+ <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.hibernate.cfg.xml (rev 0)
+++ jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.hibernate.cfg.xml 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,25 @@
+<?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">
+
+<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" />
+
+ </session-factory>
+</hibernate-configuration>
Property changes on: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.hibernate.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.properties
===================================================================
--- jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.properties (rev 0)
+++ jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.properties 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,3 @@
+mail.smtp.host localhost
+mail.smtp.port 2525
+mail.from noreply at jbpm.org
\ No newline at end of file
Property changes on: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.templates.examples.xml
===================================================================
--- jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.templates.examples.xml (rev 0)
+++ jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.templates.examples.xml 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <process-engine-context>
+
+ <mail-template name="rectify-template">
+ <to addresses="${addressee}" />
+ <cc users="bb" groups="innerparty" />
+ <bcc groups="thinkpol" />
+ <subject>rectify ${newspaper}</subject>
+ <text>${newspaper} ${date} ${details}</text>
+ </mail-template>
+
+ </process-engine-context>
+
+</jbpm-configuration>
\ No newline at end of file
Property changes on: jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.templates.examples.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/jbpm.cfg/tomcat/logging.properties
===================================================================
--- jbpm4/trunk/qa/jbpm.cfg/tomcat/logging.properties (rev 0)
+++ jbpm4/trunk/qa/jbpm.cfg/tomcat/logging.properties 2009-08-07 15:55:27 UTC (rev 5446)
@@ -0,0 +1,18 @@
+handlers= java.util.logging.ConsoleHandler
+redirect.commons.logging = enabled
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
+
+org.jbpm.level=FINE
+# org.jbpm.pvm.internal.tx.level=FINE
+# org.jbpm.pvm.internal.wire.level=FINE
+# org.jbpm.pvm.internal.util.level=FINE
+
+org.hibernate.level=INFO
+org.hibernate.cfg.SettingsFactory.level=SEVERE
+org.hibernate.cfg.HbmBinder.level=SEVERE
+# 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
Property changes on: jbpm4/trunk/qa/jbpm.cfg/tomcat/logging.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the jbpm-commits
mailing list