4:54 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-04-26 05:54:35 -0400 (Sun, 26 Apr 2009)
New Revision: 4622
Added:
jbpm4/trunk/modules/distro/src/main/resources/config-tool/db.scripts/
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml
jbpm4/trunk/qa/db/
jbpm4/trunk/qa/db/hsqldb.properties
jbpm4/trunk/qa/jbossremote/
jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml
Removed:
jbpm4/trunk/.settings/
Modified:
jbpm4/trunk/build.xml
jbpm4/trunk/modules/api/.project
jbpm4/trunk/modules/distro/pom.xml
jbpm4/trunk/modules/distro/src/main/files/db/build.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/examples/src/test/resources/logging.properties
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/pvm/.project
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/test-db/pom.xml
jbpm4/trunk/qa/build.xml
jbpm4/trunk/qa/jbpm4-jboss.bat
jbpm4/trunk/qa/jbpm4-jboss.sh
Log:
config and qa updates
Modified: jbpm4/trunk/build.xml
===================================================================
--- jbpm4/trunk/build.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/build.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -157,10 +157,9 @@
<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="database" value="mysql" />
+ <property name="jboss.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="db.scripts.dir"
value="${basedir}/target/config.tool/db.scripts" />
<property name="libs.dir" value="${basedir}/target/libs"
/>
</ant>
</target>
Modified: jbpm4/trunk/modules/api/.project
===================================================================
--- jbpm4/trunk/modules/api/.project 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/api/.project 2009-04-26 09:54:35 UTC (rev 4622)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm-api</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>api</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/distro/pom.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -18,7 +18,6 @@
<name>jBPM 4 - Distro</name>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-distro</artifactId>
- <packaging>pom</packaging>
<!-- Parent -->
<parent>
Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-26 05:47:15 UTC (rev
4621)
+++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-26 09:54:35 UTC (rev
4622)
@@ -2,6 +2,9 @@
<project name="jbpm.db.install">
+ <!-- JDBC CONFIGURATIONS -->
+ <property file="jdbc.properties" />
+
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
@@ -15,46 +18,42 @@
<echo message="worspace: ${workspace}" />
<fail message="property worspace not specified. specify -Dworspace=... on the
command line or add worspace=... in your ${user.home}/.jbpm4/build.properties"
unless="workspace" />
- <echo message="maven.home: ${maven.home}" />
- <fail message="property maven.home not specified. specify -Dmaven.home=... on
the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties"
unless="maven.home" />
+ <echo message="maven.repo: ${maven.repo}" />
+ <fail message="property maven.repo not specified. specify -Dmaven.repo=... on
the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties"
unless="maven.repo" />
<!-- DERIVED PROPERTIES -->
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
- <echo message="jbpm.version: ${jbpm.version}" />
-
<property name="jbpm.filename"
value="jbpm-distro-${jbpm.version}.zip" />
- <echo message="jbpm.filename: ${jbpm.filename}" />
-
- <property name="jbpm.distro.url"
value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}"
/>
- <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
-
+ <property name="jbpm.distro.url"
value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}"
/>
<property name="jbpm.home"
value="${workspace}/jbpm-${jbpm.version}" />
- <echo message="jbpm.home: ${jbpm.home}" />
-
<property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
- <echo message="jboss.filename: ${jboss.filename}" />
-
<property name="jboss.distro.url"
value="file:///c:/downloads/jboss/${jboss.filename}" />
- <echo message="jboss.distro.url: ${jboss.distro.url}" />
-
<property name="jboss.home"
value="${workspace}/jboss-${jboss.version}" />
- <echo message="jboss.home: ${jboss.home}" />
-
<property name="jboss.distro.local.path"
value="${downloads.dir}/${jboss.filename}" />
- <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
-
<property name="jboss.server.configuration" value="default"
/>
- <echo message="jboss.server.configuration: ${jboss.server.configuration}"
/>
-
<property name="jboss.server.config.dir"
value="${jboss.home}/server/${jboss.server.configuration}" />
- <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
-
<property name="downloads.dir" value="${workspace}/downloads"
/>
- <echo message="downloads.dir: ${downloads.dir}" />
-
+
+ <!-- ### LOG PROPERTIES ################################################# -->
+ <target name="log.properties">
+ <echo message="jdbc.driver: ${jdbc.driver}" />
+ <echo message="jdbc.url: ${jdbc.url}" />
+ <echo message="jdbc.username: ${jdbc.username}" />
+ <echo message="jbpm.version: ${jbpm.version}" />
+ <echo message="jbpm.filename: ${jbpm.filename}" />
+ <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
+ <echo message="jbpm.home: ${jbpm.home}" />
+ <echo message="jboss.filename: ${jboss.filename}" />
+ <echo message="jboss.distro.url: ${jboss.distro.url}" />
+ <echo message="jboss.home: ${jboss.home}" />
+ <echo message="jboss.distro.local.path: ${jboss.distro.local.path}"
/>
+ <echo message="jboss.server.configuration: ${jboss.server.configuration}"
/>
+ <echo message="jboss.server.config.dir: ${jboss.server.config.dir}"
/>
+ <echo message="downloads.dir: ${downloads.dir}" />
+ </target>
<!-- ### CREATE JBPM SCHEMA ############################################# -->
- <target name="create.jbpm.schema">
+ <target name="create.jbpm.schema" depends="log.properties">
<sql driver="${jdbc.driver}"
url="${jdbc.url}"
userid="${jdbc.username}"
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 05:47:15 UTC (rev
4621)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-26 09:54:35 UTC (rev
4622)
@@ -5,6 +5,9 @@
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
+ <!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
+ <property file="${user.home}/.jbpm4/build.properties" />
+
<!-- DISPLAY INPUT PARAMETERS -->
<echo message="database: ${database}" />
<fail message="property database not specified. specify -Ddatabase=... on the
command line or add database=... in your ${user.home}/.jbpm4/build.properties"
unless="database" />
@@ -15,43 +18,39 @@
<echo message="worspace: ${workspace}" />
<fail message="property worspace not specified. specify -Dworspace=... on the
command line or add worspace=... in your ${user.home}/.jbpm4/build.properties"
unless="workspace" />
- <echo message="maven.home: ${maven.home}" />
- <fail message="property maven.home not specified. specify -Dmaven.home=... on
the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties"
unless="maven.home" />
+ <echo message="maven.repo: ${maven.repo}" />
+ <fail message="property maven.repo not specified. specify -Dmaven.repo=... on
the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties"
unless="maven.repo" />
<!-- DERIVED PROPERTIES -->
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
- <echo message="jbpm.version: ${jbpm.version}" />
-
<property name="jbpm.filename"
value="jbpm-distro-${jbpm.version}.zip" />
- <echo message="jbpm.filename: ${jbpm.filename}" />
-
- <property name="jbpm.distro.url"
value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}"
/>
- <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
-
+ <property name="jbpm.distro.url"
value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}"
/>
<property name="jbpm.home"
value="${workspace}/jbpm-${jbpm.version}" />
- <echo message="jbpm.home: ${jbpm.home}" />
-
<property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
- <echo message="jboss.filename: ${jboss.filename}" />
-
<property name="jboss.distro.url"
value="file:///c:/downloads/jboss/${jboss.filename}" />
- <echo message="jboss.distro.url: ${jboss.distro.url}" />
-
<property name="jboss.home"
value="${workspace}/jboss-${jboss.version}" />
- <echo message="jboss.home: ${jboss.home}" />
-
<property name="jboss.distro.local.path"
value="${downloads.dir}/${jboss.filename}" />
- <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
-
<property name="jboss.server.configuration" value="default"
/>
- <echo message="jboss.server.configuration: ${jboss.server.configuration}"
/>
-
<property name="jboss.server.config.dir"
value="${jboss.home}/server/${jboss.server.configuration}" />
- <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
-
<property name="downloads.dir" value="${workspace}/downloads"
/>
- <echo message="downloads.dir: ${downloads.dir}" />
-
+
+ <!-- ### LOG PROPERTIES ################################################# -->
+ <target name="log.properties">
+ <echo message="jdbc.driver: ${jdbc.driver}" />
+ <echo message="jdbc.url: ${jdbc.url}" />
+ <echo message="jdbc.username: ${jdbc.username}" />
+ <echo message="jbpm.version: ${jbpm.version}" />
+ <echo message="jbpm.filename: ${jbpm.filename}" />
+ <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
+ <echo message="jbpm.home: ${jbpm.home}" />
+ <echo message="jboss.filename: ${jboss.filename}" />
+ <echo message="jboss.distro.url: ${jboss.distro.url}" />
+ <echo message="jboss.home: ${jboss.home}" />
+ <echo message="jboss.distro.local.path: ${jboss.distro.local.path}"
/>
+ <echo message="jboss.server.configuration:
${jboss.server.configuration}" />
+ <echo message="jboss.server.config.dir: ${jboss.server.config.dir}"
/>
+ <echo message="downloads.dir: ${downloads.dir}" />
+ </target>
<!-- CONDITIONS -->
<condition property="jboss.version.500">
Modified:
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java
===================================================================
---
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-04-26
05:47:15 UTC (rev 4621)
+++
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-04-26
09:54:35 UTC (rev 4622)
@@ -21,6 +21,7 @@
*/
package org.jbpm.enterprise.internal.ejb;
+import java.util.Hashtable;
import java.util.Properties;
import javax.naming.Context;
@@ -29,6 +30,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.cmd.Command;
import org.jbpm.api.cmd.CommandService;
+import org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding;
import org.jbpm.internal.log.Log;
@@ -37,8 +39,6 @@
*/
public class EjbRemoteCommandService implements CommandService {
- private static final Log log = Log.getLog(EjbRemoteCommandService.class.getName());
-
protected String initialContextFactory;
protected String providerUrl;
protected String urlPkgPrefixes;
@@ -53,9 +53,14 @@
}
public <T> T execute(Command<T> command) {
- try
- {
- InitialContext initialContext = new InitialContext();
+ try {
+ Hashtable<String, String> env = new Hashtable<String, String>();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
+ env.put(Context.PROVIDER_URL, providerUrl);
+ env.put(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
+
+ InitialContext initialContext = new InitialContext(env);
+
RemoteCommandExecutorHome remoteCommandExecutorHome = (RemoteCommandExecutorHome)
initialContext.lookup(jndiName);
RemoteCommandExecutor remoteCommandExecutor = remoteCommandExecutorHome.create();
Object result = remoteCommandExecutor.execute(command);
Modified:
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java
===================================================================
---
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java 2009-04-26
05:47:15 UTC (rev 4621)
+++
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/EjbRemoteCommandServiceBinding.java 2009-04-26
09:54:35 UTC (rev 4622)
@@ -35,7 +35,7 @@
* @author Tom Baeyens
*/
public class EjbRemoteCommandServiceBinding extends WireDescriptorBinding {
-
+
public EjbRemoteCommandServiceBinding() {
super("ejb-remote-command-service");
}
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -70,29 +70,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>build-test-jars</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="build.dir"
value="${project.build.directory}" />
- <property name="test.resources.dir"
value="${build.dir}/test-classes" />
- <property name="build.finalName"
value="${project.build.finalName}" />
- <property name="jbpm.target.container"
value="${jbpm.target.container}"/>
- <ant antfile="scripts/antrun-test-jars.xml"
target="build-jars" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -103,7 +80,7 @@
<id>standalone.tests</id>
<activation>
<property>
- <name>!jboss.bind.address</name>
+ <name>database</name>
</property>
</activation>
<build>
@@ -118,12 +95,12 @@
</goals>
<configuration>
<tasks>
- <echo>Overwriting db configuration for
${database}</echo>
- <ant
antfile="../distro/src/main/resources/config-tool/build.xml"
target="create.configuration.files" inheritall="false">
- <property name="config.files.dir"
value="${basedir}/target/test-classes" />
- <property name="tmp.dir"
value="${basedir}/target/config-tmp" />
- <property name="database"
value="${database}" />
- </ant>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="../../qa/db/${database}" />
+ </copy>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="${user.home}/.jbpm4/qa/db/${database}"
/>
+ </copy>
</tasks>
</configuration>
</execution>
@@ -141,13 +118,13 @@
<name>jboss.bind.address</name>
</property>
</activation>
+
<dependencies>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-enterprise</artifactId>
<scope>test</scope>
</dependency>
-
<!-- AS 5 Integration tests -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -160,32 +137,15 @@
<artifactId>jboss-javaee</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
-
<execution>
<phase>test-compile</phase>
<goals>
@@ -193,14 +153,12 @@
</goals>
<configuration>
<tasks>
- <echo>Overwriting db configuration for
${database}</echo>
- <ant
antfile="../distro/src/main/resources/config-tool/build.xml"
- target="create.remote.configuration"
- inheritall="false">
- <property name="jboss.bind.address"
value="${jboss.bind.address}" />
- <property name="config.files.dir"
value="${basedir}/target/test-classes" />
- <property name="tmp.dir"
value="${basedir}/target/config-tmp" />
- </ant>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="../../qa/jbossremote" />
+ </copy>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="${user.home}/.jbpm4/qa/jbossremote"
/>
+ </copy>
</tasks>
</configuration>
</execution>
Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-04-26 05:47:15
UTC (rev 4621)
+++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2009-04-26 09:54:35
UTC (rev 4622)
@@ -1,10 +1,10 @@
handlers= java.util.logging.ConsoleHandler
redirect.commons.logging = enabled
-java.util.logging.ConsoleHandler.level = FINEST
+java.util.logging.ConsoleHandler.level = FINE
java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
-org.jbpm.level=FINEST
+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
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -81,20 +81,19 @@
<!-- Profiles -->
<profiles>
+ <!-- skip tests if this is an integration test run
+ (only examples and test-db are part of the integration test runs) -->
<profile>
- <id>distro</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <id>integration.test</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
</profile>
-
</profiles>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/pvm/.project
===================================================================
--- jbpm4/trunk/modules/pvm/.project 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/pvm/.project 2009-04-26 09:54:35 UTC (rev 4622)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbpm-pvm</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>pvm</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/pvm/pom.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -159,6 +159,20 @@
</plugins>
</reporting>
</profile>
+
+ <!-- skip tests if this is an integration test run
+ (only examples and test-db are part of the integration test runs) -->
+ <profile>
+ <id>integration.test</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
-
+
</project>
\ No newline at end of file
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-26
05:47:15 UTC (rev 4621)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-26
09:54:35 UTC (rev 4622)
@@ -99,22 +99,24 @@
if (!isConfigured) {
setResource("jbpm.cfg.xml");
}
- log.debug("created ProcessEngine "+System.identityHashCode(this));
- if ( (processEngineWireContext!=null)
- && (processEngineWireContext.getWireDefinition()!=null)
- &&
(processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null)
- ) {
- log.debug(" process-engine-context
"+System.identityHashCode(processEngineWireContext));
- for (Class<?> descriptorType:
processEngineWireContext.getWireDefinition().getDescriptorTypes()) {
- log.debug(" "+descriptorType.getName());
+ if (log.isTraceEnabled()) {
+ log.trace("created ProcessEngine "+System.identityHashCode(this));
+ if ( (processEngineWireContext!=null)
+ && (processEngineWireContext.getWireDefinition()!=null)
+ &&
(processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null)
+ ) {
+ log.trace(" process-engine-context
"+System.identityHashCode(processEngineWireContext));
+ for (Class<?> descriptorType:
processEngineWireContext.getWireDefinition().getDescriptorTypes()) {
+ log.trace(" "+descriptorType.getName());
+ }
}
- }
- if ( (transactionWireDefinition!=null)
- && (transactionWireDefinition.getDescriptorTypes()!=null)
- ) {
- log.debug(" transaction-context:");
- for (Class<?> descriptorType: transactionWireDefinition.getDescriptorTypes())
{
- log.debug(" "+descriptorType.getName());
+ if ( (transactionWireDefinition!=null)
+ && (transactionWireDefinition.getDescriptorTypes()!=null)
+ ) {
+ log.trace(" transaction-context:");
+ for (Class<?> descriptorType:
transactionWireDefinition.getDescriptorTypes()) {
+ log.trace(" "+descriptorType.getName());
+ }
}
}
return this;
Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml
(rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml 2009-04-26
09:54:35 UTC (rev 4622)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+ <process-engine-context>
+
+ <repository-service />
+ <repository-cache />
+ <execution-service />
+ <history-service />
+ <management-service />
+ <task-service />
+
+ <ejb-remote-command-service
+ initial-context-factory="org.jnp.interfaces.NamingContextFactory"
+ provider-url="jnp://@jboss.bind.address@"
+ url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces">
+ <retry-interceptor />
+ </ejb-remote-command-service>
+
+ </process-engine-context>
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/modules/test-db/pom.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -51,9 +51,10 @@
</dependencies>
<profiles>
+
<!-- -Ddatabase= -->
<profile>
- <id>use.database.directly</id>
+ <id>standalone.tests</id>
<activation>
<property>
<name>database</name>
@@ -71,17 +72,12 @@
</goals>
<configuration>
<tasks>
- <echo>Overwriting db configuration for
${database}</echo>
- <ant
antfile="../distro/src/main/resources/config-tool/build.xml"
target="create.configuration.files" inheritall="false">
-
- <property name="compile_classpath"
refid="maven.compile.classpath"/>
- <property name="runtime_classpath"
refid="maven.runtime.classpath"/>
- <property name="test_classpath"
refid="maven.test.classpath"/>
-
- <property name="config.files.dir"
value="${basedir}/target/test-classes" />
- <property name="tmp.dir"
value="${basedir}/target/config-tmp" />
- <property name="database"
value="${database}" />
- </ant>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="../../qa/db/${database}" />
+ </copy>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="${user.home}/.jbpm4/qa/db/${database}"
/>
+ </copy>
</tasks>
</configuration>
</execution>
@@ -91,28 +87,39 @@
</build>
</profile>
- <!-- -Djboss.bind.address=
+ <!-- -Djboss.bind.address -->
<profile>
- <id>use.jboss.directly</id>
+ <id>integration.tests</id>
<activation>
<property>
<name>jboss.bind.address</name>
</property>
</activation>
+
<dependencies>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-enterprise</artifactId>
- <scope>runtime</scope>
+ <artifactId>jbpm-enterprise</artifactId>
+ <scope>test</scope>
</dependency>
+ <!-- AS 5 Integration tests -->
<dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <scope>runtime</scope>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+
<build>
<plugins>
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -123,23 +130,31 @@
</goals>
<configuration>
<tasks>
- <echo>Overwriting db configuration for
${database}</echo>
- <ant
antfile="../distro/src/main/resources/config-tool/build.xml"
- target="create.remote.configuration"
- inheritall="false">
- <property name="jboss.bind.address"
value="${jboss.bind.address}" />
- <property name="config.files.dir"
value="${basedir}/target/test-classes" />
- <property name="tmp.dir"
value="${basedir}/target/config-tmp" />
- </ant>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="../../qa/jbossremote" />
+ </copy>
+ <copy todir="target/test-classes"
overwrite="true" failonerror="false">
+ <fileset dir="${user.home}/.jbpm4/qa/jbossremote"
/>
+ </copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <trimStackTrace>false</trimStackTrace>
+ <excludes>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
- -->
+
</profiles>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/qa/build.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -5,6 +5,9 @@
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
+ <!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
+ <property file="${user.home}/.jbpm4/build.properties" />
+
<!-- DISPLAY INPUT PARAMETERS -->
<echo message="database: ${database}" />
<fail message="property database not specified. specify -Ddatabase=... on the
command line or add database=... in your ${user.home}/.jbpm4/build.properties"
unless="database" />
@@ -12,46 +15,43 @@
<echo message="jboss.version: ${jboss.version}" />
<fail message="property jboss.version not specified. specify
-Djboss.version=... on the command line or add jboss.version=... in your
${user.home}/.jbpm4/build.properties" unless="jboss.version" />
- <echo message="worspace: ${workspace}" />
+ <echo message="worspace: ${workspace}" />
<fail message="property worspace not specified. specify -Dworspace=... on the
command line or add worspace=... in your ${user.home}/.jbpm4/build.properties"
unless="workspace" />
- <echo message="maven.home: ${maven.home}" />
- <fail message="property maven.home not specified. specify -Dmaven.home=... on
the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties"
unless="maven.home" />
+ <echo message="maven.repo: ${maven.repo}" />
+ <fail message="property maven.repo not specified. specify -Dmaven.repo=... on
the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties"
unless="maven.repo" />
<!-- DERIVED PROPERTIES -->
- <property name="jbpm.version" value="4.0.0-SNAPSHOT" />
- <echo message="jbpm.version: ${jbpm.version}" />
-
- <property name="jbpm.filename"
value="jbpm-distro-${jbpm.version}.zip" />
- <echo message="jbpm.filename: ${jbpm.filename}" />
-
- <property name="jbpm.distro.url"
value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}"
/>
- <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
-
- <property name="jbpm.home"
value="${workspace}/jbpm-${jbpm.version}" />
- <echo message="jbpm.home: ${jbpm.home}" />
-
- <property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
- <echo message="jboss.filename: ${jboss.filename}" />
-
+ <property name="jbpm.version" value="4.0.0-SNAPSHOT" />
+ <property name="jbpm.filename"
value="jbpm-distro-${jbpm.version}.zip" />
+ <property name="jbpm.distro.url"
value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}"
/>
+ <property name="jbpm.home"
value="${workspace}/jbpm-${jbpm.version}" />
+ <property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
<property name="jboss.distro.url"
value="file:///c:/downloads/jboss/${jboss.filename}" />
- <echo message="jboss.distro.url: ${jboss.distro.url}" />
-
<property name="jboss.home"
value="${workspace}/jboss-${jboss.version}" />
- <echo message="jboss.home: ${jboss.home}" />
-
<property name="jboss.distro.local.path"
value="${downloads.dir}/${jboss.filename}" />
- <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
-
<property name="jboss.server.configuration" value="default"
/>
- <echo message="jboss.server.configuration: ${jboss.server.configuration}"
/>
-
<property name="jboss.server.config.dir"
value="${jboss.home}/server/${jboss.server.configuration}" />
- <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
-
<property name="downloads.dir" value="${workspace}/downloads"
/>
- <echo message="downloads.dir: ${downloads.dir}" />
-
+
+ <!-- ### LOG PROPERTIES ################################################# -->
+ <target name="log.properties">
+ <echo message="jdbc.driver: ${jdbc.driver}" />
+ <echo message="jdbc.url: ${jdbc.url}" />
+ <echo message="jdbc.username: ${jdbc.username}" />
+ <echo message="jbpm.version: ${jbpm.version}" />
+ <echo message="jbpm.filename: ${jbpm.filename}" />
+ <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
+ <echo message="jbpm.home: ${jbpm.home}" />
+ <echo message="jboss.filename: ${jboss.filename}" />
+ <echo message="jboss.distro.url: ${jboss.distro.url}" />
+ <echo message="jboss.home: ${jboss.home}" />
+ <echo message="jboss.distro.local.path: ${jboss.distro.local.path}"
/>
+ <echo message="jboss.server.configuration:
${jboss.server.configuration}" />
+ <echo message="jboss.server.config.dir: ${jboss.server.config.dir}"
/>
+ <echo message="downloads.dir: ${downloads.dir}" />
+ </target>
+
<!-- TARGETS -->
<target name="delete.jbpm.installation">
<delete dir="${jbpm.home}" />
@@ -63,30 +63,18 @@
<unzip src="${downloads.dir}/${jbpm.filename}"
dest="${jbpm.home}/.." />
</target>
- <target name="reinstall.jbpm" depends="delete.jbpm.installation,
install.jbpm" />
+ <target name="reinstall.jbpm" depends="delete.jbpm.installation,
install.jbpm" />
- <target name="reinstall.jboss">
- <ant antfile="${jbpm.home}/jboss/build.xml"
target="reinstall.jboss" />
- </target>
-
- <target name="install.jbpm.into.jboss">
+ <target name="integration.testrun.setup"
depends="reinstall.jbpm">
+ <ant antfile="${jbpm.home}/jboss/build.xml"
target="reinstall.jboss" />
<ant antfile="${jbpm.home}/jboss/build.xml"
target="install.jbpm.into.jboss" />
- </target>
-
- <target name="start.jboss">
<ant antfile="${jbpm.home}/jboss/build.xml"
target="start.jboss" />
- </target>
-
- <target name="stop.jboss">
- <ant antfile="${jbpm.home}/jboss/build.xml"
target="stop.jboss" />
- </target>
-
- <target name="create.jbpm.schema">
+ <copy file="qa/db/${database}.properties"
tofile="${jbpm.home}/db/jdbc.properties" overwrite="true" />
<ant antfile="${jbpm.home}/db/build.xml"
target="create.jbpm.schema" inheritall="false" />
- </target>
+ </target>
- <target name="drop.jbpm.schema">
+ <target name="integration.testrun.teardown">
<ant antfile="${jbpm.home}/db/build.xml"
target="drop.jbpm.schema" inheritall="false" />
+ <ant antfile="${jbpm.home}/jboss/build.xml"
target="stop.jboss" />
</target>
-
</project>
Added: jbpm4/trunk/qa/db/hsqldb.properties
===================================================================
--- jbpm4/trunk/qa/db/hsqldb.properties (rev 0)
+++ jbpm4/trunk/qa/db/hsqldb.properties 2009-04-26 09:54:35 UTC (rev 4622)
@@ -0,0 +1,4 @@
+jdbc.driver=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:hsql://localhost:1701
+jdbc.username=sa
+jdbc.password=
Property changes on: jbpm4/trunk/qa/db/hsqldb.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml 2009-04-26 09:54:35 UTC (rev 4622)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+ <import resource="jbpm.jbossremote.cfg.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/qa/jbossremote/jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/qa/jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-04-26 09:54:35 UTC (rev 4622)
@@ -1,26 +1,10 @@
set MAVEN_OPTS=-Xms1024M -Xmx1024M
-cmd /C mvn -Pdistro -Pschemadocs clean install
-if not "%ERRORLEVEL%" == "0" exit /b
+rem cmd /C mvn -Pdistro -Pschemadocs clean install
-cmd /C ant -f qa/build.xml reinstall.jbpm
-if not "%ERRORLEVEL%" == "0" exit /b
+cmd /C ant -f qa/build.xml integration.testrun.setup
-cmd /C ant -f qa/build.xml reinstall.jboss
-if not "%ERRORLEVEL%" == "0" exit /b
-
-cmd /C ant -f qa/build.xml install.jbpm.into.jboss
-if not "%ERRORLEVEL%" == "0" exit /b
-
-cmd /C ant -f qa/build.xml start.jboss
-if not "%ERRORLEVEL%" == "0" exit /b
-
-cmd /C ant -f qa/build.xml create.jbpm.schema
-if not "%ERRORLEVEL%" == "0" exit /b
-
cmd /C mvn -Djboss.bind.address=localhost clean test
-if not "%ERRORLEVEL%" == "0" exit /b
-cmd /C ant -f qa/build.xml drop.jbpm.schema
-if not "%ERRORLEVEL%" == "0" exit /b
+cmd /C ant -f qa/build.xml integration.testrun.teardown
Modified: jbpm4/trunk/qa/jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 05:47:15 UTC (rev 4621)
+++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-26 09:54:35 UTC (rev 4622)
@@ -4,19 +4,13 @@
set -x
-cd ..
-mvn -Pdistro clean test
-cd qa
+MAVEN_OPTS=-Xms1024M -Xmx1024M
+ANT_PROPERTIES=-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE
-Dmaven.repo=~/.m2/repository
-ant reinstall.jbpm
-ant reinstall.jboss
-ant install.jbpm.into.jboss
-ant start.jboss
-ant create.jbpm.schema
+mvn -Pdistro -Pschemadocs clean install
-cd ..
-mvn -o -Djboss.bind.address=localhost clean test
-cd qa
+ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup
-ant drop.jbpm.schema
-
+mvn -Djboss.bind.address=localhost clean test
+
+ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown