JBoss JBPM SVN: r5499 - in jbpm4/trunk/modules: db/scripts and 1 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-20 12:49:33 -0400 (Thu, 20 Aug 2009)
New Revision: 5499
Modified:
jbpm4/trunk/modules/db/pom.xml
jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
Log:
[JBPM-1995] build script to calculate jBPM DB differences
document feature and tie it to the "database" property
Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml 2009-08-20 14:10:20 UTC (rev 5498)
+++ jbpm4/trunk/modules/db/pom.xml 2009-08-20 16:49:33 UTC (rev 5499)
@@ -74,6 +74,7 @@
<tasks>
<property name="project.output.dir" value="${project.build.outputDirectory}"/>
<property name="previous.version.dir" value="${previous.version.directory}"/>
+ <property name="database" value="${database}"/>
<ant antfile="scripts/antrun-upgrade.xml" target="upgrade-schema" inheritRefs="yes"/>
</tasks>
</configuration>
Modified: jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml
===================================================================
--- jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml 2009-08-20 14:10:20 UTC (rev 5498)
+++ jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml 2009-08-20 16:49:33 UTC (rev 5499)
@@ -1,93 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <!-- ============================================ -->
- <!-- jBPM database schema -->
- <!-- ============================================ -->
+ <!-- ============================================ -->
+ <!-- jBPM database schema -->
+ <!-- ============================================ -->
- <target name="upgrade-schema">
- <taskdef name="schemaupdate"
- classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask"
- classpathref="maven.compile.classpath" />
- <taskdef name="schemaexport"
- classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"
- classpathref="maven.compile.classpath" />
+ <target name="upgrade-schema"
+ depends="define-tasks, upgrade-hsqldb, upgrade-mysql, upgrade-postgresql, upgrade-oracle" />
- <!-- HSQLDB -->
- <java classname="org.hsqldb.Server"
- classpathref="maven.compile.classpath"
- fork="yes" spawn="yes">
- <arg value="-port" />
- <arg value="1701" />
- <arg value="-database.0" />
- <arg value="${previous.version.dir}/jbpmdb" />
- </java>
- <upgrade-ddl db="hsqldb" />
- <sql url="${hsqldb.hibernate.connection.url}"
- driver="${hsqldb.hibernate.connection.driver_class}"
- classpathref="maven.compile.classpath"
- userid="${hsqldb.hibernate.connection.username}"
- password="${hsqldb.hibernate.connection.password}"
- autocommit="yes">
- SHUTDOWN
- </sql>
+ <target name="define-tasks">
+ <taskdef name="schemaupdate"
+ classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask"
+ classpathref="maven.compile.classpath" />
+ <taskdef name="schemaexport"
+ classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"
+ classpathref="maven.compile.classpath" />
- <!-- MySQL -->
- <upgrade-ddl db="mysql" />
+ <condition property="database.is.hsqldb">
+ <equals arg1="${database}" arg2="hsqldb" />
+ </condition>
+ <condition property="database.is.mysql">
+ <equals arg1="${database}" arg2="mysql" />
+ </condition>
+ <condition property="database.is.postgresql">
+ <equals arg1="${database}" arg2="postgresql" />
+ </condition>
+ <condition property="database.is.oracle">
+ <equals arg1="${database}" arg2="oracle" />
+ </condition>
+ </target>
- <!-- PostgreSQL -->
- <upgrade-ddl db="postgresql" />
+ <target name="upgrade-hsqldb" if="database.is.hsqldb">
+ <java classname="org.hsqldb.Server"
+ classpathref="maven.compile.classpath"
+ fork="yes"
+ spawn="yes">
+ <arg value="-port" />
+ <arg value="1701" />
+ <arg value="-database.0" />
+ <arg value="${previous.version.dir}/jbpmdb" />
+ </java>
+ <waitfor>
+ <socket server="localhost" port="1701" />
+ </waitfor>
+ <upgrade-ddl db="hsqldb" />
+ <sql url="${hsqldb.hibernate.connection.url}"
+ driver="${hsqldb.hibernate.connection.driver_class}"
+ classpathref="maven.compile.classpath"
+ userid="${hsqldb.hibernate.connection.username}"
+ password="${hsqldb.hibernate.connection.password}"
+ autocommit="yes">
+ SHUTDOWN
+ </sql>
+ </target>
- <!-- Oracle -->
- <upgrade-ddl db="oracle" />
- </target>
+ <target name="upgrade-mysql" if="database.is.mysql">
+ <upgrade-ddl db="mysql" />
+ </target>
- <!-- ============================================ -->
- <!-- Macro definitions -->
- <!-- ============================================ -->
+ <target name="upgrade-postgresql" if="database.is.postgresql">
+ <upgrade-ddl db="postgresql" />
+ </target>
- <macrodef name="upgrade-ddl">
- <attribute name="db" />
+ <target name="upgrade-oracle" if="database.is.oracle">
+ <upgrade-ddl db="oracle" />
+ </target>
- <sequential>
- <echo>=====================</echo>
- <echo>Upgrade DDL @{db}</echo>
+ <!-- ============================================ -->
+ <!-- Macro definitions -->
+ <!-- ============================================ -->
- <!-- calculate the difference beetween the previous and the current create schemas -->
- <exec command="diff" osfamily="unix" output="${previous.version.dir}/jbpm.(a){db}.create.diff">
- <arg value="-u" />
- <arg file="${previous.version.dir}/jbpm.(a){db}.create.sql" />
- <arg file="${project.output.dir}/jbpm.(a){db}.create.sql" />
- </exec>
+ <macrodef name="upgrade-ddl">
+ <attribute name="db" />
- <property name="@{db}.hibernate.cfg" value="src/main/config/(a){db}.hibernate.cfg.xml" />
- <property name="@{db}.hibernate.properties"
- value="${user.home}/.jbpm4/jdbc/(a){db}.properties" />
- <property file="${(a){db}.hibernate.properties}" prefix="@{db}" />
- <echo>driver... ${(a){db}.hibernate.connection.driver_class}</echo>
- <echo>url...... ${(a){db}.hibernate.connection.url}</echo>
- <echo>username. ${(a){db}.hibernate.connection.username}</echo>
- <echo>password. ${(a){db}.hibernate.connection.password}</echo>
+ <sequential>
+ <echo>=====================</echo>
+ <echo>Upgrade DDL @{db}</echo>
- <!-- drop current schema if exists -->
- <schemaexport output="${project.output.dir}/jbpm.(a){db}.drop.sql"
- config="${(a){db}.hibernate.cfg}"
- properties="${(a){db}.hibernate.properties}"
- drop="yes" quiet="yes" />
- <!-- create previous version schema -->
- <sql src="${previous.version.dir}/jbpm.(a){db}.create.sql"
- url="${(a){db}.hibernate.connection.url}"
- driver="${(a){db}.hibernate.connection.driver_class}"
- classpathref="maven.compile.classpath"
- userid="${(a){db}.hibernate.connection.username}"
- password="${(a){db}.hibernate.connection.password}"
- autocommit="yes" continue="yes" />
- <!-- generate schema upgrade script -->
- <schemaupdate outputFile="${previous.version.dir}/jbpm.(a){db}.update.sql"
- config="${(a){db}.hibernate.cfg}"
- properties="${(a){db}.hibernate.properties}"
- delimiter=";" />
+ <!-- calculate the difference beetween the previous and the current create schemas -->
+ <exec executable="diff"
+ osfamily="unix"
+ output="${previous.version.dir}/jbpm.(a){db}.create.diff">
+ <arg value="-u" />
+ <arg file="${previous.version.dir}/jbpm.(a){db}.create.sql" />
+ <arg file="${project.output.dir}/jbpm.(a){db}.create.sql" />
+ </exec>
- <echo>=====================</echo>
- </sequential>
- </macrodef>
+ <property name="@{db}.hibernate.cfg" value="src/main/config/(a){db}.hibernate.cfg.xml" />
+ <property name="@{db}.hibernate.properties"
+ value="${user.home}/.jbpm4/jdbc/(a){db}.properties" />
+ <property file="${(a){db}.hibernate.properties}" prefix="@{db}" />
+ <echo>driver... ${(a){db}.hibernate.connection.driver_class}</echo>
+ <echo>url...... ${(a){db}.hibernate.connection.url}</echo>
+ <echo>username. ${(a){db}.hibernate.connection.username}</echo>
+ <echo>password. ${(a){db}.hibernate.connection.password}</echo>
+
+ <!-- drop current schema if exists -->
+ <sql src="${project.output.dir}/jbpm.(a){db}.drop.sql"
+ url="${(a){db}.hibernate.connection.url}"
+ driver="${(a){db}.hibernate.connection.driver_class}"
+ classpathref="maven.compile.classpath"
+ userid="${(a){db}.hibernate.connection.username}"
+ password="${(a){db}.hibernate.connection.password}"
+ autocommit="yes"
+ onerror="continue" />
+ <!-- create previous version schema -->
+ <sql src="${previous.version.dir}/jbpm.(a){db}.create.sql"
+ url="${(a){db}.hibernate.connection.url}"
+ driver="${(a){db}.hibernate.connection.driver_class}"
+ classpathref="maven.compile.classpath"
+ userid="${(a){db}.hibernate.connection.username}"
+ password="${(a){db}.hibernate.connection.password}"
+ autocommit="yes"
+ onerror="continue" />
+ <!-- generate schema upgrade script -->
+ <schemaupdate outputFile="${previous.version.dir}/jbpm.(a){db}.update.sql"
+ config="${(a){db}.hibernate.cfg}"
+ properties="${(a){db}.hibernate.properties}"
+ delimiter=";" />
+
+ <echo>=====================</echo>
+ </sequential>
+ </macrodef>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-08-20 14:10:20 UTC (rev 5498)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-08-20 16:49:33 UTC (rev 5499)
@@ -184,7 +184,37 @@
<section id="databasemigration">
<title>Database migration</title>
- <para>TODO: document the instructions how users should apply the automatic migration</para>
+ <para>jBPM is able to generate SQL DDL scripts to upgrade the database schema from any past version
+ starting from 4.0. To enact this capability, first check out the project from our SVN repository as
+ described in the Wiki page <ulink url="http://www.jboss.org/community/wiki/jbpm4buildingfromsource">
+ Building from Source</ulink>. Make sure you specify the appropriate database properties for your
+ target database.</para>
+ <para>Afterwards, change to the <literal>modules/db</literal> directory and run:</para>
+ <synopsis>mvn -Djbpm.previous.version=<version.number>
+ -Ddatabase={hsqldb|mysql|postgresql|oracle} package</synopsis>
+ <para>The valid previous versions are those available from the JBoss <ulink
+ url="http://repository.jboss.org/maven2/org/jbpm/jbpm4/jbpm-db/">Maven repo</ulink> starting
+ from 4.0.</para>
+ <para>Let us walk over an example. Assume you want to generate an update script from version 4.0
+ for PostgreSQL. You have checked out <ulink url="http://anonsvn.jboss.org/repos/jbpm/jbpm4/trunk/">trunk</ulink>.
+ You have a local PostgreSQL server listening on port 5432 (default). You have created a database and login
+ both called <literal>jbpm4</literal>. File <literal><user.home>/.jbpm4/jdbc/postgresql.properties</literal>
+ contains your JDBC connection properties.</para>
+ <programlisting>hibernate.connection.driver_class=org.postgresql.Driver
+hibernate.connection.url=jdbc:postgresql://localhost:5432/jbpm4
+hibernate.connection.username=jbpm4
+hibernate.connection.password=</programlisting>
+ <para>Given the environment described above, you change to the <literal>modules/db</literal> directory
+ and run maven there.</para>
+ <synopsis>mvn -Djbpm.previous.version=4.0 -Ddatabase=postgresql package</synopsis>
+ <para>This command creates directory <literal>target/4.0</literal> and writes the following artifacts
+ there:</para>
+ <itemizedlist>
+ <listitem>Scripts to create and drop the jBPM 4.0 database schema, retrieved from the Maven repo.</listitem>
+ <listitem>PostgreSQL script to upgrade from the jBPM 4.0 schema to the version in your working copy.</listitem>
+ <listitem>Diff file between the previous and the current schema creation scripts. Only appears if your OS
+ belongs to the Unix family (including Linux and Mac OS X) and provides the diff command.</listitem>
+ </itemizedlist>
</section>
<section id="graphicalprocessdesigner">
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5498 - jbpm4/trunk/modules/examples.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-20 10:10:20 -0400 (Thu, 20 Aug 2009)
New Revision: 5498
Modified:
jbpm4/trunk/modules/examples/pom.xml
Log:
added failonerror so that build continues if user.home/.jbpm4/jdbc is not available
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-08-20 09:18:49 UTC (rev 5497)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-08-20 14:10:20 UTC (rev 5498)
@@ -147,7 +147,7 @@
<copy todir="target/jdbc.properties" overwrite="true">
<fileset dir="../../qa/jdbc" />
</copy>
- <copy todir="target/jdbc.properties" overwrite="true">
+ <copy todir="target/jdbc.properties" overwrite="true" failonerror="false">
<fileset dir="${user.home}/.jbpm4/jdbc" />
</copy>
<ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5497 - in projects/jopr-integration/trunk/src/main: java/org/rhq/plugins/jbpm4/connector and 1 other directories.
by do-not-reply＠jboss.org
Author: jim.ma
Date: 2009-08-20 05:18:49 -0400 (Thu, 20 Aug 2009)
New Revision: 5497
Modified:
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java
projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml
Log:
Added delete deploymentfunction
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -42,6 +42,7 @@
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.core.pluginapi.content.ContentFacet;
import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
@@ -50,7 +51,7 @@
* @author ema(a)redhat.com
*
*/
-public class ProcessDeploymentComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, ContentFacet{
+public class ProcessDeploymentComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, ContentFacet, DeleteResourceFacet {
private ResourceContext<ProcessEngineComponent> resourceContext;
private Log log = LogFactory.getLog(this.getClass());
private Deployment deployment = null;
@@ -140,8 +141,10 @@
return response;
}
+ public void deleteResource() throws Exception {
+ this.jbpmConnection.deleteDeployment(resourceContext.getResourceKey());
+ }
-
}
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -19,6 +19,7 @@
import org.rhq.core.pluginapi.content.ContentServices;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.plugins.jbossas5.ApplicationServerComponent;
import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection;
@@ -27,11 +28,11 @@
import org.rhq.plugins.jbpm4.connector.RemoteJBPMEngineConnector;
import org.rhq.plugins.jmx.MBeanResourceComponent;
-public class ProcessEngineComponent extends MBeanResourceComponent implements CreateChildResourceFacet{
+public class ProcessEngineComponent extends MBeanResourceComponent implements CreateChildResourceFacet {
private static final String NAMING_URL = "namingURL";
private static final String PRINCIPAL = "principal";
private static final String CREDENTIALS = "credentials";
- private static final String RESOURCE_TYPE_JBPM_DEVELOPMENT ="Process Developments";
+ private static final String RESOURCE_TYPE_JBPM_DEVELOPMENT ="Process Deployments";
private ContentContext contentContext = null;
private ResourceContext resourceContext = null;
@@ -59,10 +60,6 @@
return av;
}
- /* implement the DeleteResourceFacet */
- public void deleteResource() throws Exception {
- //TODO: implement it
- }
public void getValues(MeasurementReport report, Set requests) {
super.getValues(report, requests);
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -36,6 +36,7 @@
List<ProcessDefinition> getProcessDefs();
ProcessDefinition getProcessDefById(String id);
String deployProcess(File processFile) throws Exception;
+ void deleteDeployment(String deploymentId);
List<ProcessInstance> getAllProcessInstance();
List<ProcessInstance> getProcessInstances(String defId);
ProcessInstance getProcessInstance(String instanceId);
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -81,6 +81,11 @@
return processEngine.getRepositoryService().createDeploymentQuery().list();
}
+ public void deleteDeployment(String deploymentId) {
+ processEngine.getRepositoryService().deleteDeploymentCascade(deploymentId);
+ }
+
+
public Deployment getDeployment(String deploymentId) {
return processEngine.getRepositoryService().createDeploymentQuery().deploymentDbid(Long.valueOf(deploymentId)).uniqueResult();
Modified: projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml 2009-08-20 09:18:49 UTC (rev 5497)
@@ -103,7 +103,7 @@
<service name="Process Deployments"
discovery="ProcessDeploymentDiscoveryComponent"
class="ProcessDeploymentComponent"
- createDeletePolicy="create-only"
+ createDeletePolicy="both"
creationDataType="content"
description="JBPM Process Deployment">
<metric property="id" displayName="id" dataType="trait" displayType="summary" defaultOn="true"
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5496 - in jbpm4/trunk: modules/api and 9 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-20 03:04:51 -0400 (Thu, 20 Aug 2009)
New Revision: 5496
Added:
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
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/qa/cfg/
jbpm4/trunk/qa/cfg/testsuite.db/
jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml
jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties
jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml
jbpm4/trunk/qa/hudson-jbpm4-db.bat
Removed:
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties
Modified:
jbpm4/trunk/modules/api/pom.xml
jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java
jbpm4/trunk/pom.xml
jbpm4/trunk/qa/build.xml
jbpm4/trunk/qa/hudson-jbpm4-db.sh
jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
Log:
standalone db test script
Modified: jbpm4/trunk/modules/api/pom.xml
===================================================================
--- jbpm4/trunk/modules/api/pom.xml 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/api/pom.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -38,12 +38,23 @@
<!-- Profiles -->
<profiles>
<profile>
- <id>schemadocs</id>
+ <id>docs</id>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -77,6 +77,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../db/target/classes</directory>
+ <outputDirectory>install/src/db</outputDirectory>
+ <includes>
+ <include>*.sql</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../devguide/target/docbook/publish/en</directory>
<outputDirectory>doc/devguide</outputDirectory>
<excludes>
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -13,16 +13,17 @@
<property name="mail.smtp.host" value="localhost" />
<echo message="mail.smtp.host... ${mail.smtp.host}" />
- <!-- INTERNAL PROPERTY DEFAULTS -->
+ <!-- INTERNAL PROPERTY DEFAULTS -->
<property name="jbpm.version" value="4.1-SNAPSHOT" />
<property name="jbpm.parent.dir" value="../.." />
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
-
+ <property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource -->
+ <property name="logging" value="jdk" /> <!-- jdk | provided -->
<property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" />
-
- <property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource -->
- <property name="logging" value="jdk" /> <!-- jdk | provided -->
-
+ <property name="install.src.dir" value="${jbpm.home}/install/src" />
+ <property name="jdbc.properties.dir" value="${install.src.dir}/jdbc" />
+ <property name="mail.cfg" value="default" />
+
<property name="tomcat.version" value="6.0.20" />
<property name="tomcat.parent.dir" value="${jbpm.home}" />
<property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" />
@@ -35,48 +36,61 @@
<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.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" />
+ <!-- ### CLEAN CONFIGURATION DIR ########################################### -->
+ <target name="clean.cfg.dir" description="Deletes the ${cfg.dest.dir}">
+ <delete dir="${cfg.dest.dir}" />
+ </target>
+
<!-- ### CREATE CONFIGURATION ########################################### -->
- <target name="create.cfg" description="Creates a configuration in dir generated/cfg">
- <delete dir="${jbpm.home}/install/generated/cfg" />
- <mkdir dir="${jbpm.home}/install/generated/cfg" />
- <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.cfg.xml"
- file="${jbpm.home}/install/src/cfg/jbpm/${tx}.jbpm.cfg.xml" />
- <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.hibernate.cfg.xml"
- file="${jbpm.home}/install/src/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml">
- <filterset filtersfile="${jbpm.home}/install/src/jdbc/${database}.properties" />
+ <target name="create.cfg" description="Creates a configuration in ${cfg.dest.dir}">
+ <echo message="${cfg.dest.dir}" />
+ <echo message="${install.src.dir}" />
+ <echo message="${jdbc.properties.dir}" />
+ <echo message="${user.dir}" />
+ <echo message="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml" />
+ <mkdir dir="${cfg.dest.dir}" />
+ <copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
+ file="${install.src.dir}/cfg/jbpm/${tx}.jbpm.cfg.xml"
+ overwrite="true" />
+ <copy tofile="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
+ file="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml"
+ overwrite="true">
+ <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
</copy>
- <copy todir="${jbpm.home}/install/generated/cfg">
- <fileset dir="${jbpm.home}/install/src/cfg/logging/${logging}" />
+ <copy todir="${cfg.dest.dir}"
+ overwrite="true">
+ <fileset dir="${install.src.dir}/cfg/logging/${logging}" />
</copy>
- <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.mail.properties"
- file="${jbpm.home}/install/src/cfg/mail/jbpm.mail.properties">
+ <copy tofile="${cfg.dest.dir}/jbpm.mail.properties"
+ 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="mail.smtp.host" value="${mail.smtp.host}" />
</filterset>
</copy>
- </target>
+ </target>
<!-- ### CREATE USER WEBAPP ########################################## -->
<target name="create.user.webapp"
- depends="create.cfg"
- description="Generates a configuration in dir generated/cfg">
+ depends="create.cfg"
+ description="Generates a configuration in dir generated/cfg">
<delete dir="${jbpm.home}/install/generated/user-webapp" />
<mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes" />
<mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
- <copy todir="${jbpm.home}/install/generated/user-webapp">
- <fileset dir="${jbpm.home}/install/src/user-webapp"/>
+ <copy todir="${jbpm.home}/install/generated/user-webapp">
+ <fileset dir="${install.src.dir}/user-webapp"/>
</copy>
- <copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes">
- <fileset dir="${jbpm.home}/install/generated/cfg">
- <exclude name="logging.properties" />
- </fileset>
+ <copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes">
+ <fileset dir="${cfg.dest.dir}">
+ <exclude name="logging.properties" />
+ </fileset>
</copy>
<copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib">
<fileset dir="${jbpm.home}">
@@ -99,10 +113,10 @@
<include name="slf4j-jdk14.jar" />
</fileset>
</copy>
-
+
<!-- copy database driver -->
<property name="database.driver.destination.dir" value="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
- <property name="is.tomcat" value="true" />
+ <property name="is.tomcat" value="true" />
<antcall target="internal.copy.database.driver" />
</target>
@@ -225,8 +239,8 @@
</fileset>
</copy>
- <property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
- <antcall target="internal.copy.database.driver" />
+ <property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
+ <antcall target="internal.copy.database.driver" />
</target>
<!-- ### START JBOSS ################################################### -->
@@ -320,7 +334,7 @@
<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-server-integration.jar" />
<include name="gwt-console-rpc.jar" />
<include name="jbpm-console-integration.jar" />
<include name="jbpm-console-form-plugin.jar" />
@@ -365,13 +379,13 @@
<target name="stop.tomcat"
description="Signals Tomcat to stop, but doesn't wait till its finished">
<exec executable="${tomcat.home}/bin/catalina.bat"
- dir="${tomcat.home}/bin"
- os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ dir="${tomcat.home}/bin"
+ os="Windows Vista, Windows XP,Windows 2000,Windows 98">
<arg line="stop"/>
</exec>
<exec executable="${tomcat.home}/bin/catalina.sh"
dir="${tomcat.home}/bin"
- os="Linux, Unix, Mac">
+ os="Linux, Unix, Mac">
<arg line="stop"/>
</exec>
</target>
@@ -391,18 +405,91 @@
<equals arg1="${database}" arg2="postgresql" />
</condition>
<condition property="database.driver" value="hsqldb.jar">
- <and>
+ <and>
<equals arg1="${database}" arg2="hsqldb" />
- <equals arg1="${is.tomcat}" arg2="true" />
+ <equals arg1="${is.tomcat}" arg2="true" />
</and>
</condition>
- <antcall target="internal.copy.database.driver.if.needed" />
+ <antcall target="internal.copy.database.driver.if.needed" />
</target>
-
+
+
+ <!-- ### CREATE JBPM SCHEMA ############################################# -->
+ <target name="create.jbpm.schema"
+ description="creates the jbpm tables in the database">
+ <property file="${jbpm.home}/install/src/jdbc/${database}.properties" />
+ <sql driver="${jdbc.driver}"
+ url="${jdbc.url}"
+ userid="${jdbc.username}"
+ password="${jdbc.password}"
+ onerror="continue"
+ src="${jbpm.home}/install/src/db/jbpm.${database}.create.sql">
+ <classpath>
+ <fileset dir="${jbpm.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </sql>
+ </target>
+
+ <!-- ### DROP JBPM SCHEMA ############################################### -->
+ <target name="drop.jbpm.schema"
+ description="drops the jbpm tables from the database">
+ <property file="${jbpm.home}/install/src/jdbc/${database}.properties" />
+ <echo message="database....... ${database}" />
+ <echo message="jdbc.driver.... ${jdbc.driver}" />
+ <echo message="jdbc.url....... ${jdbc.url}" />
+ <echo message="jdbc.username.. ${jdbc.username}" />
+ <sql driver="${jdbc.driver}"
+ url="${jdbc.url}"
+ userid="${jdbc.username}"
+ password="${jdbc.password}"
+ onerror="continue"
+ src="${jbpm.home}/install/src/db/jbpm.${database}.drop.sql">
+ <classpath>
+ <fileset dir="${jbpm.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </sql>
+ </target>
+
+ <!-- ### LOAD EXAMPLE IDENTITIES ######################################## -->
+ <target name="load.example.identities"
+ description="loads the example users and groups into the database">
+ <sql driver="${jdbc.driver}"
+ url="${jdbc.url}"
+ userid="${jdbc.username}"
+ password="${jdbc.password}"
+ onerror="continue">
+ <transaction src="${jbpm.home}/db/example.identities.sql"/>
+ <classpath>
+ <fileset dir="${jbpm.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </sql>
+ </target>
+
+
+ <!-- ### START HSQLDB DATABASE MGR ##################################### -->
+ <target name="hsqldb.databasemanager"
+ description="start the hsqldb database manager">
+ <java classname="org.hsqldb.util.DatabaseManager" fork="true">
+ <arg line="-url jdbc:hsqldb:hsql://localhost:1701"/>
+ <classpath>
+ <fileset dir="${jbpm.home}/lib">
+ <include name="hsqldb.jar"/>
+ </fileset>
+ </classpath>
+ </java>
+ </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="${database.driver.destination.dir}" />
- </target>
+ </target>
</project>
Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <import resource="jbpm.default.cfg.xml" />
+ <import resource="jbpm.tx.jta.cfg.xml" />
+ <import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.identity.cfg.xml" />
+ <import resource="jbpm.businesscalendar.cfg.xml" />
+ <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <import resource="jbpm.default.cfg.xml" />
+ <import resource="jbpm.tx.spring.cfg.xml" />
+ <import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.identity.cfg.xml" />
+ <import resource="jbpm.businesscalendar.cfg.xml" />
+ <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,12 @@
+<?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.mail.templates.examples.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties (from rev 5489, jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties)
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,3 @@
+mail.smtp.host=(a)mail.smtp.host@
+mail.smtp.port=25
+mail.from=noreply(a)jbpm.org
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties 2009-08-20 07:04:51 UTC (rev 5496)
@@ -1,3 +0,0 @@
-mail.smtp.host=(a)mail.smtp.host@
-mail.smtp.port=25
-mail.from=noreply(a)jbpm.org
Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties (from rev 5489, jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties)
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,3 @@
+mail.smtp.host localhost
+mail.smtp.port 2525
+mail.from noreply(a)jbpm.org
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -123,7 +123,7 @@
<!-- -Ddatabase= -->
<profile>
- <id>standalone.tests</id>
+ <id>run.database.testsuite</id>
<activation>
<property>
<name>database</name>
@@ -143,27 +143,21 @@
<configuration>
<tasks>
<echo message="database: ${database}" />
- <available property="qa.database.props.available" file="../../qa/jdbc/${database}.properties" />
- <echo message="qa.database.props.available: ${qa.database.props.available}" />
- <copy file="../../qa/jdbc/${database}.properties"
- tofile="target/test-classes/jdbc.properties"
- overwrite="true" />
- <copy file="${user.home}/.jbpm4/jdbc/${database}.properties"
- tofile="target/test-classes/jdbc.properties"
- overwrite="true"
- failonerror="false"/>
- <copy file="../../modules/distro/src/main/files/db/hibernate.cfg/${database}.hibernate.cfg.xml"
- tofile="target/test-classes/jbpm.hibernate.cfg.xml"
- overwrite="true">
- <filterset>
- <filtersfile file="target/test-classes/jdbc.properties" />
- </filterset>
+ <mkdir dir="target/jdbc.properties" />
+ <copy todir="target/jdbc.properties" overwrite="true">
+ <fileset dir="../../qa/jdbc" />
</copy>
- <!-- replace file="target/test-classes/jbpm.hibernate.cfg.xml">
- <replacetoken><![CDATA[<property name="hibernate.format_sql">true</property>]]></replacetoken>
- <replacevalue><![CDATA[<property name="hibernate.format_sql">true</property>
- <property name="hibernate.hbm2ddl.auto">create-drop</property>]]></replacevalue>
- </replace -->
+ <copy todir="target/jdbc.properties" overwrite="true">
+ <fileset dir="${user.home}/.jbpm4/jdbc" />
+ </copy>
+ <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
+ <property name="tx" value="standalone.testsuite" />
+ <property name="mail.cfg" value="testsuite" />
+ <property name="database" value="${database}" />
+ <property name="cfg.dest.dir" value="target/test-classes" />
+ <property name="install.src.dir" value="../distro/src/main/files/install/src" />
+ <property name="jdbc.properties.dir" value="target/jdbc.properties" />
+ </ant>
</tasks>
</configuration>
</execution>
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java 2009-08-20 07:04:51 UTC (rev 5496)
@@ -33,20 +33,19 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.subethamail.wiser.Wiser;
-import org.subethamail.wiser.WiserMessage;
-
import org.jbpm.api.ProcessInstance;
import org.jbpm.api.job.Job;
import org.jbpm.api.task.Task;
import org.jbpm.examples.task.assignee.Order;
import org.jbpm.test.JbpmTestCase;
+import org.subethamail.wiser.Wiser;
+import org.subethamail.wiser.WiserMessage;
/**
* @author Alejandro Guizar
*/
public class TaskReminderTest extends JbpmTestCase {
-
+
Wiser wiser = new Wiser();
protected void setUp() throws Exception {
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/pom.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -470,6 +470,15 @@
</build>
<profiles>
+ <!-- schema for direct db integration test. see qa\hudson-jbpm4-db.* -->
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>modules/devguide</module>
+ <module>modules/userguide</module>
+ </modules>
+ </profile>
+
<!-- PROFILE DISTRO
-Pdistro
-->
@@ -478,8 +487,6 @@
<modules>
<module>modules/enterprise</module>
<module>modules/db</module>
- <module>modules/devguide</module>
- <module>modules/userguide</module>
<module>modules/distro</module>
</modules>
<properties>
@@ -494,17 +501,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -519,6 +515,14 @@
</build>
</profile>
+ <!-- schema for direct db integration test. see qa\hudson-jbpm4-db.* -->
+ <profile>
+ <id>schema</id>
+ <modules>
+ <module>modules/db</module>
+ </modules>
+ </profile>
+
<!-- PROFILE NO-DATABASE
The default configurations are based on hsqldb
-->
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/qa/build.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -43,8 +43,35 @@
description="deletes the jbpm installation and then reinstalls jbpm">
<delete dir="${jbpm.home}" />
<unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" />
+
+ <!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory -->
+ <copy file="jdbc/${database}.properties"
+ todir="${jbpm.home}/install/src/jdbc"
+ overwrite="true"
+ failonerror="false" />
+ <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties -->
+ <copy file="${user.home}/.jbpm4/jdbc/${database}.properties"
+ todir="${jbpm.home}/install/src/jdbc"
+ overwrite="true"
+ failonerror="false" />
+ <!-- copy the oracle jar as it is not allowed to be part of our distro -->
+ <copy file="../modules/distro/target/libs/ojdbc14.jar"
+ todir="${jbpm.home}/lib"/>
</target>
+ <!-- DB INTEGRATION TESTSUITE SETUP -->
+ <target name="db.integration.testsuite.setup"
+ depends="reinstall.jbpm">
+ <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema">
+ </ant>
+ <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
+ </target>
+
+ <!-- DB INTEGRATION TESTSUITE TEARDOWN -->
+ <target name="db.integration.testsuite.teardown">
+ <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
+ </target>
+
<!-- TOMCAT INTEGRATION TESTSUITE SETUP -->
<target name="tomcat.integration.testsuite.setup"
depends="reinstall.jbpm">
@@ -87,7 +114,7 @@
<target name="integration.testrun.setup"
- depends="reinstall.jbpm, post.install"
+ depends="reinstall.jbpm"
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" />
@@ -132,26 +159,6 @@
<copy file="jboss/jboss-log4j.xml" todir="${jboss.server.config.dir}/conf" overwrite="true" />
</target>
- <target name="post.install">
- <!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory -->
- <copy file="jdbc/${database}.properties"
- todir="${jbpm.home}/db/jdbc"
- overwrite="true"
- failonerror="false" />
- <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties -->
- <copy file="${user.home}/.jbpm4/jdbc/${database}.properties"
- todir="${jbpm.home}/db/jdbc"
- overwrite="true"
- failonerror="false" />
- <!-- copy the oracle jar as it is not allowed to be part of our distro -->
- <copy file="../modules/distro/target/libs/ojdbc14.jar"
- todir="${jbpm.home}/lib"/>
-
- <!-- copy the jdbc configuration and oracle jar to jbossidm -->
- <antcall target="copy.jbossidm.jdbc.configuration" />
-
- </target>
-
<condition property="identity.component.idm">
<equals arg1="${identity.component}" arg2="jboss.idm"/>
</condition>
Added: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <import resource="jbpm.default.cfg.xml" />
+ <import resource="jbpm.businesscalendar.cfg.xml" />
+ <import resource="jbpm.tx.hibernate.cfg.xml" />
+ <import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.identity.cfg.xml" />
+
+ <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties
===================================================================
--- jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties (rev 0)
+++ jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,3 @@
+mail.smtp.host = localhost
+mail.smtp.port = 2525
+mail.from = noreply(a)jbpm.org
\ No newline at end of file
Property changes on: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml
===================================================================
--- jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml (rev 0)
+++ jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml 2009-08-20 07:04:51 UTC (rev 5496)
@@ -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>
Property changes on: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/qa/hudson-jbpm4-db.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-db.bat (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-db.bat 2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,8 @@
+@echo off
+
+@echo database: %1
+
+cmd /C mvn -U -Pdistro clean install
+cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.setup
+cmd /C mvn -Ddatabase=%1 test
+cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.teardown
Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-db.sh 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/qa/hudson-jbpm4-db.sh 2009-08-20 07:04:51 UTC (rev 5496)
@@ -3,3 +3,6 @@
# runs the smoke test suite
mvn -U -Ddatabase=$DATABASE clean install
+ant -f qa/build.xml $ANT_PROPERTIES database.drop database.create
+mvn -Ddatabase=$DATABASE test
+ant -f qa/build.xml $ANT_PROPERTIES database.drop
Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-08-20 07:04:51 UTC (rev 5496)
@@ -3,7 +3,7 @@
cmd /C ant -f modules/distro/src/main/files/jboss/build.xml reinstall.jbossidm
-cmd /C mvn -U -Pdistro -Pschemadocs clean install
+cmd /C mvn -U -Pdistro clean install
cmd /C ant -f qa/build.xml -Djbpm.debug=true integration.testrun.setup
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5495 - jbpm4/branches/jimma.
by do-not-reply＠jboss.org
Author: jim.ma
Date: 2009-08-20 02:44:08 -0400 (Thu, 20 Aug 2009)
New Revision: 5495
Added:
jbpm4/branches/jimma/trunk/
Log:
Created new branch (based on revision 5493)
Copied: jbpm4/branches/jimma/trunk (from rev 5494, jbpm4/trunk)
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5494 - jbpm4/branches/jimma.
by do-not-reply＠jboss.org
Author: jim.ma
Date: 2009-08-20 02:40:06 -0400 (Thu, 20 Aug 2009)
New Revision: 5494
Removed:
jbpm4/branches/jimma/trunk/
Log:
Removed the unused branch
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5493 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm: jbpm2489 and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-19 08:52:47 -0400 (Wed, 19 Aug 2009)
New Revision: 5493
Added:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/gpd.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml
Log:
[JBPM-2489] upload missing test resources
Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/gpd.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/gpd.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/gpd.xml 2009-08-19 12:52:47 UTC (rev 5493)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="bpm_orchestration2" width="494" height="548">
+ <node name="Start" x="181" y="26" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Receive Order" x="350" y="26" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Validate Order" x="178" y="93" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="fork1" x="117" y="224" width="252" height="24">
+ <edge>
+ <label x="-20" y="-8"/>
+ </edge>
+ <edge>
+ <label x="-53" y="-11"/>
+ </edge>
+ <edge>
+ <label x="21" y="-11"/>
+ </edge>
+ </node>
+ <node name="Los Angeles WHSE" x="176" y="300" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="-10" y="-33"/>
+ </edge>
+ </node>
+ <node name="Dallas WHSE" x="13" y="299" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Atlanta WHSE" x="339" y="300" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="join1" x="115" y="387" width="252" height="24">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Shipment Notice" x="174" y="446" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="End" x="174" y="511" width="132" height="36"/>
+ <node name="Inventory Check" x="177" y="156" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="Credit Check" x="350" y="93" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+</root-container>
Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml 2009-08-19 12:52:47 UTC (rev 5493)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="bpm_orchestration2">
+
+ <start-state name="Start">
+ <transition to="Receive Order"/>
+ </start-state>
+
+ <node async="true" name="Receive Order">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName>
+ <esbServiceName>Service1</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="Credit Check"/>
+ </node>
+
+ <node name="Validate Order">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName>
+ <esbServiceName>Service2</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="Inventory Check"/>
+ </node>
+
+ <fork name="fork1">
+ <transition to="Los Angeles WHSE" name="LA"/>
+ <transition to="Dallas WHSE" name="Dallas"/>
+ <transition name="Atlanta" to="Atlanta WHSE"/>
+ </fork>
+
+ <state name="Los Angeles WHSE">
+ <timer duedate="2 seconds" transition="Dallas"/>
+ <transition name="OK" to="join1"/>
+ <transition to="Dallas WHSE" name="Dallas"/>
+ </state>
+
+ <node name="Dallas WHSE">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName>
+ <esbServiceName>Service6</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="dallas" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="join1"/>
+ </node>
+
+ <node async="true" name="Atlanta WHSE">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName>
+ <esbServiceName>Service7</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="atlanta" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="join1"/>
+ </node>
+
+ <join name="join1" async="exclusive">
+ <transition to="Shipment Notice"/>
+ </join>
+
+ <node name="Shipment Notice">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_ResultsService
+ </esbCategoryName>
+ <esbServiceName>ResultsService</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="atlanta" esb="atlanta"/>
+ <mapping bpm="la" esb="la"/>
+ <mapping bpm="dallas" esb="dallas"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="End"/>
+ </node>
+
+ <end-state name="End"/>
+
+ <node async="true" name="Inventory Check">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
+ <esbServiceName>Service4</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="fork1"/>
+ </node>
+
+ <node name="Credit Check">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
+ <esbServiceName>Service3</esbServiceName>
+ <bpmToEsbVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </bpmToEsbVars>
+ <esbToBpmVars>
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
+ </esbToBpmVars>
+ </action>
+ <transition to="Validate Order"/>
+ </node>
+
+</process-definition>
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5492 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: main/java/org/jbpm/graph/def and 14 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-19 07:34:10 -0400 (Wed, 19 Aug 2009)
New Revision: 5492
Added:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2489/
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Node.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Transition.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ExecutionContext.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/ProcessFactory.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/TaskNode.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/Task.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskMgmtDefinition.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/ContextInstance.hbm.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/JbpmContextTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessClassLoaderTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/log4j.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml
Log:
[JBPM-2489] process loses access to variables when timer is used within fork
provide adequate equals and hash code functions
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -65,7 +65,7 @@
public void deployProcessDefinition(ProcessDefinition processDefinition) {
String processDefinitionName = processDefinition.getName();
- // if the process definition has a name (versioning applies to named process definitions only)
+ // versioning applies to named process definitions only
if (processDefinitionName != null) {
// find the current latest process definition
ProcessDefinition previousLatestVersion = findLatestProcessDefinition(processDefinitionName);
@@ -107,12 +107,13 @@
*/
public ProcessDefinition loadProcessDefinition(long processDefinitionId) {
try {
- return (ProcessDefinition) session.load(ProcessDefinition.class, new Long(processDefinitionId));
+ return (ProcessDefinition) session.load(ProcessDefinition.class, new Long(
+ processDefinitionId));
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException(
- "could not load process definition " + processDefinitionId, e);
+ throw new JbpmPersistenceException("could not load process definition "
+ + processDefinitionId, e);
}
}
@@ -123,12 +124,13 @@
*/
public ProcessDefinition getProcessDefinition(long processDefinitionId) {
try {
- return (ProcessDefinition) session.get(ProcessDefinition.class, new Long(processDefinitionId));
+ return (ProcessDefinition) session.get(ProcessDefinition.class, new Long(
+ processDefinitionId));
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not get process definition " + processDefinitionId,
- e);
+ throw new JbpmPersistenceException("could not get process definition "
+ + processDefinitionId, e);
}
}
@@ -144,10 +146,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not find process definition '"
- + name
- + "' at version "
- + version, e);
+ throw new JbpmPersistenceException("could not find process definition '" + name
+ + "' at version " + version, e);
}
}
@@ -168,8 +168,8 @@
}
/**
- * queries the database for the latest version of each process definition. Process definitions are
- * distinct by name.
+ * queries the database for the latest version of each process definition. Process definitions
+ * are distinct by name.
*/
public List findLatestProcessDefinitions() {
try {
@@ -185,7 +185,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not find latest versions of process definitions", e);
+ throw new JbpmPersistenceException(
+ "could not find latest versions of process definitions", e);
}
}
@@ -196,8 +197,8 @@
}
/**
- * queries the database for all process definitions, ordered by name (ascending), then by version
- * (descending).
+ * queries the database for all process definitions, ordered by name (ascending), then by
+ * version (descending).
*/
public List findAllProcessDefinitions() {
try {
@@ -210,8 +211,8 @@
}
/**
- * queries the database for all versions of process definitions with the given name, ordered by
- * version (descending).
+ * queries the database for all versions of process definitions with the given name, ordered
+ * by version (descending).
*/
public List findAllProcessDefinitionVersions(String name) {
try {
@@ -222,8 +223,7 @@
catch (HibernateException e) {
log.error(e);
throw new JbpmPersistenceException("could not find all versions of process definition '"
- + name
- + "'", e);
+ + name + "'", e);
}
}
@@ -273,15 +273,15 @@
/**
* @deprecated use {@link org.jbpm.JbpmContext#save(ProcessInstance)} instead.
- * @throws UnsupportedOperationException
+ * @throws UnsupportedOperationException to prevent invocation
*/
public void saveProcessInstance(ProcessInstance processInstance) {
throw new UnsupportedOperationException("use JbpmContext.save(ProcessInstance) instead");
}
/**
- * loads a process instance from the database by the identifier. This throws an exception in case
- * the process instance doesn't exist.
+ * loads a process instance from the database by the identifier. This throws an exception in
+ * case the process instance does not exist.
*
* @see #getProcessInstance(long)
* @throws JbpmPersistenceException in case the process instance doesn't exist.
@@ -292,13 +292,14 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not load process instance " + processInstanceId, e);
+ throw new JbpmPersistenceException(
+ "could not load process instance " + processInstanceId, e);
}
}
/**
- * gets a process instance from the database by the identifier. This method returns null in case
- * the given process instance doesn't exist.
+ * gets a process instance from the database by the identifier. This method returns null in
+ * case the given process instance does not exist.
*/
public ProcessInstance getProcessInstance(long processInstanceId) {
try {
@@ -306,7 +307,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not get process instance " + processInstanceId, e);
+ throw new JbpmPersistenceException("could not get process instance " + processInstanceId,
+ e);
}
}
@@ -350,7 +352,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not lock process instance " + processInstanceId, e);
+ throw new JbpmPersistenceException(
+ "could not lock process instance " + processInstanceId, e);
}
}
@@ -368,8 +371,8 @@
}
/**
- * fetches all processInstances for the given process definition from the database. The returned
- * list of process instances is sorted start date, youngest first.
+ * fetches all processInstances for the given process definition from the database. The
+ * returned list of process instances is sorted start date, youngest first.
*/
public List findProcessInstances(long processDefinitionId) {
try {
@@ -379,8 +382,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not find process instances for process definition "
- + processDefinitionId, e);
+ throw new JbpmPersistenceException(
+ "could not find process instances for process definition " + processDefinitionId, e);
}
}
@@ -400,43 +403,21 @@
try {
// delete outstanding jobs
- if (includeJobs) {
- log.debug("deleting jobs for " + processInstance);
- int entityCount = session.getNamedQuery("GraphSession.deleteJobsForProcessInstance")
- .setEntity("processInstance", processInstance)
- .executeUpdate();
- log.debug("deleted " + entityCount + " jobs for " + processInstance);
- }
+ if (includeJobs) deleteJobs(processInstance);
// delete logs
- log.debug("deleting logs for " + processInstance);
deleteLogs(processInstance);
- // detach from parent process token
+ // detach from superprocess token
Token superProcessToken = processInstance.getSuperProcessToken();
- if (superProcessToken != null) {
- log.debug("detaching "
- + processInstance
- + " from super process token "
- + superProcessToken.getId());
- processInstance.setSuperProcessToken(null);
- superProcessToken.setSubProcessInstance(null);
- }
+ if (superProcessToken != null)
+ detachFromSuperProcess(processInstance, superProcessToken);
- // delete tokens and subprocess instances
- log.debug("deleting subprocesses for " + processInstance);
+ // delete subprocess instances
deleteSubProcesses(processInstance);
- // delete tasks (TaskLogs reference tasks, so tasks must be deleted after logs)
- if (includeTasks) {
- log.debug("deleting tasks for " + processInstance);
- List tasks = session.getNamedQuery("GraphSession.findTaskInstancesForProcessInstance")
- .setEntity("processInstance", processInstance)
- .list();
- for (Iterator i = tasks.iterator(); i.hasNext();) {
- session.delete(i.next());
- }
- }
+ // delete tasks; since TaskLogs reference tasks, logs are deleted first
+ if (includeTasks) deleteTasks(processInstance);
// delete the process instance
log.debug("deleting " + processInstance);
@@ -448,7 +429,16 @@
}
}
+ void deleteJobs(ProcessInstance processInstance) {
+ log.debug("deleting jobs for " + processInstance);
+ int entityCount = session.getNamedQuery("GraphSession.deleteJobsForProcessInstance")
+ .setEntity("processInstance", processInstance)
+ .executeUpdate();
+ log.debug("deleted " + entityCount + " jobs for " + processInstance);
+ }
+
void deleteLogs(ProcessInstance processInstance) {
+ log.debug("deleting logs for " + processInstance);
List logs = session.getNamedQuery("GraphSession.findLogsForProcessInstance")
.setEntity("processInstance", processInstance)
.list();
@@ -457,25 +447,40 @@
}
}
+ void detachFromSuperProcess(ProcessInstance processInstance, Token superProcessToken) {
+ log.debug("detaching " + processInstance + " from " + superProcessToken);
+ processInstance.setSuperProcessToken(null);
+ superProcessToken.setSubProcessInstance(null);
+ }
+
void deleteSubProcesses(ProcessInstance processInstance) {
- if (processInstance != null) {
- List subProcessInstances = session.getNamedQuery("GraphSession.findSubProcessInstances")
- .setEntity("processInstance", processInstance)
- .list();
+ log.debug("deleting subprocesses for " + processInstance);
+ List subProcessInstances = session.getNamedQuery("GraphSession.findSubProcessInstances")
+ .setEntity("processInstance", processInstance)
+ .list();
- if (subProcessInstances.isEmpty()) {
- log.debug("no subprocesses to delete for " + processInstance);
- return;
- }
+ if (subProcessInstances.isEmpty()) {
+ log.debug("no subprocesses to delete for " + processInstance);
+ return;
+ }
- for (Iterator i = subProcessInstances.iterator(); i.hasNext();) {
- ProcessInstance subProcessInstance = (ProcessInstance) i.next();
- log.debug("preparing to delete sub process instance " + subProcessInstance.getId());
- deleteProcessInstance(subProcessInstance);
- }
+ for (Iterator i = subProcessInstances.iterator(); i.hasNext();) {
+ ProcessInstance subProcessInstance = (ProcessInstance) i.next();
+ log.debug("preparing to delete Sub" + subProcessInstance);
+ deleteProcessInstance(subProcessInstance);
}
}
+ void deleteTasks(ProcessInstance processInstance) {
+ log.debug("deleting tasks for " + processInstance);
+ List tasks = session.getNamedQuery("GraphSession.findTaskInstancesForProcessInstance")
+ .setEntity("processInstance", processInstance)
+ .list();
+ for (Iterator i = tasks.iterator(); i.hasNext();) {
+ session.delete(i.next());
+ }
+ }
+
public static class AverageNodeTimeEntry {
private long nodeId;
@@ -565,9 +570,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException(
- "could not calculate average time by node for process definition " + processDefinitionId,
- e);
+ throw new JbpmPersistenceException("could not calculate average time by node for "
+ + processDefinitionId, e);
}
}
@@ -579,7 +583,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not find active nodes for " + processInstance, e);
+ throw new JbpmPersistenceException("could not find active nodes for " + processInstance,
+ e);
}
}
@@ -592,7 +597,8 @@
}
catch (HibernateException e) {
handle(e);
- throw new JbpmPersistenceException("could not get process instance with key '" + key + "'", e);
+ throw new JbpmPersistenceException("could not get process instance with key '" + key
+ + "'", e);
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -48,7 +48,6 @@
import org.jbpm.svc.Service;
import org.jbpm.svc.Services;
import org.jbpm.util.ClassUtil;
-import org.jbpm.util.EqualsUtil;
public abstract class GraphElement implements Identifiable, Serializable {
@@ -71,14 +70,14 @@
// events ///////////////////////////////////////////////////////////////////
/**
- * indicative set of event types supported by this graph element. this is currently only used by
- * the process designer to know which event types to show on a given graph element. in process
- * definitions and at runtime, there are no contstraints on the event-types.
+ * indicative set of event types supported by this graph element. this is currently only used
+ * by the process designer to know which event types to show on a given graph element. in
+ * process definitions and at runtime, there are no constraints on the event-types.
*/
public abstract String[] getSupportedEventTypes();
/**
- * gets the events, keyd by eventType (java.lang.String).
+ * gets the events, keyed by eventType (java.lang.String).
*/
public Map getEvents() {
return events;
@@ -117,7 +116,8 @@
throw new IllegalArgumentException("can't remove null event from graph element");
}
if (event.getEventType() == null) {
- throw new IllegalArgumentException("can't remove an event without type from graph element");
+ throw new IllegalArgumentException(
+ "can't remove an event without type from graph element");
}
if (events != null) {
removedEvent = (Event) events.remove(event.getEventType());
@@ -151,7 +151,8 @@
public void removeExceptionHandler(ExceptionHandler exceptionHandler) {
if (exceptionHandler == null) {
- throw new IllegalArgumentException("can't remove null exceptionHandler from graph element");
+ throw new IllegalArgumentException(
+ "can't remove null exceptionHandler from graph element");
}
if (exceptionHandlers != null && exceptionHandlers.remove(exceptionHandler)) {
exceptionHandler.graphElement = null;
@@ -159,19 +160,14 @@
}
public void reorderExceptionHandler(int oldIndex, int newIndex) {
- if (exceptionHandlers != null
- && Math.min(oldIndex, newIndex) >= 0
+ if (exceptionHandlers != null && Math.min(oldIndex, newIndex) >= 0
&& Math.max(oldIndex, newIndex) < exceptionHandlers.size()) {
Object o = exceptionHandlers.remove(oldIndex);
exceptionHandlers.add(newIndex, o);
}
else {
- throw new IndexOutOfBoundsException("couldn't reorder element from index '"
- + oldIndex
- + "' to index '"
- + newIndex
- + "' in "
- + exceptionHandlers);
+ throw new IndexOutOfBoundsException("couldn't reorder element from index '" + oldIndex
+ + "' to index '" + newIndex + "' in " + exceptionHandlers);
}
}
@@ -289,7 +285,8 @@
}
}
catch (Exception exception) {
- // NOTE that Errors are not caught because that might halt the JVM and mask the original Error
+ // NOTE that Errors are not caught because that might halt the JVM and mask the original
+ // Error
log.error("action threw exception: " + exception.getMessage(), exception);
// log the action exception
@@ -323,8 +320,8 @@
}
/**
- * throws an ActionException if no applicable exception handler is found. An ExceptionHandler is
- * searched for in this graph element and then recursively up the parent hierarchy. If an
+ * throws an ActionException if no applicable exception handler is found. An ExceptionHandler
+ * is searched for in this graph element and then recursively up the parent hierarchy. If an
* exception handler is found, it is applied. If the exception handler does not throw an
* exception, the exception is considered handled. Otherwise the search for an applicable
* exception handler continues where it left of with the newly thrown exception.
@@ -359,7 +356,7 @@
// rollbackActions(executionContext);
// if there is no parent we need to throw a delegation exception to the client
- throw exception instanceof JbpmException ? (JbpmException) exception
+ throw exception instanceof JbpmException ? (JbpmException) exception
: new DelegationException(exception, executionContext);
}
@@ -372,16 +369,16 @@
*/
private static boolean isAbleToHandleExceptions(ExecutionContext executionContext) {
/*
- * if an exception is already set, we are already handling an exception;
- * in this case don't give the exception to the handlers but throw it to the client
- * see https://jira.jboss.org/jira/browse/JBPM-1887
+ * if an exception is already set, we are already handling an exception; in this case don't
+ * give the exception to the handlers but throw it to the client see
+ * https://jira.jboss.org/jira/browse/JBPM-1887
*/
if (executionContext.getException() != null) return false;
/*
* check whether the transaction is still active before scanning the exception handlers.
- * that way we can load the exception handlers lazily
- * see https://jira.jboss.org/jira/browse/JBPM-1775
+ * that way we can load the exception handlers lazily see
+ * https://jira.jboss.org/jira/browse/JBPM-1775
*/
JbpmContext jbpmContext = executionContext.getJbpmContext();
if (jbpmContext != null) {
@@ -444,18 +441,34 @@
}
}
+ // equals ///////////////////////////////////////////////////////////////////
+
+ public boolean equals(Object o) {
+ if (o == this) return true;
+ if (!getClass().isInstance(o)) return false;
+
+ GraphElement other = (GraphElement) o;
+ if (id != 0) return id == other.getId();
+
+ GraphElement parent = getParent();
+ return (name != null ? name.equals(other.getName()) : other.getName() == null)
+ && (parent != null ? parent.equals(other.getParent()) : other.getParent() == null);
+ }
+
+ public int hashCode() {
+ if (id != 0) return (int) (id ^ (id >>> 32));
+
+ int result = 580399073 + (name != null ? name.hashCode() : 0);
+ GraphElement parent = getParent();
+ result = 345105097 * result + (parent != null ? parent.hashCode() : 0);
+ return result;
+ }
+
public String toString() {
return ClassUtil.getSimpleName(getClass())
+ (name != null ? '(' + name + ')' : '@' + Integer.toHexString(hashCode()));
}
- // equals ///////////////////////////////////////////////////////////////////
- // hack to support comparing hibernate proxies against the real objects
- // since this always falls back to ==, we don't need to overwrite the hashcode
- public boolean equals(Object o) {
- return EqualsUtil.equals(this, o);
- }
-
// getters and setters //////////////////////////////////////////////////////
public long getId() {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Node.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -179,8 +179,8 @@
throw new IllegalArgumentException("can't add a null leaving transition to an node");
if (leavingTransitions == null) leavingTransitions = new ArrayList();
+ leavingTransition.from = this;
leavingTransitions.add(leavingTransition);
- leavingTransition.from = this;
leavingTransitionMap = null;
return leavingTransition;
}
@@ -310,8 +310,8 @@
throw new IllegalArgumentException("can't add a null arrivingTransition to a node");
if (arrivingTransitions == null) arrivingTransitions = new HashSet();
+ arrivingTransition.to = this;
arrivingTransitions.add(arrivingTransition);
- arrivingTransition.to = this;
return arrivingTransition;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -56,22 +56,22 @@
private static final long serialVersionUID = 1L;
protected int version = -1;
- protected boolean isTerminationImplicit = false;
- protected Node startState = null;
- protected List nodes = null;
- transient Map nodesMap = null;
- protected Map actions = null;
- protected Map definitions = null;
+ protected boolean isTerminationImplicit;
+ protected Node startState;
+ protected List nodes;
+ transient Map nodesMap;
+ protected Map actions;
+ protected Map definitions;
// event types //////////////////////////////////////////////////////////////
- public static final String[] supportedEventTypes = new String[] { Event.EVENTTYPE_PROCESS_START,
- Event.EVENTTYPE_PROCESS_END, Event.EVENTTYPE_NODE_ENTER, Event.EVENTTYPE_NODE_LEAVE,
- Event.EVENTTYPE_TASK_CREATE, Event.EVENTTYPE_TASK_ASSIGN, Event.EVENTTYPE_TASK_START,
- Event.EVENTTYPE_TASK_END, Event.EVENTTYPE_TRANSITION, Event.EVENTTYPE_BEFORE_SIGNAL,
- Event.EVENTTYPE_AFTER_SIGNAL, Event.EVENTTYPE_SUPERSTATE_ENTER,
- Event.EVENTTYPE_SUPERSTATE_LEAVE, Event.EVENTTYPE_SUBPROCESS_CREATED,
- Event.EVENTTYPE_SUBPROCESS_END, Event.EVENTTYPE_TIMER };
+ public static final String[] supportedEventTypes = new String[] {
+ Event.EVENTTYPE_PROCESS_START, Event.EVENTTYPE_PROCESS_END, Event.EVENTTYPE_NODE_ENTER,
+ Event.EVENTTYPE_NODE_LEAVE, Event.EVENTTYPE_TASK_CREATE, Event.EVENTTYPE_TASK_ASSIGN,
+ Event.EVENTTYPE_TASK_START, Event.EVENTTYPE_TASK_END, Event.EVENTTYPE_TRANSITION,
+ Event.EVENTTYPE_BEFORE_SIGNAL, Event.EVENTTYPE_AFTER_SIGNAL,
+ Event.EVENTTYPE_SUPERSTATE_ENTER, Event.EVENTTYPE_SUPERSTATE_LEAVE,
+ Event.EVENTTYPE_SUBPROCESS_CREATED, Event.EVENTTYPE_SUBPROCESS_END, Event.EVENTTYPE_TIMER };
public String[] getSupportedEventTypes() {
return supportedEventTypes;
@@ -80,7 +80,7 @@
// constructors /////////////////////////////////////////////////////////////
public ProcessDefinition() {
- this.processDefinition = this;
+ processDefinition = this;
}
public static ProcessDefinition createNewProcessDefinition() {
@@ -98,19 +98,20 @@
}
catch (Exception e) {
- throw new JbpmException("couldn't instantiate default module '" + moduleClassName + "'", e);
+ throw new JbpmException(
+ "couldn't instantiate default module '" + moduleClassName + "'", e);
}
}
return processDefinition;
}
public ProcessDefinition(String name) {
- this.processDefinition = this;
+ this();
this.name = name;
}
public ProcessDefinition(String[] nodes, String[] transitions) {
- this.processDefinition = this;
+ this();
ProcessFactory.addNodesAndTransitions(this, nodes, transitions);
}
@@ -128,11 +129,31 @@
public void setProcessDefinition(ProcessDefinition processDefinition) {
if (!equals(processDefinition)) {
- throw new JbpmException(
- "can't set the process-definition-property of a process defition to something else then a self-reference");
+ throw new IllegalArgumentException(
+ "process definition cannot reference another process definition");
}
}
+ // equals ///////////////////////////////////////////////////////////////////
+
+ public boolean equals(Object o) {
+ if (o == this) return true;
+ if (!(o instanceof ProcessDefinition)) return false;
+
+ ProcessDefinition other = (ProcessDefinition) o;
+ return id != 0 ? id == other.getId() : (name != null ? name.equals(other.getName())
+ : other.getName() == null)
+ && version == other.getVersion();
+ }
+
+ public int hashCode() {
+ if (id != 0) return (int) (id ^ (id >>> 32));
+
+ int result = 224001527 + (name != null ? name.hashCode() : 0);
+ result = 1568661329 * result + version;
+ return result;
+ }
+
// parsing //////////////////////////////////////////////////////////////////
/**
@@ -268,17 +289,14 @@
// javadoc description in NodeCollection
public void reorderNode(int oldIndex, int newIndex) {
- if (nodes != null
- && Math.min(oldIndex, newIndex) >= 0
+ if (nodes != null && Math.min(oldIndex, newIndex) >= 0
&& Math.max(oldIndex, newIndex) < nodes.size()) {
Object node = nodes.remove(oldIndex);
nodes.add(newIndex, node);
}
else {
- throw new IndexOutOfBoundsException("couldn't reorder element from index "
- + oldIndex
- + " to index "
- + newIndex);
+ throw new IndexOutOfBoundsException("couldn't reorder element from index " + oldIndex
+ + " to index " + newIndex);
}
}
@@ -329,8 +347,7 @@
String namePart = tokenizer.nextToken();
if ("..".equals(namePart)) {
if (nodeCollection instanceof ProcessDefinition) {
- throw new JbpmException("couldn't find node '"
- + hierarchicalName
+ throw new JbpmException("could not find node '" + hierarchicalName
+ "' because of a '..' on the process definition.");
}
nodeCollection = (NodeCollection) ((GraphElement) nodeCollection).getParent();
@@ -385,8 +402,10 @@
* actions of this process definition.
*/
public void removeAction(Action action) {
- if (action == null)
- throw new IllegalArgumentException("can't remove a null action from an process definition");
+ if (action == null) {
+ throw new IllegalArgumentException(
+ "can't remove a null action from an process definition");
+ }
if (actions != null) {
if (!actions.containsValue(action)) {
throw new IllegalArgumentException(
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Transition.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Transition.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Transition.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -33,118 +33,105 @@
import org.jbpm.graph.log.TransitionLog;
import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
-public class Transition extends GraphElement
-{
+public class Transition extends GraphElement {
+
private static final long serialVersionUID = 1L;
- protected Node from = null;
- protected Node to = null;
- protected String condition = null;
+ protected Node from;
+ protected Node to;
+ protected String condition;
transient boolean isConditionEnforced = true;
// event types //////////////////////////////////////////////////////////////
public static final String[] supportedEventTypes = new String[] { Event.EVENTTYPE_TRANSITION };
- public String[] getSupportedEventTypes()
- {
+ public String[] getSupportedEventTypes() {
return supportedEventTypes;
}
// constructors /////////////////////////////////////////////////////////////
- public Transition()
- {
+ public Transition() {
}
- public Transition(String name)
- {
+ public Transition(String name) {
super(name);
}
// from /////////////////////////////////////////////////////////////////////
- public Node getFrom()
- {
+ public Node getFrom() {
return from;
}
- /*
- * sets the from node unidirectionally. use {@link Node#addLeavingTransition(Transition)} to get bidirectional relations mgmt.
+ /**
+ * sets the from node unidirectionally. use {@link Node#addLeavingTransition(Transition)} to
+ * get bidirectional relations mgmt.
*/
- public void setFrom(Node from)
- {
+ public void setFrom(Node from) {
this.from = from;
}
// to ///////////////////////////////////////////////////////////////////////
- /*
- * sets the to node unidirectionally. use {@link Node#addArrivingTransition(Transition)} to get bidirectional relations mgmt.
+ /**
+ * sets the to node unidirectionally. use {@link Node#addArrivingTransition(Transition)} to
+ * get bidirectional relations mgmt.
*/
- public void setTo(Node to)
- {
+ public void setTo(Node to) {
this.to = to;
}
- public Node getTo()
- {
+ public Node getTo() {
return to;
}
- /*
- * the condition expresssion for this transition.
+ /**
+ * the condition expression for this transition.
*/
- public String getCondition()
- {
+ public String getCondition() {
return condition;
}
- public void setCondition(String conditionExpression)
- {
+ public void setCondition(String conditionExpression) {
this.condition = conditionExpression;
}
- public void removeConditionEnforcement()
- {
+ public void removeConditionEnforcement() {
isConditionEnforced = false;
}
// behaviour ////////////////////////////////////////////////////////////////
- /*
+ /**
* passes execution over this transition.
*/
- public void take(ExecutionContext executionContext)
- {
+ public void take(ExecutionContext executionContext) {
// update the runtime context information
executionContext.getToken().setNode(null);
Token token = executionContext.getToken();
- if ((condition != null) && (isConditionEnforced))
- {
+ if (condition != null && isConditionEnforced) {
Object result = JbpmExpressionEvaluator.evaluate(condition, executionContext);
- if (result == null)
- {
+ if (result == null) {
throw new JbpmException("transition condition " + condition + " evaluated to null");
}
- else if (!(result instanceof Boolean))
- {
- throw new JbpmException("transition condition " + condition + " evaluated to non-boolean: " + result.getClass().getName());
+ else if (!(result instanceof Boolean)) {
+ throw new JbpmException("transition condition " + condition
+ + " evaluated to non-boolean: " + result.getClass().getName());
}
- else if (!((Boolean)result).booleanValue())
- {
+ else if (!((Boolean) result).booleanValue()) {
throw new JbpmException("transition condition " + condition + " evaluated to 'false'");
}
}
// start the transition log
- TransitionLog transitionLog = new TransitionLog(this, executionContext.getTransitionSource());
+ TransitionLog transitionLog = new TransitionLog(this,
+ executionContext.getTransitionSource());
token.startCompositeLog(transitionLog);
- try
- {
-
+ try {
// fire leave events for superstates (if any)
fireSuperStateLeaveEvents(executionContext);
@@ -155,37 +142,31 @@
Node destination = fireSuperStateEnterEvents(executionContext);
// update the ultimate destinationNode of this transition
transitionLog.setDestinationNode(destination);
-
}
- finally
- {
+ finally {
// end the transition log
token.endCompositeLog();
}
-
// pass the token to the destinationNode node
to.enter(executionContext);
}
- Node fireSuperStateEnterEvents(ExecutionContext executionContext)
- {
+ Node fireSuperStateEnterEvents(ExecutionContext executionContext) {
// calculate the actual destinationNode node
Node destination = to;
- while (destination != null && destination.isSuperStateNode())
- {
+ while (destination != null && destination.isSuperStateNode()) {
List nodes = destination.getNodes();
- destination = nodes != null && !nodes.isEmpty() ? (Node)nodes.get(0) : null;
+ destination = nodes != null && !nodes.isEmpty() ? (Node) nodes.get(0) : null;
}
- if (destination == null)
- {
+ if (destination == null) {
String transitionName = (name != null ? "'" + name + "'" : "in node '" + from + "'");
- throw new JbpmException("transition " + transitionName + " doesn't have destination. check your processdefinition.xml");
+ throw new JbpmException("transition " + transitionName
+ + " doesn't have destination. check your processdefinition.xml");
}
- // performance optimisation: check if at least there is a candidate superstate to be entered.
- if (destination.getSuperState() != null)
- {
+ // optimisation: check if there is a candidate superstate to be entered.
+ if (destination.getSuperState() != null) {
// collect all the superstates being left
List leavingSuperStates = collectAllSuperStates(destination, from);
// reverse the order so that events are fired from outer to inner superstates
@@ -197,11 +178,9 @@
return destination;
}
- void fireSuperStateLeaveEvents(ExecutionContext executionContext)
- {
- // performance optimisation: check if at least there is a candidate superstate to be left.
- if (executionContext.getTransitionSource().getSuperState() != null)
- {
+ void fireSuperStateLeaveEvents(ExecutionContext executionContext) {
+ // optimisation: check if there is a candidate superstate to be left.
+ if (executionContext.getTransitionSource().getSuperState() != null) {
// collect all the superstates being left
List leavingSuperStates = collectAllSuperStates(executionContext.getTransitionSource(), to);
// fire a node-leave event for all superstates being left
@@ -209,52 +188,70 @@
}
}
- /*
+ /**
* collect all superstates of a that do not contain node b.
*/
- static List collectAllSuperStates(Node a, Node b)
- {
+ static List collectAllSuperStates(Node a, Node b) {
SuperState superState = a.getSuperState();
List leavingSuperStates = new ArrayList();
- while (superState != null)
- {
- if (!superState.containsNode(b))
- {
+ while (superState != null) {
+ if (!superState.containsNode(b)) {
leavingSuperStates.add(superState);
superState = superState.getSuperState();
}
- else
- {
+ else {
superState = null;
}
}
return leavingSuperStates;
}
- /*
+ /**
* fires the give event on all the superstates in the list.
*/
- void fireSuperStateEvents(List superStates, String eventType, ExecutionContext executionContext)
- {
+ void fireSuperStateEvents(List superStates, String eventType,
+ ExecutionContext executionContext) {
Iterator iter = superStates.iterator();
- while (iter.hasNext())
- {
- SuperState leavingSuperState = (SuperState)iter.next();
+ while (iter.hasNext()) {
+ SuperState leavingSuperState = (SuperState) iter.next();
leavingSuperState.fireEvent(eventType, executionContext);
}
}
+ // equals ///////////////////////////////////////////////////////////////////
+
+ public boolean equals(Object o) {
+ if (o == this) return true;
+ if (!(o instanceof Transition)) return false;
+
+ Transition other = (Transition) o;
+ return id != 0 ? id == other.getId() : (name != null ? name.equals(other.getName())
+ : other.getName() == null)
+ && (from != null ? from.equals(other.getFrom()) : other.getFrom() == null)
+ && (to != null ? to.equals(other.getTo()) : other.getTo() == null);
+ }
+
+ public int hashCode() {
+ if (id != 0) return (int) (id ^ (id >>> 32));
+
+ int result = 580399073 + (name != null ? name.hashCode() : 0);
+ result = 345105097 * result + (from != null ? from.hashCode() : 0);
+ result = 345105097 * result + (to != null ? to.hashCode() : 0);
+ return result;
+ }
+
// other
// ///////////////////////////////////////////////////////////////////////////
- public void setName(String name)
- {
- if (from != null)
- {
- if (from.hasLeavingTransition(name))
- {
- throw new IllegalArgumentException("couldn't set name '" + name + "' on transition '" + this
- + "'cause the from-node of this transition has already another leaving transition with the same name");
+ public void setName(String name) {
+ if (from != null) {
+ if (from.hasLeavingTransition(name)) {
+ throw new IllegalArgumentException(
+ "couldn't set name '"
+ + name
+ + "' on transition '"
+ + this
+ + "'cause the from-node of this transition has already another leaving transition with the same name");
}
Map fromLeavingTransitions = from.getLeavingTransitionsMap();
fromLeavingTransitions.remove(this.name);
@@ -263,35 +260,16 @@
this.name = name;
}
- public GraphElement getParent()
- {
- GraphElement parent = null;
- if ((from != null) && (to != null))
- {
- if (from.equals(to))
- {
- parent = from.getParent();
- }
- else
- {
- List fromParentChain = from.getParentChain();
- List toParentChain = to.getParentChain();
- Iterator fromIter = fromParentChain.iterator();
- while (fromIter.hasNext() && (parent == null))
- {
- GraphElement fromParent = (GraphElement)fromIter.next();
- Iterator toIter = toParentChain.iterator();
- while (toIter.hasNext() && (parent == null))
- {
- GraphElement toParent = (GraphElement)toIter.next();
- if (fromParent == toParent)
- {
- parent = fromParent;
- }
- }
+ public GraphElement getParent() {
+ if (from != null && to != null) {
+ if (from.equals(to)) return from.getParent();
+
+ for (GraphElement fromParent = from; fromParent != null; fromParent = fromParent.getParent()) {
+ for (GraphElement toParent = to; toParent != null; toParent = toParent.getParent()) {
+ if (fromParent.equals(toParent)) return fromParent;
}
}
}
- return parent;
+ return processDefinition;
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ExecutionContext.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ExecutionContext.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ExecutionContext.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -39,60 +39,51 @@
import org.jbpm.taskmgmt.exe.TaskInstance;
import org.jbpm.taskmgmt.exe.TaskMgmtInstance;
-public class ExecutionContext
-{
+public class ExecutionContext {
- protected Token token = null;
- protected Event event = null;
- protected GraphElement eventSource = null;
- protected Action action = null;
- protected Throwable exception = null;
- protected Transition transition = null;
- protected Node transitionSource = null;
- protected Task task = null;
- protected Timer timer = null;
- protected TaskInstance taskInstance = null;
- protected ProcessInstance subProcessInstance = null;
+ protected Token token;
+ protected Event event;
+ protected GraphElement eventSource;
+ protected Action action;
+ protected Throwable exception;
+ protected Transition transition;
+ protected Node transitionSource;
+ protected Task task;
+ protected Timer timer;
+ protected TaskInstance taskInstance;
+ protected ProcessInstance subProcessInstance;
- public ExecutionContext(Token token)
- {
+ public ExecutionContext(Token token) {
this.token = token;
}
- public ExecutionContext(ExecutionContext other)
- {
+ public ExecutionContext(ExecutionContext other) {
this.token = other.token;
this.event = other.event;
this.action = other.action;
}
- public Node getNode()
- {
+ public Node getNode() {
return token.getNode();
}
- public ProcessDefinition getProcessDefinition()
- {
+ public ProcessDefinition getProcessDefinition() {
ProcessInstance processInstance = getProcessInstance();
return (processInstance != null ? processInstance.getProcessDefinition() : null);
}
- public void setAction(Action action)
- {
+ public void setAction(Action action) {
this.action = action;
- if (action != null)
- {
+ if (action != null) {
this.event = action.getEvent();
}
}
- public ProcessInstance getProcessInstance()
- {
+ public ProcessInstance getProcessInstance() {
return token.getProcessInstance();
}
- public String toString()
- {
+ public String toString() {
return "ExecutionContext[" + token + "]";
}
@@ -101,14 +92,11 @@
/**
* set a process variable.
*/
- public void setVariable(String name, Object value)
- {
- if (taskInstance != null)
- {
+ public void setVariable(String name, Object value) {
+ if (taskInstance != null) {
taskInstance.setVariable(name, value);
}
- else
- {
+ else {
getContextInstance().setVariable(name, value, token);
}
}
@@ -116,171 +104,143 @@
/**
* get a process variable.
*/
- public Object getVariable(String name)
- {
- if (taskInstance != null)
- {
+ public Object getVariable(String name) {
+ if (taskInstance != null) {
return taskInstance.getVariable(name);
}
- else
- {
+ else {
return getContextInstance().getVariable(name, token);
}
}
/**
- * leave this node over the default transition. This method is only available on node actions. Not on actions that are
- * executed on events. Actions on events cannot change the flow of execution.
+ * leave this node over the default transition. This method is only available on node actions.
+ * Not on actions that are executed on events. Actions on events cannot change the flow of
+ * execution.
*/
- public void leaveNode()
- {
+ public void leaveNode() {
getNode().leave(this);
}
/**
- * leave this node over the given transition. This method is only available on node actions. Not on actions that are
- * executed on events. Actions on events cannot change the flow of execution.
+ * leave this node over the given transition. This method is only available on node actions.
+ * Not on actions that are executed on events. Actions on events cannot change the flow of
+ * execution.
*/
- public void leaveNode(String transitionName)
- {
+ public void leaveNode(String transitionName) {
getNode().leave(this, transitionName);
}
/**
- * leave this node over the given transition. This method is only available on node actions. Not on actions that are
- * executed on events. Actions on events cannot change the flow of execution.
+ * leave this node over the given transition. This method is only available on node actions.
+ * Not on actions that are executed on events. Actions on events cannot change the flow of
+ * execution.
*/
- public void leaveNode(Transition transition)
- {
+ public void leaveNode(Transition transition) {
getNode().leave(this, transition);
}
- public ModuleDefinition getDefinition(Class clazz)
- {
+ public ModuleDefinition getDefinition(Class clazz) {
return getProcessDefinition().getDefinition(clazz);
}
- public ModuleInstance getInstance(Class clazz)
- {
+ public ModuleInstance getInstance(Class clazz) {
ProcessInstance processInstance = (token != null ? token.getProcessInstance() : null);
return (processInstance != null ? processInstance.getInstance(clazz) : null);
}
- public ContextInstance getContextInstance()
- {
- return (ContextInstance)getInstance(ContextInstance.class);
+ public ContextInstance getContextInstance() {
+ return (ContextInstance) getInstance(ContextInstance.class);
}
- public TaskMgmtInstance getTaskMgmtInstance()
- {
- return (TaskMgmtInstance)getInstance(TaskMgmtInstance.class);
+ public TaskMgmtInstance getTaskMgmtInstance() {
+ return (TaskMgmtInstance) getInstance(TaskMgmtInstance.class);
}
- public JbpmContext getJbpmContext()
- {
+ public JbpmContext getJbpmContext() {
return JbpmContext.getCurrentJbpmContext();
}
// getters and setters //////////////////////////////////////////////////////
- public void setTaskInstance(TaskInstance taskInstance)
- {
+ public void setTaskInstance(TaskInstance taskInstance) {
this.taskInstance = taskInstance;
this.task = (taskInstance != null ? taskInstance.getTask() : null);
}
- public Token getToken()
- {
+ public Token getToken() {
return token;
}
- public Action getAction()
- {
+ public Action getAction() {
return action;
}
- public Event getEvent()
- {
+ public Event getEvent() {
return event;
}
- public void setEvent(Event event)
- {
+ public void setEvent(Event event) {
this.event = event;
}
- public Throwable getException()
- {
+ public Throwable getException() {
return exception;
}
- public void setException(Throwable exception)
- {
+ public void setException(Throwable exception) {
this.exception = exception;
}
- public Transition getTransition()
- {
+ public Transition getTransition() {
return transition;
}
- public void setTransition(Transition transition)
- {
+ public void setTransition(Transition transition) {
this.transition = transition;
}
- public Node getTransitionSource()
- {
+ public Node getTransitionSource() {
return transitionSource;
}
- public void setTransitionSource(Node transitionSource)
- {
+ public void setTransitionSource(Node transitionSource) {
this.transitionSource = transitionSource;
}
- public GraphElement getEventSource()
- {
+ public GraphElement getEventSource() {
return eventSource;
}
- public void setEventSource(GraphElement eventSource)
- {
+ public void setEventSource(GraphElement eventSource) {
this.eventSource = eventSource;
}
- public Task getTask()
- {
+ public Task getTask() {
return task;
}
- public void setTask(Task task)
- {
+ public void setTask(Task task) {
this.task = task;
}
- public TaskInstance getTaskInstance()
- {
+ public TaskInstance getTaskInstance() {
return taskInstance;
}
- public ProcessInstance getSubProcessInstance()
- {
+ public ProcessInstance getSubProcessInstance() {
return subProcessInstance;
}
- public void setSubProcessInstance(ProcessInstance subProcessInstance)
- {
+ public void setSubProcessInstance(ProcessInstance subProcessInstance) {
this.subProcessInstance = subProcessInstance;
}
- public Timer getTimer()
- {
+ public Timer getTimer() {
return timer;
}
- public void setTimer(Timer timer)
- {
+ public void setTimer(Timer timer) {
this.timer = timer;
}
@@ -288,37 +248,31 @@
static ThreadLocal threadLocalContextStack = new ThreadLocal();
- static Stack getContextStack()
- {
- Stack stack = (Stack)threadLocalContextStack.get();
- if (stack == null)
- {
+ static Stack getContextStack() {
+ Stack stack = (Stack) threadLocalContextStack.get();
+ if (stack == null) {
stack = new Stack();
threadLocalContextStack.set(stack);
}
return stack;
}
- public static void pushCurrentContext(ExecutionContext executionContext)
- {
+ public static void pushCurrentContext(ExecutionContext executionContext) {
getContextStack().push(executionContext);
}
- public static void popCurrentContext(ExecutionContext executionContext)
- {
- if (getContextStack().pop() != executionContext)
- {
- throw new JbpmException("current execution context mismatch. make sure that every pushed context gets popped");
+ public static void popCurrentContext(ExecutionContext executionContext) {
+ if (getContextStack().pop() != executionContext) {
+ throw new JbpmException(
+ "current execution context mismatch. make sure that every pushed context gets popped");
}
}
- public static ExecutionContext currentExecutionContext()
- {
+ public static ExecutionContext currentExecutionContext() {
ExecutionContext executionContext = null;
Stack stack = getContextStack();
- if (!stack.isEmpty())
- {
- executionContext = (ExecutionContext)stack.peek();
+ if (!stack.isEmpty()) {
+ executionContext = (ExecutionContext) stack.peek();
}
return executionContext;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -50,7 +50,6 @@
import org.jbpm.svc.Services;
import org.jbpm.taskmgmt.exe.TaskMgmtInstance;
import org.jbpm.util.Clock;
-import org.jbpm.util.EqualsUtil;
/**
* is one execution of a {@link org.jbpm.graph.def.ProcessDefinition}. To create a new process
@@ -82,9 +81,10 @@
/**
* creates a new process instance for the given process definition, puts the root-token (=main
- * path of execution) in the start state and executes the initial node. In case the initial node
- * is a start-state, it will behave as a wait state. For each of the optional module definitions
- * contained in the {@link ProcessDefinition}, the corresponding module instance will be created.
+ * path of execution) in the start state and executes the initial node. In case the initial
+ * node is a start-state, it will behave as a wait state. For each of the optional module
+ * definitions contained in the {@link ProcessDefinition}, the corresponding module instance
+ * will be created.
*
* @throws JbpmException if processDefinition is null.
*/
@@ -94,13 +94,14 @@
/**
* creates a new process instance for the given process definition, puts the root-token (=main
- * path of execution) in the start state and executes the initial node. In case the initial node
- * is a start-state, it will behave as a wait state. For each of the optional module definitions
- * contained in the {@link ProcessDefinition}, the corresponding module instance will be created.
+ * path of execution) in the start state and executes the initial node. In case the initial
+ * node is a start-state, it will behave as a wait state. For each of the optional module
+ * definitions contained in the {@link ProcessDefinition}, the corresponding module instance
+ * will be created.
*
- * @param variables will be inserted into the context variables after the context submodule has
- * been created and before the process-start event is fired, which is also before the
- * execution of the initial node.
+ * @param variables will be inserted into the context variables after the context submodule
+ * has been created and before the process-start event is fired, which is also before
+ * the execution of the initial node.
* @throws JbpmException if processDefinition is null.
*/
public ProcessInstance(ProcessDefinition processDefinition, Map variables) {
@@ -109,13 +110,14 @@
/**
* creates a new process instance for the given process definition, puts the root-token (=main
- * path of execution) in the start state and executes the initial node. In case the initial node
- * is a start-state, it will behave as a wait state. For each of the optional module definitions
- * contained in the {@link ProcessDefinition}, the corresponding module instance will be created.
+ * path of execution) in the start state and executes the initial node. In case the initial
+ * node is a start-state, it will behave as a wait state. For each of the optional module
+ * definitions contained in the {@link ProcessDefinition}, the corresponding module instance
+ * will be created.
*
- * @param variables will be inserted into the context variables after the context submodule has
- * been created and before the process-start event is fired, which is also before the
- * execution of the initial node.
+ * @param variables will be inserted into the context variables after the context submodule
+ * has been created and before the process-start event is fired, which is also before
+ * the execution of the initial node.
* @throws JbpmException if processDefinition is null.
*/
public ProcessInstance(ProcessDefinition processDefinition, Map variables, String key) {
@@ -187,7 +189,8 @@
*/
public ModuleInstance addInstance(ModuleInstance moduleInstance) {
if (moduleInstance == null) {
- throw new IllegalArgumentException("can't add a null moduleInstance to a process instance");
+ throw new IllegalArgumentException(
+ "can't add a null moduleInstance to a process instance");
}
if (instances == null) instances = new HashMap();
instances.put(moduleInstance.getClass().getName(), moduleInstance);
@@ -205,7 +208,8 @@
"can't remove a null moduleInstance from a process instance");
}
if (instances != null) {
- removedModuleInstance = (ModuleInstance) instances.remove(moduleInstance.getClass().getName());
+ removedModuleInstance = (ModuleInstance) instances.remove(moduleInstance.getClass()
+ .getName());
if (removedModuleInstance != null) {
moduleInstance.setProcessInstance(null);
}
@@ -235,8 +239,7 @@
}
catch (Exception e) {
- throw new JbpmException("couldn't instantiate transient module '"
- + clazz.getName()
+ throw new JbpmException("couldn't instantiate transient module '" + clazz.getName()
+ "' with the default constructor");
}
transientInstances.put(clazz.getName(), moduleInstance);
@@ -261,8 +264,9 @@
}
/**
- * process instance extension for logging. Probably you don't need to access the logging instance
- * directly. Mostly, {@link Token#addLog(ProcessLog)} is sufficient and more convenient.
+ * process instance extension for logging. Probably you don't need to access the logging
+ * instance directly. Mostly, {@link Token#addLog(ProcessLog)} is sufficient and more
+ * convenient.
*/
public LoggingInstance getLoggingInstance() {
return (LoggingInstance) getInstance(LoggingInstance.class);
@@ -336,7 +340,7 @@
superProcessToken.signal(superExecutionContext);
}
- // make sure jobs for this process instance are canceled
+ // make sure jobs for this process instance are canceled
// after the process end updates are posted to the database
JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext();
if (jbpmContext != null) {
@@ -355,8 +359,8 @@
}
/**
- * suspends this execution. This will make sure that tasks, timers and messages related to this
- * process instance will not show up in database queries.
+ * suspends this execution. This will make sure that tasks, timers and messages related to
+ * this process instance will not show up in database queries.
*
* @see #resume()
*/
@@ -366,9 +370,10 @@
}
/**
- * resumes a suspended execution. All timers that have been suspended might fire if the duedate
- * has been passed. If an admin resumes a process instance, the option should be offered to
- * update, remove and create the timers and messages related to this process instance.
+ * resumes a suspended execution. All timers that have been suspended might fire if the
+ * duedate has been passed. If an admin resumes a process instance, the option should be
+ * offered to update, remove and create the timers and messages related to this process
+ * instance.
*
* @see #suspend()
*/
@@ -471,12 +476,25 @@
}
// equals ///////////////////////////////////////////////////////////////////
- // hack to support comparing hibernate proxies against the real objects
- // since this always falls back to ==, we don't need to overwrite the hashcode
+
public boolean equals(Object o) {
- return EqualsUtil.equals(this, o);
+ if (o == this) return true;
+ if (!(o instanceof ProcessInstance)) return false;
+
+ ProcessInstance other = (ProcessInstance) o;
+ return id != 0 ? id == other.getId() : (key != null ? key.equals(other.getKey())
+ : other.getKey() == null)
+ && processDefinition.equals(other.getProcessDefinition());
}
+ public int hashCode() {
+ if (id != 0) return (int) (id ^ (id >>> 32));
+
+ int result = 295436291 + (key != null ? key.hashCode() : 0);
+ result = 1367411281 * result + processDefinition.hashCode();
+ return result;
+ }
+
public String toString() {
return "ProcessInstance"
+ (key != null ? '(' + key + ')' : id != 0 ? "(" + id + ')'
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -52,39 +52,37 @@
import org.jbpm.svc.Services;
import org.jbpm.taskmgmt.exe.TaskMgmtInstance;
import org.jbpm.util.Clock;
-import org.jbpm.util.EqualsUtil;
/**
* represents one path of execution and maintains a pointer to a node in the
- * {@link org.jbpm.graph.def.ProcessDefinition}. Most common way to get a hold of the token objects
- * is with {@link ProcessInstance#getRootToken()} or
+ * {@link org.jbpm.graph.def.ProcessDefinition}. Most common way to get a hold of the token
+ * objects is with {@link ProcessInstance#getRootToken()} or
* {@link org.jbpm.graph.exe.ProcessInstance#findToken(String)}.
*/
public class Token implements Identifiable, Serializable {
private static final long serialVersionUID = 1L;
- long id = 0;
- int version = 0;
- protected String name = null;
- protected Date start = null;
- protected Date end = null;
- protected Node node = null;
- protected Date nodeEnter = null;
- protected ProcessInstance processInstance = null;
- protected Token parent = null;
- protected Map children = null;
- protected List comments = null;
- protected ProcessInstance subProcessInstance = null;
- protected int nextLogIndex = 0;
+ long id;
+ int version;
+ protected String name;
+ protected Date start;
+ protected Date end;
+ protected Node node;
+ protected Date nodeEnter;
+ protected ProcessInstance processInstance;
+ protected Token parent;
+ protected Map children;
+ protected List comments;
+ protected ProcessInstance subProcessInstance;
+ protected int nextLogIndex;
boolean isAbleToReactivateParent = true;
- boolean isTerminationImplicit = false;
- boolean isSuspended = false;
- String lock = null;
+ boolean isTerminationImplicit;
+ boolean isSuspended;
+ String lock;
// constructors
- // ////////////////////
- ///////////////////////////////////////////////////////
+ // /////////////////////////////////////////////////////
public Token() {
}
@@ -98,8 +96,8 @@
this.node = processInstance.getProcessDefinition().getStartState();
this.isTerminationImplicit = processInstance.getProcessDefinition().isTerminationImplicit();
- // optimization: assigning an id is not necessary since the process instance will be saved shortly.
- // Services.assignId(this);
+ // assign an id to this token before events get fired
+ Services.assignId(this);
}
/**
@@ -130,33 +128,30 @@
}
/**
- * provides a signal to the token. this method activates this token and leaves the current state
- * over the default transition.
+ * provides a signal to the token. this method activates this token and leaves the current
+ * state over the default transition.
*/
public void signal() {
if (node == null) {
- throw new JbpmException("token '"
- + this
+ throw new JbpmException("token '" + this
+ "' can't be signalled cause it is currently not positioned in a node");
}
if (node.getDefaultLeavingTransition() == null) {
- throw new JbpmException("couldn't signal "
- + this
- + " : node "
- + node
+ throw new JbpmException("couldn't signal " + this + " : node " + node
+ " has no default transition");
}
signal(node.getDefaultLeavingTransition(), new ExecutionContext(this));
}
/**
- * Provides a signal to the token. This leave the current state over the given transition name.
+ * Provides a signal to the token. This leave the current state over the given transition
+ * name.
*/
public void signal(String transitionName) {
- if (node == null)
- throw new JbpmException("token '"
- + this
+ if (node == null) {
+ throw new JbpmException("token '" + this
+ "' can't be signalled cause it is currently not positioned in a node");
+ }
Transition leavingTransition = node.getLeavingTransition(transitionName);
@@ -178,7 +173,8 @@
}
/**
- * provides a signal to the token. this leave the current state over the given transition name.
+ * provides a signal to the token. this leave the current state over the given transition
+ * name.
*/
public void signal(Transition transition) {
signal(transition, new ExecutionContext(this));
@@ -204,10 +200,7 @@
throw new JbpmException("this token is locked by " + lock);
}
if (hasEnded()) {
- throw new JbpmException("Token '"
- + name
- + "' ("
- + id
+ throw new JbpmException("Token '" + name + "' (" + id
+ ") is already ended and cannot be signaled");
}
@@ -245,8 +238,8 @@
}
/**
- * adds available transitions of that node to the Set and after that calls itself recursivly for
- * the SuperSate of the Node if it has a super state
+ * adds available transitions of that node to the Set and after that calls itself recursivly
+ * for the SuperSate of the Node if it has a super state
*/
private void addAvailableTransitionsOfNode(Node currentNode, Set availableTransitions) {
List leavingTransitions = currentNode.getLeavingTransitions();
@@ -256,8 +249,8 @@
Transition transition = (Transition) iter.next();
String conditionExpression = transition.getCondition();
if (conditionExpression != null) {
- Object result = JbpmExpressionEvaluator.evaluate(conditionExpression,
- new ExecutionContext(this));
+ Object result = JbpmExpressionEvaluator.evaluate(conditionExpression, new ExecutionContext(
+ this));
if ((result instanceof Boolean) && (((Boolean) result).booleanValue())) {
availableTransitions.add(transition);
}
@@ -273,9 +266,9 @@
}
/**
- * ends this token and all of its children (if any). this is the last active (=not-ended) child of
- * a parent token, the parent token will be ended as well and that verification will continue to
- * propagate.
+ * ends this token and all of its children (if any). this is the last active (=not-ended)
+ * child of a parent token, the parent token will be ended as well and that verification will
+ * continue to propagate.
*/
public void end() {
end(true);
@@ -284,10 +277,10 @@
/**
* ends this token with optional parent ending verification.
*
- * @param verifyParentTermination specifies if the parent token should be checked for termination.
- * if verifyParentTermination is set to true and this is the last non-ended child of a
- * parent token, the parent token will be ended as well and the verification will
- * continue to propagate.
+ * @param verifyParentTermination specifies if the parent token should be checked for
+ * termination. if verifyParentTermination is set to true and this is the last
+ * non-ended child of a parent token, the parent token will be ended as well and the
+ * verification will continue to propagate.
*/
public void end(boolean verifyParentTermination) {
// if not already ended
@@ -315,7 +308,7 @@
subProcessInstance.end();
}
- // only log the end of child-tokens. the process instance logs replace the root token logs.
+ // only log child-token ends. process instance logs replace root token logs.
if (parent != null) {
// add a log
parent.addLog(new TokenEndLog(this));
@@ -402,8 +395,8 @@
}
/**
- * convenience method for starting a composite log. When you add composite logs, make sure you put
- * the {@link #endCompositeLog()} in a finally block.
+ * convenience method for starting a composite log. When you add composite logs, make sure you
+ * put the {@link #endCompositeLog()} in a finally block.
*/
public void startCompositeLog(CompositeLog compositeLog) {
LoggingInstance li = (LoggingInstance) processInstance.getInstance(LoggingInstance.class);
@@ -425,10 +418,6 @@
// various information extraction methods ///////////////////////////////////
- public String toString() {
- return "Token(" + getFullName() + ')';
- }
-
public boolean hasEnded() {
return (end != null);
}
@@ -645,12 +634,31 @@
}
// equals ///////////////////////////////////////////////////////////////////
- // hack to support comparing hibernate proxies against the real objects
- // since this always falls back to ==, we don't need to overwrite the hashcode
+
public boolean equals(Object o) {
- return EqualsUtil.equals(this, o);
+ if (o == this) return true;
+ if (!(o instanceof Token)) return false;
+
+ Token other = (Token) o;
+ return id != 0 ? id == other.getId() : (name != null ? name.equals(other.getName())
+ : other.getName() == null)
+ && (parent != null ? parent.equals(other.getParent())
+ : processInstance.equals(other.getProcessInstance()));
}
+ public int hashCode() {
+ if (id != 0) return (int) (id ^ (id >>> 32));
+
+ int result = 2080763213 + (name != null ? name.hashCode() : 0);
+ result = 1076685199 * result
+ + (parent != null ? parent.hashCode() : processInstance.hashCode());
+ return result;
+ }
+
+ public String toString() {
+ return "Token(" + getFullName() + ')';
+ }
+
public ProcessInstance createSubProcessInstance(ProcessDefinition subProcessDefinition) {
// create the new sub process instance
subProcessInstance = new ProcessInstance(subProcessDefinition);
@@ -663,9 +671,9 @@
}
/**
- * locks a process instance for further execution. A locked token cannot continue execution. This
- * is a non-persistent operation. This is used to prevent tokens being propagated during the
- * execution of actions.
+ * locks a process instance for further execution. A locked token cannot continue execution.
+ * This is a non-persistent operation. This is used to prevent tokens being propagated during
+ * the execution of actions.
*
* @see #unlock(String)
*/
@@ -674,13 +682,8 @@
throw new JbpmException("can't lock with null value for the lockOwnerId");
}
if ((lock != null) && (!lock.equals(lockOwnerId))) {
- throw new JbpmException("token '"
- + id
- + "' can't be locked by '"
- + lockOwnerId
- + "' cause it's already locked by '"
- + lock
- + "'");
+ throw new JbpmException(this + " cannot be locked by '" + lockOwnerId
+ + "' because it is already locked by '" + lock + "'");
}
log.debug("token[" + id + "] is locked by " + lockOwnerId);
lock = lockOwnerId;
@@ -691,29 +694,21 @@
*/
public void unlock(String lockOwnerId) {
if (lock == null) {
- log.warn("lock owner '"
- + lockOwnerId
- + "' tries to unlock token '"
- + id
+ log.warn("lock owner '" + lockOwnerId + "' tries to unlock token '" + id
+ "' which is not locked");
}
else if (!lock.equals(lockOwnerId)) {
- throw new JbpmException("'"
- + lockOwnerId
- + "' can't unlock token '"
- + id
- + "' because it was already locked by '"
- + lock
- + "'");
+ throw new JbpmException("'" + lockOwnerId + "' can't unlock token '" + id
+ + "' because it was already locked by '" + lock + "'");
}
log.debug("token[" + id + "] is unlocked by " + lockOwnerId);
lock = null;
}
/**
- * force unlocking the token, even if the owner is not known. In some use cases (e.g. in the jbpm
- * esb integration) the lock is persistent, so a state can be reached where the client needs a
- * possibility to force unlock of a token without knowing the owner. See
+ * force unlocking the token, even if the owner is not known. In some use cases (e.g. in the
+ * jbpm esb integration) the lock is persistent, so a state can be reached where the client
+ * needs a possibility to force unlock of a token without knowing the owner. See
* https://jira.jboss.org/jira/browse/JBPM-1888
*/
public void foreUnlock() {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -43,7 +43,6 @@
*/
public class Decision extends Node implements Parsable {
- static final String NEWLINE = System.getProperty("line.separator");
static final String DECISION_CONDITION_RESULT = "decision_condition_result";
static final long serialVersionUID = 1L;
@@ -63,7 +62,6 @@
}
public void read(Element decisionElement, JpdlXmlReader jpdlReader) {
-
String expression = decisionElement.attributeValue("expression");
Element decisionHandlerElement = decisionElement.element("handler");
@@ -166,7 +164,6 @@
catch (Exception exception) {
raiseException(exception, executionContext);
}
-
}
finally {
Thread.currentThread().setContextClassLoader(surroundingClassLoader);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/ProcessFactory.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/ProcessFactory.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/ProcessFactory.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -44,6 +44,7 @@
Node from = pd.getNode( parsedTransition[0] );
Node to = pd.getNode( parsedTransition[2] );
Transition t = new Transition( parsedTransition[1] );
+ t.setProcessDefinition(pd);
from.addLeavingTransition(t);
to.addArrivingTransition(t);
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/TaskNode.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/TaskNode.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/TaskNode.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -168,8 +168,8 @@
public void addTask(Task task) {
if (tasks == null) tasks = new HashSet();
+ task.setTaskNode(this);
tasks.add(task);
- task.setTaskNode(this);
}
// node behaviour methods
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/Task.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/Task.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/Task.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -32,42 +32,48 @@
* defines a task and how the actor must be calculated at runtime.
*/
public class Task extends GraphElement {
-
+
private static final long serialVersionUID = 1L;
-
+
public static final int PRIORITY_HIGHEST = 1;
public static final int PRIORITY_HIGH = 2;
public static final int PRIORITY_NORMAL = 3;
public static final int PRIORITY_LOW = 4;
public static final int PRIORITY_LOWEST = 5;
-
+
public static int parsePriority(String priorityText) {
- if ("highest".equalsIgnoreCase(priorityText)) return PRIORITY_HIGHEST;
- else if ("high".equalsIgnoreCase(priorityText)) return PRIORITY_HIGH;
- else if ("normal".equalsIgnoreCase(priorityText)) return PRIORITY_NORMAL;
- else if ("low".equalsIgnoreCase(priorityText)) return PRIORITY_LOW;
+ if ("highest".equalsIgnoreCase(priorityText))
+ return PRIORITY_HIGHEST;
+ else if ("high".equalsIgnoreCase(priorityText))
+ return PRIORITY_HIGH;
+ else if ("normal".equalsIgnoreCase(priorityText))
+ return PRIORITY_NORMAL;
+ else if ("low".equalsIgnoreCase(priorityText))
+ return PRIORITY_LOW;
else if ("lowest".equalsIgnoreCase(priorityText)) return PRIORITY_LOWEST;
try {
return Integer.parseInt(priorityText);
- } catch (NumberFormatException e) {
- throw new JbpmException("priority '"+priorityText+"' could not be parsed as a priority");
}
+ catch (NumberFormatException e) {
+ throw new JbpmException("'" + priorityText
+ + "' could not be parsed as a priority");
+ }
}
- protected boolean isBlocking = false;
+ protected boolean isBlocking;
protected boolean isSignalling = true;
- protected String condition = null;
- protected String dueDate = null;
+ protected String condition;
+ protected String dueDate;
protected int priority = PRIORITY_NORMAL;
- protected TaskNode taskNode = null;
- protected StartState startState = null;
- protected TaskMgmtDefinition taskMgmtDefinition = null;
- protected Swimlane swimlane = null;
- protected String actorIdExpression = null;
- protected String pooledActorsExpression = null;
- protected Delegation assignmentDelegation = null;
- protected TaskController taskController = null;
-
+ protected TaskNode taskNode;
+ protected StartState startState;
+ protected TaskMgmtDefinition taskMgmtDefinition;
+ protected Swimlane swimlane;
+ protected String actorIdExpression;
+ protected String pooledActorsExpression;
+ protected Delegation assignmentDelegation;
+ protected TaskController taskController;
+
public Task() {
}
@@ -77,7 +83,7 @@
// event types //////////////////////////////////////////////////////////////
- static final String[] supportedEventTypes = new String[]{
+ static final String[] supportedEventTypes = {
Event.EVENTTYPE_TASK_CREATE,
Event.EVENTTYPE_TASK_ASSIGN,
Event.EVENTTYPE_TASK_START,
@@ -88,26 +94,26 @@
}
// task instance factory methods ////////////////////////////////////////////
-
+
/**
- * sets the taskNode unidirectionally. use {@link TaskNode#addTask(Task)} to create
- * a bidirectional relation.
+ * sets the taskNode unidirectionally. use {@link TaskNode#addTask(Task)} to create a
+ * bidirectional relation.
*/
public void setTaskNode(TaskNode taskNode) {
this.taskNode = taskNode;
}
-
+
/**
- * sets the taskMgmtDefinition unidirectionally. use TaskMgmtDefinition.addTask to create
- * a bidirectional relation.
+ * sets the taskMgmtDefinition unidirectionally. use TaskMgmtDefinition.addTask to create a
+ * bidirectional relation.
*/
public void setTaskMgmtDefinition(TaskMgmtDefinition taskMgmtDefinition) {
this.taskMgmtDefinition = taskMgmtDefinition;
}
/**
- * sets the swimlane. Since a task can have max one of swimlane or assignmentHandler,
- * this method removes the swimlane if it is set.
+ * sets the swimlane. Since a task can have max one of swimlane or assignmentHandler, this
+ * method removes the swimlane if it is set.
*/
public void setAssignmentDelegation(Delegation assignmentDelegation) {
this.actorIdExpression = null;
@@ -115,35 +121,37 @@
this.assignmentDelegation = assignmentDelegation;
this.swimlane = null;
}
+
/**
- * sets the actorId expression. The assignmentExpression is a JSF-like
- * expression to perform assignment. Since a task can have max one of swimlane or
- * assignmentHandler, this method removes the swimlane and assignmentDelegation if
- * it is set.
+ * sets the actorId expression. The assignmentExpression is a JSF-like expression to perform
+ * assignment. Since a task can have max one of swimlane or assignmentHandler, this method
+ * removes the swimlane and assignmentDelegation if it is set.
*/
public void setActorIdExpression(String actorIdExpression) {
this.actorIdExpression = actorIdExpression;
- // Note: combination of actorIdExpression and pooledActorsExpression is allowed
+ // Note: combination of actorIdExpression and pooledActorsExpression is allowed
// this.pooledActorsExpression = null;
this.assignmentDelegation = null;
this.swimlane = null;
}
+
/**
- * sets the actorId expression. The assignmentExpression is a JSF-like
- * expression to perform assignment. Since a task can have max one of swimlane or
- * assignmentHandler, this method removes the other forms of assignment.
+ * sets the actorId expression. The assignmentExpression is a JSF-like expression to perform
+ * assignment. Since a task can have max one of swimlane or assignmentHandler, this method
+ * removes the other forms of assignment.
*/
public void setPooledActorsExpression(String pooledActorsExpression) {
- // Note: combination of actorIdExpression and pooledActorsExpression is allowed
+ // Note: combination of actorIdExpression and pooledActorsExpression is allowed
// this.actorIdExpression = null;
this.pooledActorsExpression = pooledActorsExpression;
this.assignmentDelegation = null;
this.swimlane = null;
}
+
/**
- * sets the swimlane unidirectionally. Since a task can have max one of swimlane or assignmentHandler,
- * this method removes the assignmentHandler and assignmentExpression if one of those isset. To create
- * a bidirectional relation, use {@link Swimlane#addTask(Task)}.
+ * sets the swimlane unidirectionally. Since a task can have max one of swimlane or
+ * assignmentHandler, this method removes the assignmentHandler and assignmentExpression if
+ * one of those isset. To create a bidirectional relation, use {@link Swimlane#addTask(Task)}.
*/
public void setSwimlane(Swimlane swimlane) {
this.actorIdExpression = null;
@@ -155,74 +163,93 @@
// parent ///////////////////////////////////////////////////////////////////
public GraphElement getParent() {
- if (taskNode!=null) {
+ if (taskNode != null) {
return taskNode;
- }
- if (startState!=null) {
+ }
+ if (startState != null) {
return startState;
- }
+ }
return processDefinition;
}
-
+
// getters and setters //////////////////////////////////////////////////////
-
+
public TaskMgmtDefinition getTaskMgmtDefinition() {
return taskMgmtDefinition;
}
+
public Swimlane getSwimlane() {
return swimlane;
}
+
public boolean isBlocking() {
return isBlocking;
}
+
public void setBlocking(boolean isBlocking) {
this.isBlocking = isBlocking;
}
+
public TaskNode getTaskNode() {
return taskNode;
}
+
public String getActorIdExpression() {
return actorIdExpression;
}
+
public String getPooledActorsExpression() {
return pooledActorsExpression;
}
+
public Delegation getAssignmentDelegation() {
return assignmentDelegation;
}
+
public String getDueDate() {
return dueDate;
}
+
public void setDueDate(String duedate) {
this.dueDate = duedate;
}
+
public TaskController getTaskController() {
return taskController;
}
+
public void setTaskController(TaskController taskController) {
this.taskController = taskController;
}
+
public int getPriority() {
return priority;
}
+
public void setPriority(int priority) {
this.priority = priority;
}
+
public StartState getStartState() {
return startState;
}
+
public void setStartState(StartState startState) {
this.startState = startState;
}
+
public boolean isSignalling() {
return isSignalling;
}
+
public void setSignalling(boolean isSignalling) {
this.isSignalling = isSignalling;
}
+
public String getCondition() {
return condition;
}
+
public void setCondition(String condition) {
this.condition = condition;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskMgmtDefinition.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskMgmtDefinition.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskMgmtDefinition.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -68,8 +68,8 @@
public void addTask( Task task ) {
if (tasks==null) tasks = new HashMap();
+ task.setTaskMgmtDefinition(this);
tasks.put(task.getName(), task);
- task.setTaskMgmtDefinition(this);
}
public Map getTasks() {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -53,37 +53,38 @@
import org.jbpm.util.EqualsUtil;
/**
- * is one task instance that can be assigned to an actor (read: put in someones task list) and that
- * can trigger the coninuation of execution of the token upon completion.
+ * is one task instance that can be assigned to an actor (read: put in someone's task list) and
+ * that can trigger the continuation of execution of the token upon completion.
*/
public class TaskInstance extends VariableContainer implements Identifiable, Assignable {
private static final long serialVersionUID = 1L;
- long id = 0;
- int version = 0;
- protected String name = null;
- protected String description = null;
- protected String actorId = null;
- protected Date create = null;
- protected Date start = null;
- protected Date end = null;
- protected Date dueDate = null;
+ long id;
+ int version;
+ protected String name;
+ protected String description;
+ protected String actorId;
+ protected Date create;
+ protected Date start;
+ protected Date end;
+ protected Date dueDate;
protected int priority = Task.PRIORITY_NORMAL;
- protected boolean isCancelled = false;
- protected boolean isSuspended = false;
+ protected boolean isCancelled;
+ protected boolean isSuspended;
protected boolean isOpen = true;
protected boolean isSignalling = true;
- protected boolean isBlocking = false;
- protected Task task = null;
- protected Token token = null;
- protected SwimlaneInstance swimlaneInstance = null;
- protected TaskMgmtInstance taskMgmtInstance = null;
- protected ProcessInstance processInstance = null;
- protected Set pooledActors = null;
- protected List comments = null;
+ protected boolean isBlocking;
+ protected Task task;
+ protected Token token;
+ protected SwimlaneInstance swimlaneInstance;
+ protected TaskMgmtInstance taskMgmtInstance;
+ protected ProcessInstance processInstance;
+ protected Set pooledActors;
+ protected List comments;
- protected String previousActorId = null; // not persisted. just extra information for listeners of the assign-event
+ // not persisted. just extra information for listeners of the task-assign event
+ protected String previousActorId;
public TaskInstance() {
}
@@ -112,24 +113,19 @@
if (taskController != null) {
// the task controller is responsible for copying variables back into the process
taskController.submitParameters(this);
-
- // if there is no task controller
}
- else if ((token != null) && (token.getProcessInstance() != null)) {
+ // if there is no task controller
+ else if (token != null && token.getProcessInstance() != null) {
// the default behaviour is that all task-local variables are flushed to the process
if (variableInstances != null) {
ContextInstance contextInstance = token.getProcessInstance().getContextInstance();
Iterator iter = variableInstances.values().iterator();
while (iter.hasNext()) {
VariableInstance variableInstance = (VariableInstance) iter.next();
- log.debug("flushing variable '"
- + variableInstance.getName()
- + "' from task '"
- + name
+ log.debug("flushing variable '" + variableInstance.getName() + "' from task '" + name
+ "' to process variables");
- // This might be optimized, but this was the simplest way to make a clone of the variable instance.
- contextInstance.setVariable(variableInstance.getName(), variableInstance.getValue(),
- token);
+ // this was the simplest way to clone the variable instance; might be optimized
+ contextInstance.setVariable(variableInstance.getName(), variableInstance.getValue(), token);
}
}
}
@@ -160,8 +156,8 @@
task.fireEvent(Event.EVENTTYPE_TASK_CREATE, executionContext);
}
- // WARNING: The events create and assign are fired in the right order, but
- // the logs are still not ordered properly.
+ // WARNING: The events create and assign are fired in the right order,
+ // yet the logs are still not ordered properly.
// See also: TaskMgmtInstance.createTaskInstance
}
@@ -171,7 +167,6 @@
Swimlane swimlane = task.getSwimlane();
// if this task is in a swimlane
if (swimlane != null) {
-
// if this is a task assignment for a start-state
if (isStartTaskInstance()) {
// initialize the swimlane
@@ -179,23 +174,17 @@
taskMgmtInstance.addSwimlaneInstance(swimlaneInstance);
// with the current authenticated actor
swimlaneInstance.setActorId(SecurityHelper.getAuthenticatedActorId());
-
}
- else {
-
- // lazy initialize the swimlane...
+ else { // lazily initialize the swimlane...
// get the swimlane instance (if there is any)
- swimlaneInstance = taskMgmtInstance.getInitializedSwimlaneInstance(executionContext,
- swimlane);
+ swimlaneInstance = taskMgmtInstance.getInitializedSwimlaneInstance(executionContext, swimlane);
// copy the swimlaneInstance assignment into the taskInstance assignment
copySwimlaneInstanceAssignment(swimlaneInstance);
}
-
}
else { // this task is not in a swimlane
- taskMgmtInstance.performAssignment(task.getAssignmentDelegation(),
- task.getActorIdExpression(), task.getPooledActorsExpression(), this, executionContext);
+ taskMgmtInstance.performAssignment(task.getAssignmentDelegation(), task.getActorIdExpression(), task.getPooledActorsExpression(), this, executionContext);
}
updatePooledActorsReferences(swimlaneInstance);
@@ -203,9 +192,9 @@
public boolean isStartTaskInstance() {
boolean isStartTaskInstance = false;
- if ((taskMgmtInstance != null) && (taskMgmtInstance.getTaskMgmtDefinition() != null)) {
- isStartTaskInstance = ((task != null) && (task.equals(taskMgmtInstance.getTaskMgmtDefinition()
- .getStartTask())));
+ if (taskMgmtInstance != null && taskMgmtInstance.getTaskMgmtDefinition() != null) {
+ isStartTaskInstance = task != null
+ && task.equals(taskMgmtInstance.getTaskMgmtDefinition().getStartTask());
}
return isStartTaskInstance;
}
@@ -222,8 +211,8 @@
}
/**
- * copies the assignment (that includes both the swimlaneActorId and the set of pooledActors) of
- * the given swimlane into this taskInstance.
+ * copies the assignment (that includes both the swimlaneActorId and the set of pooledActors)
+ * of the given swimlane into this taskInstance.
*/
public void copySwimlaneInstanceAssignment(SwimlaneInstance swimlaneInstance) {
setSwimlaneInstance(swimlaneInstance);
@@ -243,8 +232,8 @@
}
/**
- * (re)assign this task to the given actor. If this task is related to a swimlane instance, that
- * swimlane instance will be updated as well.
+ * (re)assign this task to the given actor. If this task is related to a swimlane instance,
+ * that swimlane instance will be updated as well.
*/
public void setActorId(String actorId) {
setActorId(actorId, true);
@@ -254,8 +243,8 @@
* (re)assign this task to the given actor.
*
* @param actorId is reference to the person that is assigned to this task.
- * @param overwriteSwimlane specifies if the related swimlane should be overwritten with the given
- * swimlaneActorId.
+ * @param overwriteSwimlane specifies if the related swimlane should be overwritten with the
+ * given swimlaneActorId.
*/
public void setActorId(String actorId, boolean overwriteSwimlane) {
// do the actual assignment
@@ -291,7 +280,8 @@
}
/**
- * can optionally be used to indicate that the actor is starting to work on this task instance.
+ * can optionally be used to indicate that the actor is starting to work on this task
+ * instance.
*/
public void start() {
if (start != null) {
@@ -315,7 +305,8 @@
}
/**
- * convenience method that combines a {@link #setActorId(String,boolean)} and a {@link #start()}.
+ * convenience method that combines a {@link #setActorId(String,boolean)} and a
+ * {@link #start()}.
*/
public void start(String actorId, boolean overwriteSwimlane) {
setActorId(actorId, overwriteSwimlane);
@@ -335,8 +326,8 @@
}
/**
- * cancels this task. This task instance will be marked as cancelled and as ended. But cancellation
- * doesn't influence signalling and continuation of process execution.
+ * cancels this task. This task instance will be marked as cancelled and as ended. But
+ * cancellation doesn't influence signalling and continuation of process execution.
*/
public void cancel() {
markAsCancelled();
@@ -364,8 +355,8 @@
}
/**
- * marks this task as done. If this task is related to a task node this might trigger a signal on
- * the token.
+ * marks this task as done. If this task is related to a task node this might trigger a signal
+ * on the token.
*
* @see #end(Transition)
*/
@@ -374,10 +365,11 @@
}
/**
- * marks this task as done and specifies the name of a transition leaving the task-node for the
- * case that the completion of this task instances triggers a signal on the token. If this task
- * leads to a signal on the token, the given transition name will be used in the signal. If this
- * task completion does not trigger execution to move on, the transitionName is ignored.
+ * marks this task as done and specifies the name of a transition leaving the task-node for
+ * the case that the completion of this task instances triggers a signal on the token. If this
+ * task leads to a signal on the token, the given transition name will be used in the signal.
+ * If this task completion does not trigger execution to move on, the transitionName is
+ * ignored.
*/
public void end(String transitionName) {
Transition leavingTransition = null;
@@ -393,15 +385,15 @@
}
}
if (leavingTransition == null) {
- throw new JbpmException("task node does not have leaving transition '" + transitionName + "'");
+ throw new JbpmException("task node does not have leaving transition: " + transitionName);
}
end(leavingTransition);
}
/**
- * marks this task as done and specifies a transition leaving the task-node for the case that the
- * completion of this task instances triggers a signal on the token. If this task leads to a
- * signal on the token, the given transition name will be used in the signal. If this task
+ * marks this task as done and specifies a transition leaving the task-node for the case that
+ * the completion of this task instances triggers a signal on the token. If this task leads to
+ * a signal on the token, the given transition name will be used in the signal. If this task
* completion does not trigger execution to move on, the transition is ignored.
*/
public void end(Transition transition) {
@@ -437,20 +429,17 @@
this.isSignalling = false;
if (this.isStartTaskInstance() // ending start tasks always leads to a signal
- || ((task != null) && (token != null) && (task.getTaskNode() != null) && (task.getTaskNode().completionTriggersSignal(this)))) {
+ || (task != null && token != null && task.getTaskNode() != null && task.getTaskNode()
+ .completionTriggersSignal(this))) {
if (transition == null) {
- log.debug("completion of task '"
- + task.getName()
+ log.debug("completion of task '" + task.getName()
+ "' results in taking the default transition");
token.signal();
}
else {
- log.debug("completion of task '"
- + task.getName()
- + "' results in taking transition '"
- + transition
- + "'");
+ log.debug("completion of task '" + task.getName()
+ + "' results in taking transition '" + transition + "'");
token.signal(transition);
}
}
@@ -510,8 +499,8 @@
}
/**
- * is the list of transitions that can be used in the end method and it is null in case this is
- * not the last task instance.
+ * is the list of transitions that can be used in the end method and it is null in case this
+ * is not the last task instance.
*/
public List getAvailableTransitions() {
List transitions = null;
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/EqualsUtil.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -21,6 +21,8 @@
*/
package org.jbpm.util;
+import org.hibernate.proxy.HibernateProxy;
+
public class EqualsUtil {
private EqualsUtil() {
@@ -28,37 +30,8 @@
}
public static boolean equals(Object thisObject, Object otherObject) {
- if ((thisObject == null) || (otherObject == null)) return false;
-
- if (isProxy(otherObject)) {
- return otherObject.equals(thisObject);
- }
- else {
- return otherObject == thisObject;
- }
+ return thisObject == otherObject || otherObject instanceof HibernateProxy
+ && otherObject.equals(thisObject);
}
- static boolean isInitialized = false;
- static boolean isHibernateInClasspth = true;
- static Class hibernateProxyClass = null;
-
- static boolean isProxy(Object otherObject) {
- boolean isProxy = false;
- if (!isInitialized) initializeHibernateProxyClass();
-
- if (isHibernateInClasspth) {
- return hibernateProxyClass.isAssignableFrom(otherObject.getClass());
- }
- return isProxy;
- }
-
- static synchronized void initializeHibernateProxyClass() {
- try {
- hibernateProxyClass = ClassLoaderUtil.classForName("org.hibernate.proxy.HibernateProxy");
- }
- catch (RuntimeException e) {
- isHibernateInClasspth = false;
- }
- isInitialized = true;
- }
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/ContextInstance.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/ContextInstance.hbm.xml 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/ContextInstance.hbm.xml 2009-08-19 11:34:10 UTC (rev 5492)
@@ -15,7 +15,7 @@
<key column="CONTEXTINSTANCE_" on-delete="cascade" />
-->
<key column="CONTEXTINSTANCE_" />
- <index-many-to-many column="TOKEN_" class="org.jbpm.graph.exe.Token" />
+ <map-key-many-to-many column="TOKEN_" class="org.jbpm.graph.exe.Token"/>
<one-to-many class="org.jbpm.context.exe.TokenVariableMap" />
</map>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/JbpmContextTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/JbpmContextTest.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/JbpmContextTest.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -21,6 +21,7 @@
*/
package org.jbpm;
+import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.logging.LoggingService;
import org.jbpm.logging.log.MessageLog;
@@ -164,16 +165,15 @@
try {
customLoggingService = (CustomLoggingService) jbpmContext.getServices().getLoggingService();
messageLog = new MessageLog("blablabla");
- ProcessInstance processInstance = new ProcessInstance();
+ ProcessInstance processInstance = new ProcessInstance(new ProcessDefinition());
processInstance.getLoggingInstance().addLog(messageLog);
jbpmContext.save(processInstance);
-
}
finally {
jbpmContext.close();
}
assertEquals(messageLog, customLoggingService.processLog);
- assertEquals(1, customLoggingService.invocationCount);
+ assertEquals(2, customLoggingService.invocationCount); // count process instance create log
}
public static class TestSaveOperation implements SaveOperation {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -23,55 +23,64 @@
import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.def.DelegationException;
import org.jbpm.graph.def.ProcessDefinition;
-public class ActionExceptionsTest extends AbstractJbpmTestCase
-{
+public class ActionExceptionsTest extends AbstractJbpmTestCase {
- public static class FailingAction implements ActionHandler
- {
+ public static class FailingAction implements ActionHandler {
private static final long serialVersionUID = 1L;
- public void execute(ExecutionContext context)
- {
+ public void execute(ExecutionContext context) {
throw new IllegalArgumentException();
}
}
- public void testFailingReferenced() throws Exception
- {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='start'>" + " <transition to='state'/>"
- + " </start-state>" + " <state name='state'>" + " <transition to='end'>" + " <action ref-name='failing'/>" + " </transition>" + " </state>"
- + " <end-state name='end'/>" + " <action name='failing' class='org.jbpm.graph.exe.ActionExceptionsTest$FailingAction'/>" + "</process-definition>");
+ public void testFailingReferenced() throws Exception {
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state name='start'>"
+ + " <transition to='state'/>"
+ + " </start-state>"
+ + " <state name='state'>"
+ + " <transition to='end'>"
+ + " <action ref-name='failing'/>"
+ + " </transition>"
+ + " </state>"
+ + " <end-state name='end'/>"
+ + " <action name='failing' class='org.jbpm.graph.exe.ActionExceptionsTest$FailingAction'/>"
+ + "</process-definition>");
ProcessInstance pi = new ProcessInstance(processDefinition);
pi.signal();
- try
- {
+ try {
pi.signal();
}
- catch (RuntimeException e)
- {
+ catch (DelegationException e) {
assertTrue(e.getCause() instanceof IllegalArgumentException);
return;
}
fail("should have throws IllegalArgumentException");
}
- public void testFailingNotReferenced() throws Exception
- {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='start'>" + " <transition to='state'/>"
- + " </start-state>" + " <state name='state'>" + " <transition to='end'>" + " <action class='org.jbpm.graph.exe.ActionExceptionsTest$FailingAction'/>"
- + " </transition>" + " </state>" + " <end-state name='end'/>" + "</process-definition>");
+ public void testFailingNotReferenced() throws Exception {
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state name='start'>"
+ + " <transition to='state'/>"
+ + " </start-state>"
+ + " <state name='state'>"
+ + " <transition to='end'>"
+ + " <action class='org.jbpm.graph.exe.ActionExceptionsTest$FailingAction'/>"
+ + " </transition>"
+ + " </state>"
+ + " <end-state name='end'/>"
+ + "</process-definition>");
ProcessInstance pi = new ProcessInstance(processDefinition);
pi.signal();
- try
- {
+ try {
pi.signal();
}
- catch (RuntimeException e)
- {
+ catch (DelegationException e) {
assertTrue(e.getCause() instanceof IllegalArgumentException);
return;
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -61,7 +61,7 @@
for (int i = 0; i < INSTANCE_COUNT; i++) {
newTransaction();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
- processInstance.getContextInstance().setVariable("theBody", "conkersbadfurday".getBytes());
+ processInstance.getContextInstance().setVariable("theBody", getName().getBytes());
processInstance.signal();
jbpmContext.save(processInstance);
@@ -75,4 +75,5 @@
assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded());
}
}
+
}
Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -0,0 +1,66 @@
+/*
+ * 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.jbpm2489;
+
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * Process loses access to process variables when timer is used inside forked process
+ *
+ * @see <a href="https://jira.jboss.org/jira/browse/JBPM-2489">JBPM-2489</a>
+ * @author Alejandro Guizar
+ */
+public class JBPM2489Test extends AbstractDbTestCase {
+
+ private long processDefinitionId;
+
+ private static final int TIMEOUT = 60 * 1000;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2489/processdefinition.xml");
+ jbpmContext.deployProcessDefinition(processDefinition);
+ processDefinitionId = processDefinition.getId();
+ }
+
+ protected void tearDown() throws Exception {
+ graphSession.deleteProcessDefinition(processDefinitionId);
+
+ super.tearDown();
+ }
+
+ public void testLostAccessToVariableWithTimer() {
+ newTransaction();
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("bpm_orchestration2");
+ processInstance.getContextInstance().setVariable("theBody", getName().getBytes());
+ processInstance.signal();
+ jbpmContext.save(processInstance);
+
+ processJobs(TIMEOUT);
+
+ processInstance = jbpmContext.getProcessInstance(processInstance.getId());
+ assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded());
+ }
+}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessClassLoaderTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessClassLoaderTest.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessClassLoaderTest.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -3,6 +3,7 @@
import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.JbpmException;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
@@ -157,7 +158,7 @@
contextLoadedActionInvocations++;
- throw new Exception("simulate exception");
+ throw new JbpmException("simulate exception");
}
}
@@ -189,7 +190,7 @@
processInstance.signal();
}
- catch (Exception ex) {
+ catch (JbpmException ex) {
assertEquals(1, contextLoadedActionInvocations);
assertEquals("simulate exception", ex.getMessage());
assertSame(testContextClassLoader, Thread.currentThread().getContextClassLoader());
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java 2009-08-19 11:34:10 UTC (rev 5492)
@@ -35,20 +35,19 @@
public class TaskInstanceEndTest extends AbstractJbpmTestCase {
public void testStartTaskInstanceStressed() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <task name='get it going' />" +
- " <transition name='stressed' to='calm down' />" +
- " <transition name='relaxed' to='first things first' />" +
- " </start-state>" +
- " <state name='calm down' />" +
- " <state name='first things first' />" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <task name='get it going' />"
+ + " <transition name='stressed' to='calm down' />"
+ + " <transition name='relaxed' to='first things first' />"
+ + " </start-state>"
+ + " <state name='calm down' />"
+ + " <state name='first things first' />"
+ + "</process-definition>");
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
- TaskInstance startTaskInstance = processInstance.getTaskMgmtInstance().createStartTaskInstance();
+ TaskInstance startTaskInstance = processInstance.getTaskMgmtInstance()
+ .createStartTaskInstance();
startTaskInstance.end("stressed");
Node calmDown = processDefinition.getNode("calm down");
@@ -56,20 +55,19 @@
}
public void testStartTaskInstanceRelaxed() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <task name='get it going' />" +
- " <transition name='stressed' to='calm down' />" +
- " <transition name='relaxed' to='first things first' />" +
- " </start-state>" +
- " <state name='calm down' />" +
- " <state name='first things first' />" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <task name='get it going' />"
+ + " <transition name='stressed' to='calm down' />"
+ + " <transition name='relaxed' to='first things first' />"
+ + " </start-state>"
+ + " <state name='calm down' />"
+ + " <state name='first things first' />"
+ + "</process-definition>");
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
- TaskInstance startTaskInstance = processInstance.getTaskMgmtInstance().createStartTaskInstance();
+ TaskInstance startTaskInstance = processInstance.getTaskMgmtInstance()
+ .createStartTaskInstance();
startTaskInstance.end("relaxed");
Node ftf = processDefinition.getNode("first things first");
@@ -77,28 +75,27 @@
}
public void testTaskNodeStressed() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get it going' />" +
- " </start-state>" +
- " <task-node name='get it going'>" +
- " <task name='get it going' />" +
- " <transition name='stressed' to='calm down' />" +
- " <transition name='relaxed' to='first things first' />" +
- " </task-node>" +
- " <state name='calm down' />" +
- " <state name='first things first' />" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get it going' />"
+ + " </start-state>"
+ + " <task-node name='get it going'>"
+ + " <task name='get it going' />"
+ + " <transition name='stressed' to='calm down' />"
+ + " <transition name='relaxed' to='first things first' />"
+ + " </task-node>"
+ + " <state name='calm down' />"
+ + " <state name='first things first' />"
+ + "</process-definition>");
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
Token rootToken = processInstance.getRootToken();
processInstance.signal();
- List unfinishedTasks = new ArrayList(processInstance.getTaskMgmtInstance().getUnfinishedTasks(rootToken));
+ List unfinishedTasks = new ArrayList(processInstance.getTaskMgmtInstance()
+ .getUnfinishedTasks(rootToken));
assertNotNull(unfinishedTasks);
assertEquals(1, unfinishedTasks.size());
- TaskInstance startTaskInstance = (TaskInstance) unfinishedTasks.get(0);
+ TaskInstance startTaskInstance = (TaskInstance) unfinishedTasks.get(0);
startTaskInstance.end("stressed");
Node calmDown = processDefinition.getNode("calm down");
@@ -106,28 +103,27 @@
}
public void testTaskNodeRelaxed() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='get it going' />" +
- " </start-state>" +
- " <task-node name='get it going'>" +
- " <task name='get it going' />" +
- " <transition name='stressed' to='calm down' />" +
- " <transition name='relaxed' to='first things first' />" +
- " </task-node>" +
- " <state name='calm down' />" +
- " <state name='first things first' />" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='get it going' />"
+ + " </start-state>"
+ + " <task-node name='get it going'>"
+ + " <task name='get it going' />"
+ + " <transition name='stressed' to='calm down' />"
+ + " <transition name='relaxed' to='first things first' />"
+ + " </task-node>"
+ + " <state name='calm down' />"
+ + " <state name='first things first' />"
+ + "</process-definition>");
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
Token rootToken = processInstance.getRootToken();
processInstance.signal();
- List unfinishedTasks = new ArrayList(processInstance.getTaskMgmtInstance().getUnfinishedTasks(rootToken));
+ List unfinishedTasks = new ArrayList(processInstance.getTaskMgmtInstance()
+ .getUnfinishedTasks(rootToken));
assertNotNull(unfinishedTasks);
assertEquals(1, unfinishedTasks.size());
- TaskInstance startTaskInstance = (TaskInstance) unfinishedTasks.get(0);
+ TaskInstance startTaskInstance = (TaskInstance) unfinishedTasks.get(0);
startTaskInstance.end("relaxed");
Node ftf = processDefinition.getNode("first things first");
@@ -135,31 +131,29 @@
}
public void testLastTaskNotSignalling() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='review' />" +
- " </start-state>" +
- " <task-node name='review'>" +
- " <task name='primary review' />" +
- " <task name='required secondary review' />" +
- " <task name='optional secondary review' signalling='false' />" +
- " <transition to='next phase' />" +
- " </task-node>" +
- " <state name='next phase' />" +
- "</process-definition>"
- );
-
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='review' />"
+ + " </start-state>"
+ + " <task-node name='review'>"
+ + " <task name='primary review' />"
+ + " <task name='required secondary review' />"
+ + " <task name='optional secondary review' signalling='false' />"
+ + " <transition to='next phase' />"
+ + " </task-node>"
+ + " <state name='next phase' />" + "</process-definition>");
+
ProcessInstance processInstance = new ProcessInstance(processDefinition);
Token rootToken = processInstance.getRootToken();
processInstance.signal();
assertEquals("review", rootToken.getNode().getName());
-
- Collection unfinishedTasks = processInstance.getTaskMgmtInstance().getUnfinishedTasks(rootToken);
+
+ Collection unfinishedTasks = processInstance.getTaskMgmtInstance()
+ .getUnfinishedTasks(rootToken);
assertNotNull(unfinishedTasks);
assertEquals(3, unfinishedTasks.size());
- TaskInstance taskInstance = findTaskInstance("primary review", unfinishedTasks);
+ TaskInstance taskInstance = findTaskInstance("primary review", unfinishedTasks);
taskInstance.end();
assertEquals("review", rootToken.getNode().getName());
@@ -167,61 +161,56 @@
unfinishedTasks = processInstance.getTaskMgmtInstance().getUnfinishedTasks(rootToken);
assertNotNull(unfinishedTasks);
assertEquals(2, unfinishedTasks.size());
- taskInstance = findTaskInstance("required secondary review", unfinishedTasks);
+ taskInstance = findTaskInstance("required secondary review", unfinishedTasks);
taskInstance.end();
assertEquals("next phase", rootToken.getNode().getName());
}
-
+
public void testEndTasksAttribute() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <start-state>" +
- " <transition to='task1' />" +
- " </start-state>" +
- " <task-node name='task1'>" +
- " <task name='another task' blocking='false'/>" +
- " <transition to='task2' />" +
- " </task-node>" +
- " <task-node name='task2' end-tasks='true' signal='first'>" +
- " <task name='task one' blocking='false' />" +
- " <task name='task two' blocking='false' />" +
- " <transition to='next phase' />" +
- " </task-node>" +
- " <state name='next phase' />" +
- "</process-definition>"
- );
-
- ProcessInstance processInstance = new ProcessInstance(processDefinition);
- Token rootToken = processInstance.getRootToken();
- processInstance.signal();
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='task1' />"
+ + " </start-state>"
+ + " <task-node name='task1'>"
+ + " <task name='another task' blocking='false'/>"
+ + " <transition to='task2' />"
+ + " </task-node>"
+ + " <task-node name='task2' end-tasks='true' signal='first'>"
+ + " <task name='task one' blocking='false' />"
+ + " <task name='task two' blocking='false' />"
+ + " <transition to='next phase' />"
+ + " </task-node>"
+ + " <state name='next phase' />" + "</process-definition>");
- assertEquals("task1", rootToken.getNode().getName());
-
- processInstance.signal();
- assertEquals("task2", rootToken.getNode().getName());
-
- Collection unfinishedTasks;
- unfinishedTasks = processInstance.getTaskMgmtInstance().getUnfinishedTasks(rootToken);
- assertNotNull(unfinishedTasks);
- assertEquals(3, unfinishedTasks.size());
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ Token rootToken = processInstance.getRootToken();
+ processInstance.signal();
- TaskInstance taskInstance = findTaskInstance("task one", unfinishedTasks);
- taskInstance.end();
+ assertEquals("task1", rootToken.getNode().getName());
- int n = 0;
- Collection tasks = processInstance.getTaskMgmtInstance().getTaskInstances();
- assertNotNull(unfinishedTasks);
- for (Iterator it = tasks.iterator(); it.hasNext();) {
- TaskInstance ti = (TaskInstance)it.next();
- if (!ti.hasEnded()) n++;
- }
- // System.out.println("There are " + n + " unfinished tasks");
- assertEquals(1, n);
+ processInstance.signal();
+ assertEquals("task2", rootToken.getNode().getName());
- }
+ Collection unfinishedTasks;
+ unfinishedTasks = processInstance.getTaskMgmtInstance().getUnfinishedTasks(rootToken);
+ assertNotNull(unfinishedTasks);
+ assertEquals(3, unfinishedTasks.size());
+ TaskInstance taskInstance = findTaskInstance("task one", unfinishedTasks);
+ taskInstance.end();
+ int n = 0;
+ Collection tasks = processInstance.getTaskMgmtInstance().getTaskInstances();
+ assertNotNull(unfinishedTasks);
+ for (Iterator it = tasks.iterator(); it.hasNext();) {
+ TaskInstance ti = (TaskInstance) it.next();
+ if (!ti.hasEnded()) n++;
+ }
+ // System.out.println("There are " + n + " unfinished tasks");
+ assertEquals(1, n);
+ }
+
private TaskInstance findTaskInstance(String taskName, Collection taskInstances) {
TaskInstance taskInstance = null;
Iterator iter = taskInstances.iterator();
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/log4j.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/log4j.xml 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/log4j.xml 2009-08-19 11:34:10 UTC (rev 5492)
@@ -36,12 +36,12 @@
<priority value="INFO" />
</category>
+ <!--
<category name="org.hibernate.SQL">
<priority value="DEBUG" />
</category>
- <!--
- <category name="org.hibernate.connection">
+ <category name="org.hibernate.type">
<priority value="TRACE" />
</category>
-->
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml 2009-08-19 11:34:10 UTC (rev 5492)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root-container name="processDefinition1" width="806" height="809">
- <node name="start" x="181" y="26" width="132" height="36">
+<root-container name="bpm_orchestration2" width="494" height="548">
+ <node name="Start" x="181" y="26" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
@@ -11,54 +11,57 @@
<label x="5" y="-10"/>
</edge>
</node>
- <node name="Validate Order" x="350" y="89" width="132" height="36">
+ <node name="Validate Order" x="178" y="93" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
</node>
<node name="fork1" x="117" y="224" width="252" height="24">
<edge>
- <label x="-65" y="-8"/>
+ <label x="-20" y="-8"/>
</edge>
<edge>
- <label x="-107" y="-14"/>
+ <label x="-53" y="-11"/>
</edge>
<edge>
<label x="21" y="-11"/>
</edge>
</node>
- <node name="Los Angeles WHSE" x="178" y="298" width="132" height="36">
+ <node name="Los Angeles WHSE" x="176" y="300" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
+ <edge>
+ <label x="-10" y="-33"/>
+ </edge>
</node>
- <node name="Dallas WHSE" x="22" y="300" width="132" height="36">
+ <node name="Dallas WHSE" x="13" y="299" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
</node>
- <node name="Atlanta WHSE" x="325" y="295" width="132" height="36">
+ <node name="Atlanta WHSE" x="339" y="300" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
</node>
- <node name="join1" x="118" y="386" width="252" height="24">
+ <node name="join1" x="115" y="387" width="252" height="24">
<edge>
<label x="5" y="-10"/>
</edge>
</node>
- <node name="Shipment Notice" x="177" y="442" width="132" height="36">
+ <node name="Shipment Notice" x="174" y="446" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
</node>
- <node name="end1" x="176" y="511" width="132" height="36"/>
- <node name="Credit Check" x="178" y="88" width="132" height="36">
+ <node name="End" x="174" y="511" width="132" height="36"/>
+ <node name="Inventory Check" x="177" y="156" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
</node>
- <node name="Inventory Check" x="177" y="154" width="132" height="36">
+ <node name="Credit Check" x="350" y="93" width="132" height="36">
<edge>
<label x="5" y="-10"/>
</edge>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-08-18 16:17:58 UTC (rev 5491)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-08-19 11:34:10 UTC (rev 5492)
@@ -1,137 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="processDefinition1">
+<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="bpm_orchestration2">
- <start-state name="start">
- <transition name="" to="Receive Order"/>
+ <start-state name="Start">
+ <transition to="Receive Order"/>
</start-state>
<node async="true" name="Receive Order">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName>
<esbServiceName>Service1</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition to="Validate Order"/>
+ <transition to="Credit Check"/>
</node>
- <node async="true" name="Validate Order">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <node name="Validate Order">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName>
<esbServiceName>Service2</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition to="Credit Check"/>
+ <transition to="Inventory Check"/>
</node>
<fork name="fork1">
- <transition to="Los Angeles WHSE" name="to Los Angeles WHSE"/>
- <transition to="Dallas WHSE" name="to Dallas WHSE"/>
- <transition name="to Atlanta WHSE" to="Atlanta WHSE"/>
+ <transition to="Los Angeles WHSE" name="LA"/>
+ <transition to="Dallas WHSE" name="Dallas"/>
+ <transition name="Atlanta" to="Atlanta WHSE"/>
</fork>
- <node async="true" name="Los Angeles WHSE">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
- <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName>
- <esbServiceName>Service5</esbServiceName>
- <bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
- </bpmToEsbVars>
- <esbToBpmVars>
- <mapping bpm="la" esb="BODY_CONTENT" />
- </esbToBpmVars>
- </action>
- <transition name="" to="join1"/>
- </node>
+ <state name="Los Angeles WHSE">
+ <timer duedate="2 seconds" transition="Dallas"/>
+ <transition name="OK" to="join1"/>
+ <transition to="Dallas WHSE" name="Dallas"/>
+ </state>
- <node async="true" name="Dallas WHSE">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <node name="Dallas WHSE">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName>
<esbServiceName>Service6</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="dallas" esb="BODY_CONTENT" />
+ <mapping bpm="dallas" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition name="" to="join1"/>
+ <transition to="join1"/>
</node>
<node async="true" name="Atlanta WHSE">
-
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName>
<esbServiceName>Service7</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="atlanta" esb="BODY_CONTENT" />
+ <mapping bpm="atlanta" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition name="" to="join1"/>
+ <transition to="join1"/>
</node>
<join name="join1" async="exclusive">
<transition to="Shipment Notice"/>
</join>
- <node async="true" name="Shipment Notice">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
+ <node name="Shipment Notice">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
<esbCategoryName>BPM_Orchestration2_ResultsService
</esbCategoryName>
<esbServiceName>ResultsService</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="atlanta" esb="atlanta" />
- <mapping bpm="la" esb="la" />
- <mapping bpm="dallas" esb="dallas" />
+ <mapping bpm="atlanta" esb="atlanta"/>
+ <mapping bpm="la" esb="la"/>
+ <mapping bpm="dallas" esb="dallas"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition name="" to="end1"/>
+ <transition to="End"/>
</node>
- <end-state name="end1"/>
+ <end-state name="End"/>
- <node async="true" name="Credit Check">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
- <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
- <esbServiceName>Service3</esbServiceName>
+ <node async="true" name="Inventory Check">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
+ <esbServiceName>Service4</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition to="Inventory Check"/>
+ <transition to="fork1"/>
</node>
- <node async="true" name="Inventory Check">
- <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler">
- <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName>
- <esbServiceName>Service4</esbServiceName>
+ <node name="Credit Check">
+ <action class="org.jbpm.jbpm2094.EsbActionHandler">
+ <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName>
+ <esbServiceName>Service3</esbServiceName>
<bpmToEsbVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</bpmToEsbVars>
<esbToBpmVars>
- <mapping bpm="theBody" esb="BODY_CONTENT" />
+ <mapping bpm="theBody" esb="BODY_CONTENT"/>
</esbToBpmVars>
</action>
- <transition to="fork1"/>
+ <transition to="Validate Order"/>
</node>
</process-definition>
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5491 - jbpm4/trunk/modules/distro/scripts.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-18 12:17:58 -0400 (Tue, 18 Aug 2009)
New Revision: 5491
Modified:
jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
Log:
fixed inclusion of db schema scripts in building distro
Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-18 15:12:29 UTC (rev 5490)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-18 16:17:58 UTC (rev 5491)
@@ -70,7 +70,7 @@
<outputDirectory>doc/schemadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../db/target</directory>
+ <directory>../db/target/classes</directory>
<outputDirectory>db/schema.scripts</outputDirectory>
<includes>
<include>*.sql</include>
16 years, 8 months
- 1
- 0
JBoss JBPM SVN: r5490 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm/api/cmd and 59 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-18 11:12:29 -0400 (Tue, 18 Aug 2009)
New Revision: 5490
Added:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentImpl.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.cmd.cfg.xml
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml
jbpm4/trunk/qa/hudson-jbpm4-cfg.bat
Removed:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxCommand.java
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxTemplate.java
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.tx.hibernate.cfg.xml
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java
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/EjbTimerSession.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessEnginePluginImpl.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/ProcessFormDispatcher.java
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java
jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
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/SpringConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryDetailQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryTaskQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinatesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariableNamesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartActivityNamesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartFormResourceNameCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariableNamesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetExecutionVariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetTaskVariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/HistoryEvent.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceCreate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskActivityStart.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskAssign.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskCreated.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskUpdated.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableUpdate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/HibernateLongIdTest.java
jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatestringid/HibernateStringIdTest.java
jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties
jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
Log:
JBPM-2409 JBPM-2411 JBPM-2483 added user defined transaction boundaries to allow for domain model integration
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,9 @@
import java.sql.Connection;
+import org.jbpm.api.cmd.Command;
+
/** central starting point for all process engine API
* interactions. This is a thread safe object so it can be
* kept in a static member field or in JNDI or something
@@ -81,4 +83,6 @@
* a service method in the same thread.
* This method returns the process engine for convenient method concatenations. */
ProcessEngine setJdbcConnection(Connection jdbcConnection);
+
+ <T> T execute(Command<T> command);
}
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd (from rev 5489, jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd)
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/Command.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,14 +0,0 @@
-package org.jbpm.api.cmd;
-
-import java.io.Serializable;
-
-import org.jbpm.api.ProcessEngine;
-
-/** commands that can be {@link ProcessEngine#execute(Command) executed by the process engine}.
- *
- * @author Tom Baeyens
- */
-public interface Command<T> extends Serializable {
-
- T execute(Environment environment) throws Exception;
-}
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java (from rev 5489, jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/Command.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Command.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,14 @@
+package org.jbpm.api.cmd;
+
+import java.io.Serializable;
+
+import org.jbpm.api.ProcessEngine;
+
+/** commands that can be {@link ProcessEngine#execute(Command) executed by the process engine}.
+ *
+ * @author Tom Baeyens
+ */
+public interface Command<T> extends Serializable {
+
+ T execute(Environment environment) throws Exception;
+}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,43 +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.api.cmd;
-
-/** exposes configured process engine scope objects and
- * transaction scope objects {@link Command to command implementations}.
- *
- * @author Tom Baeyens
- */
-public interface Environment {
-
- /**
- * searches a named object in all the contexts in the default search order.
- * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment.
- */
- public abstract Object get(String name);
-
- /** searches an object based on type. The search doesn take superclasses of the context elements
- * into account.
- * @return the first object of the given type or null in case no such element was found.
- */
- public abstract <T> T get(Class<T> type);
-
-}
\ No newline at end of file
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java (from rev 5489, jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/Environment.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,43 @@
+/*
+ * 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.api.cmd;
+
+/** exposes configured process engine scope objects and
+ * transaction scope objects {@link Command to command implementations}.
+ *
+ * @author Tom Baeyens
+ */
+public interface Environment {
+
+ /**
+ * searches a named object in all the contexts in the default search order.
+ * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment.
+ */
+ public abstract Object get(String name);
+
+ /** searches an object based on type. The search doesn take superclasses of the context elements
+ * into account.
+ * @return the first object of the given type or null in case no such element was found.
+ */
+ public abstract <T> T get(Class<T> type);
+
+}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,42 +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.api.cmd;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/** command with support for parameter passing from the client to the implementation.
- *
- * @author Tom Baeyens
- */
-public abstract class ParamCommand<T> implements Command<T> {
-
- private static final long serialVersionUID = 1L;
-
- protected Map<String, Object> params = new HashMap<String, Object>();
-
- public ParamCommand<T> setParam(String name, Object value) {
- params.put(name, value);
- return this;
- }
-}
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java (from rev 5489, jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/ParamCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,42 @@
+/*
+ * 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.api.cmd;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/** command with support for parameter passing from the client to the implementation.
+ *
+ * @author Tom Baeyens
+ */
+public abstract class ParamCommand<T> implements Command<T> {
+
+ private static final long serialVersionUID = 1L;
+
+ protected Map<String, Object> params = new HashMap<String, Object>();
+
+ public ParamCommand<T> setParam(String name, Object value) {
+ params.put(name, value);
+ return this;
+ }
+}
Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,38 +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.api.cmd;
-
-
-/** convenience for commands without return value.
- *
- * @author Tom Baeyens
- */
-public abstract class VoidCommand implements Command<Void> {
-
- public Void execute(Environment environment) throws Exception {
- executeVoid(environment);
- return null;
- }
-
- public abstract void executeVoid(Environment environment);
-
-}
Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java (from rev 5489, jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java)
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java (rev 0)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/cmd/VoidCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,38 @@
+/*
+ * 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.api.cmd;
+
+
+/** convenience for commands without return value.
+ *
+ * @author Tom Baeyens
+ */
+public abstract class VoidCommand implements Command<Void> {
+
+ public Void execute(Environment environment) throws Exception {
+ executeVoid(environment);
+ return null;
+ }
+
+ public abstract void executeVoid(Environment environment);
+
+}
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-18 15:12:29 UTC (rev 5490)
@@ -17,7 +17,9 @@
<property name="jbpm.version" value="4.1-SNAPSHOT" />
<property name="jbpm.parent.dir" value="../.." />
<property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
-
+
+ <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" />
+
<property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource -->
<property name="logging" value="jdk" /> <!-- jdk | provided -->
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -34,10 +34,10 @@
import org.jbpm.api.Configuration;
import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
/**
@@ -80,7 +80,7 @@
private ProcessEngine processEngine = null;
/*public <T> T execute(Command<T> command) {
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
log.debug("executing command " + command);
return command.execute(environment);
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -40,9 +40,9 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.api.job.Job;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
/**
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbLocalCommandService.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import javax.ejb.CreateException;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
/**
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-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbRemoteCommandService.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,9 +28,9 @@
import javax.naming.InitialContext;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EjbTimerSession.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,7 +30,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.job.Timer;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.session.TimerSession;
@@ -51,7 +51,7 @@
log.debug("scheduling "+timer);
// flush timer to database
- DbSession dbSession = Environment.getCurrent().get(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getCurrent().get(DbSession.class);
dbSession.save(timer);
dbSession.flush();
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,9 +23,9 @@
import java.util.Date;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/LocalCommandExecutor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.enterprise.internal.ejb;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
/**
* EJB2 local interface for the command executor.
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/RemoteCommandExecutor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import java.rmi.RemoteException;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
/**
* EJB2 remote interface for the command executor.
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/InsertCommentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.enterprise.internal.custom;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
/**
* @author Alejandro Guizar
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/RemoveCommentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,8 +26,8 @@
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -37,11 +37,11 @@
import org.apache.cactus.ServletTestCase;
+import org.jbpm.api.cmd.Command;
import org.jbpm.enterprise.internal.custom.InsertCommentCmd;
import org.jbpm.enterprise.internal.custom.RemoveCommentCmd;
import org.jbpm.enterprise.internal.ejb.CommandReceiverMDB;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.test.enterprise.IntegrationTestSetup;
/**
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,15 +28,14 @@
import junit.framework.Test;
import org.jbpm.api.ExecutionService;
-import org.jbpm.api.RepositoryService;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.enterprise.internal.custom.HappyListener;
import org.jbpm.enterprise.internal.custom.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.session.TimerSession;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,15 +30,15 @@
import org.jbpm.api.Execution;
import org.jbpm.api.ExecutionService;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.enterprise.internal.custom.HappyListener;
import org.jbpm.enterprise.internal.custom.NoisyListener;
import org.jbpm.enterprise.internal.custom.WaitState;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,7 +28,7 @@
import org.jbpm.api.Configuration;
import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
/**
@@ -37,7 +37,7 @@
public abstract class EnvironmentServletTestCase extends ServletTestCase {
private final String configResource;
- protected Environment environment;
+ protected EnvironmentImpl environment;
protected Log log = Log.getLog(getClass().getName());
private static final Map<String, EnvironmentFactory> environmentFactories = new HashMap<String, EnvironmentFactory>();
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessEnginePluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessEnginePluginImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessEnginePluginImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,7 +27,7 @@
import org.jbpm.api.*;
import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import java.util.ArrayList;
import java.util.List;
@@ -48,7 +48,7 @@
{
List<DeploymentRef> results = new ArrayList<DeploymentRef>();
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -95,7 +95,7 @@
public void deleteDeployment(String id)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -111,7 +111,7 @@
public void suspendDeployment(String id, boolean isSuspended)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -132,7 +132,7 @@
{
List<JobRef> results = new ArrayList<JobRef>();
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -171,7 +171,7 @@
public void executeJob(String jobId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -37,7 +37,7 @@
import org.jbpm.api.RepositoryService;
import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.api.history.HistoryProcessInstanceQuery;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -49,7 +49,7 @@
public List<ProcessDefinitionRef> getProcessDefinitions()
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -93,7 +93,7 @@
public ProcessDefinitionRef getProcessDefinition(String procDefId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -112,7 +112,7 @@
public List<ProcessDefinitionRef> removeProcessDefinition(String procDefId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -134,7 +134,7 @@
public List<ProcessInstanceRef> getProcessInstances(String procDefId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -168,7 +168,7 @@
private List<ProcessInstanceRef> adoptProcessInstances(List<ProcessInstance> processInstances)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -197,7 +197,7 @@
public ProcessInstanceRef getProcessInstance(String instanceId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -218,7 +218,7 @@
{
Map<String, Object> data = new HashMap<String, Object>();
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -241,7 +241,7 @@
public ProcessInstanceRef newInstance(String definitionId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -257,7 +257,7 @@
public ProcessInstanceRef newInstance(String definitionId, Map<String, Object> processVars)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -274,7 +274,7 @@
public void endInstance(String instanceId, ProcessInstanceRef.RESULT result)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -295,7 +295,7 @@
public void deleteInstance(String instanceId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -323,7 +323,7 @@
public void signalExecution(String executionId, String signal)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,7 +30,7 @@
import org.jbpm.api.TaskService;
import org.jbpm.api.task.Participation;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
@@ -41,7 +41,7 @@
{
public List<TaskRef> getAssignedTasks(String idRef)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -61,7 +61,7 @@
public List<TaskRef> getUnassignedTasks(String idRef, String participationType)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -96,7 +96,7 @@
public TaskRef getTaskById(long taskId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -111,7 +111,7 @@
public void assignTask(long taskId, String idRef, String performingUser)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -125,7 +125,7 @@
public void releaseTask(long taskId, String performingUser)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -139,7 +139,7 @@
public void completeTask(long taskId, Map data, String performingUser)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -156,7 +156,7 @@
public void completeTask(long taskId, String outcome, Map data, String performingUser)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/ProcessFormDispatcher.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/ProcessFormDispatcher.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/ProcessFormDispatcher.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin;
import org.jbpm.api.ProcessDefinition;
import org.jbpm.api.RepositoryService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import javax.activation.DataHandler;
@@ -74,7 +74,7 @@
{
String name = null;
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
RepositoryService repoService = processEngine.getRepositoryService();
@@ -100,7 +100,7 @@
public DataHandler provideForm(FormAuthorityRef ref)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
DataHandler result = null;
Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin;
import org.jbpm.api.*;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.Transition;
@@ -78,7 +78,7 @@
{
boolean result = false;
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
TaskService taskService = processEngine.getTaskService();
@@ -95,7 +95,7 @@
public DataHandler provideForm(FormAuthorityRef ref)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
Modified: jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -41,7 +41,7 @@
import org.jbpm.api.ProcessInstanceQuery;
import org.jbpm.api.RepositoryService;
import org.jbpm.api.model.ActivityCoordinates;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.integration.spi.mgmt.ServerConfig;
@@ -86,7 +86,7 @@
public byte[] getProcessImage(String processId)
{
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -140,7 +140,7 @@
List<ActiveNodeInfo> results = new ArrayList<ActiveNodeInfo>();
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
@@ -195,7 +195,7 @@
URL result = null;
// check resource availability
- Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ EnvironmentImpl env = ((EnvironmentFactory)processEngine).openEnvironment();
boolean hasImageResource = false;
try
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionHandlerActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.activity.ActivityExecution;
import org.jbpm.api.jpdl.DecisionHandler;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.Activity;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.Transition;
@@ -55,7 +55,7 @@
usedDecisionHandler = decisionHandler;
} else if (decisionHandlerName!=null) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
Object object = environment.get(decisionHandlerName);
if (object==null) {
throw new JbpmException("decision handler for "+activity+" is null");
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/HqlActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,7 +26,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.model.OpenExecution;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor;
@@ -47,7 +47,7 @@
protected boolean isResultUnique;
public void perform(OpenExecution execution) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new JbpmException("no environment for jpdl activity "+HqlBinding.TAG);
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,7 +26,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.model.OpenExecution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentDefaults;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -29,7 +29,7 @@
import org.jbpm.api.Execution;
import org.jbpm.api.JbpmException;
import org.jbpm.api.activity.ActivityExecution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.Activity;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.Transition;
@@ -64,7 +64,7 @@
} else if (Execution.STATE_ACTIVE_CONCURRENT.equals(execution.getState())) {
// force version increment in the parent execution
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
session.lock(execution.getParent(), lockMode);
execution.setState(Execution.STATE_INACTIVE_JOIN);
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,7 +28,7 @@
import org.jbpm.api.model.OpenExecution;
import org.jbpm.pvm.internal.email.spi.MailProducer;
import org.jbpm.pvm.internal.email.spi.MailSession;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
* @author Alejandro Guizar
@@ -41,7 +41,7 @@
void perform(OpenExecution execution) throws Exception {
Collection<Message> messages = mailProducer.produce(execution);
- Environment.getFromCurrent(MailSession.class).send(messages);
+ EnvironmentImpl.getFromCurrent(MailSession.class).send(messages);
}
public void setMailProducer(MailProducer mailProducer) {
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailListener.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -29,7 +29,7 @@
import org.jbpm.api.listener.EventListenerExecution;
import org.jbpm.pvm.internal.email.spi.MailProducer;
import org.jbpm.pvm.internal.email.spi.MailSession;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.TaskContext;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
@@ -45,7 +45,7 @@
public void notify(EventListenerExecution execution) throws Exception {
// find current task
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
DbSession dbSession = environment.get(DbSession.class);
TaskImpl task = dbSession.findTaskByExecution(execution);
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.jpdl.internal.activity;
import org.jbpm.api.model.OpenExecution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
@@ -39,7 +39,7 @@
protected String variableName;
public void perform(OpenExecution execution) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
Object returnValue = scriptManager.evaluateScript(script, language);
if (variableName!=null) {
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.jpdl.internal.activity;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Parse;
@@ -46,7 +46,7 @@
String script = XmlUtil.attribute(element, "expr");
Element textElement = XmlUtil.element(element, "text");
if(script!=null) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
language = scriptManager.getDefaultExpressionLanguage();
if (textElement!=null) {
parse.addProblem("in <script ...> attribute expr can't be combined with a nexted text element", element);
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,7 +27,7 @@
import org.jbpm.api.activity.ActivityExecution;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.ExecutionContext;
import org.jbpm.pvm.internal.model.Activity;
import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -56,7 +56,7 @@
public void execute(ActivityExecution execution) {
ExecutionImpl executionImpl = (ExecutionImpl) execution;
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
ClientProcessDefinition processDefinition = null;
@@ -100,7 +100,7 @@
ExecutionContext originalExecutionContext = null;
ExecutionContext subProcessExecutionContext = null;
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
originalExecutionContext = (ExecutionContext) environment.removeContext(Context.CONTEXTNAME_EXECUTION);
subProcessExecutionContext = new ExecutionContext((ExecutionImpl) subProcessInstance);
@@ -120,7 +120,7 @@
String subProcessActivityName = subProcessInstance.getActivityName();
if (outcomeExpression!=null) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
Object value = scriptManager.evaluateExpression(outcomeExpression, null);
// if the value is a String and matches the name of an outgoing transition
if ( (value instanceof String)
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,7 +28,7 @@
import org.jbpm.api.activity.ActivityExecution;
import org.jbpm.api.task.Task;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.events.TaskActivityStart;
import org.jbpm.pvm.internal.model.Activity;
@@ -58,7 +58,7 @@
}
public void execute(ExecutionImpl execution) {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
TaskImpl task = (TaskImpl) dbSession.createTask();
task.setTaskDefinition(taskDefinition);
task.setExecution(execution);
@@ -111,7 +111,7 @@
execution.fire(signalName, activity);
- DbSession taskDbSession = Environment
+ DbSession taskDbSession = EnvironmentImpl
.getFromCurrent(DbSession.class);
TaskImpl task = (TaskImpl) taskDbSession.findTaskByExecution(execution);
task.setSignalling(false);
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -43,7 +43,7 @@
import org.jbpm.pvm.internal.email.impl.MailTemplate;
import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry;
import org.jbpm.pvm.internal.email.spi.MailProducer;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.ActivityCoordinatesImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.CompositeElementImpl;
@@ -316,7 +316,7 @@
timerDefinition.setDueDateDescription(duedate);
} else if (duedatetime!=null) {
- String dueDateTimeFormatText = (String) Environment.getFromCurrent("jbpm.duedatetime.format");
+ String dueDateTimeFormatText = (String) EnvironmentImpl.getFromCurrent("jbpm.duedatetime.format");
if (dueDateTimeFormatText==null) {
dueDateTimeFormatText = "HH:mm dd/MM/yyyy";
}
@@ -666,7 +666,7 @@
}
private static MailTemplate findTemplate(Element element, Parse parse, String templateName) {
- MailTemplateRegistry templateRegistry = Environment.getFromCurrent(MailTemplateRegistry.class);
+ MailTemplateRegistry templateRegistry = EnvironmentImpl.getFromCurrent(MailTemplateRegistry.class);
if (templateRegistry != null) {
MailTemplate template = templateRegistry.getTemplate(templateName);
if (template != null) return template;
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-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -33,14 +33,17 @@
import org.jbpm.api.ExecutionService;
import org.jbpm.api.HistoryService;
import org.jbpm.api.IdentityService;
+import org.jbpm.api.JbpmException;
import org.jbpm.api.ManagementService;
import org.jbpm.api.ProcessEngine;
import org.jbpm.api.RepositoryService;
import org.jbpm.api.TaskService;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.JbpmConfigurationParser;
import org.jbpm.pvm.internal.env.PvmEnvironment;
import org.jbpm.pvm.internal.env.UserProvidedEnvironmentObject;
@@ -96,6 +99,8 @@
protected ThreadLocal<List<UserProvidedEnvironmentObject>> userProvidedEnvironmentObjectsThreadLocal = new ThreadLocal<List<UserProvidedEnvironmentObject>>();
protected ThreadLocal<String> authenticatedUserIdThreadLocal = new ThreadLocal<String>();
+ protected CommandService userCommandService = null;
+
public JbpmConfiguration() {
super((Configuration)null);
}
@@ -124,6 +129,7 @@
}
}
}
+ userCommandService = (CommandService) processEngineWireContext.get("user.command.service");
return this;
}
@@ -195,7 +201,7 @@
return processEngineWireContext.get(RepositoryService.class);
}
- public Environment openEnvironment() {
+ public EnvironmentImpl openEnvironment() {
PvmEnvironment environment = new PvmEnvironment(this);
if (log.isTraceEnabled()) log.trace("opening " + environment);
@@ -207,7 +213,7 @@
return environment;
}
- protected void installAuthenticatedUserId(Environment environment) {
+ protected void installAuthenticatedUserId(EnvironmentImpl environment) {
String authenticatedUserId = authenticatedUserIdThreadLocal.get();
if (authenticatedUserId!=null) {
environment.setAuthenticatedUserId(authenticatedUserId);
@@ -220,13 +226,13 @@
// add the environment block context to the environment
environment.setContext(transactionContext);
- Environment.pushEnvironment(environment);
+ EnvironmentImpl.pushEnvironment(environment);
try {
// finish the creation of the environment wire context
transactionContext.create();
} catch (RuntimeException e) {
- Environment.popEnvironment();
+ EnvironmentImpl.popEnvironment();
throw e;
}
}
@@ -313,4 +319,17 @@
}
environmentObjects.add(userProvidedEnvironmentObject);
}
+
+ public <T> T execute(Command<T> command) {
+ EnvironmentImpl environment = openEnvironment();
+ try {
+ return userCommandService.execute(command);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new JbpmException(e.getMessage(), e);
+ } finally {
+ environment.close();
+ }
+ }
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,7 +27,7 @@
import org.jbpm.api.ProcessEngine;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.env.PvmEnvironment;
import org.jbpm.pvm.internal.env.SpringContext;
@@ -81,7 +81,7 @@
return super.buildProcessEngine();
}
- public Environment openEnvironment() {
+ public EnvironmentImpl openEnvironment() {
PvmEnvironment environment = new PvmEnvironment(this);
if (log.isTraceEnabled())
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,9 @@
*/
package org.jbpm.pvm.internal.cmd;
+import org.jbpm.api.cmd.Command;
+
/**
* @author Tom Baeyens
*/
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddParticipationCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.task.TaskImpl;
/**
@@ -48,7 +48,7 @@
}
public Object execute(Environment environment) throws Exception {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = environment.get(Session.class);
if (taskId!=null) {
TaskImpl task = (TaskImpl) session.get(TaskImpl.class, Long.parseLong(taskId));
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddTaskCommentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AssignTaskCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.events.TaskAssign;
import org.jbpm.pvm.internal.session.DbSession;
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,10 +0,0 @@
-package org.jbpm.pvm.internal.cmd;
-
-import java.io.Serializable;
-
-import org.jbpm.pvm.internal.env.Environment;
-
-public interface Command<T> extends Serializable {
-
- T execute(Environment environment) throws Exception;
-}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,6 +1,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
/**
* abstract extensible session facade. Developers can use this directly or
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompositeCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
/** container for executing multiple commands in one transaction.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateDeploymentQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.DeploymentQueryImpl;
import org.jbpm.pvm.internal.query.JobQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryActivityInstanceQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryDetailQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryDetailQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryDetailQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.HistoryDetailQueryImpl;
import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryProcessInstanceQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryTaskQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryTaskQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateHistoryTaskQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.HistoryTaskQueryImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateJobQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.JobQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessDefinitionQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateProcessInstanceQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CreateTaskQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.query.TaskQueryImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteCommentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,8 +27,9 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.ProcessDefinition;
import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.repository.RepositoryCache;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessDefinitionCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.wire.binding.DbSessionBinding;
@@ -49,7 +49,7 @@
}
public Void execute(Environment environment) {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = environment.get(DbSession.class);
if (dbSession==null) {
throw new JbpmException("no "+DbSessionBinding.TAG+" configured");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteProcessInstance.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.session.DbSession;
@@ -45,7 +46,7 @@
}
public Void execute(Environment environment) throws Exception {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
dbSession.deleteProcessInstance(processInstanceId, cascade);
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteTaskCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/EndProcessInstance.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.session.DbSession;
@@ -43,7 +44,7 @@
}
public Object execute(Environment environment) throws Exception {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = environment.get(DbSession.class);
ExecutionImpl processInstance = (ExecutionImpl) dbSession.findProcessInstanceById(processInstanceId);
processInstance.end(state);
return null;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,9 +24,10 @@
import java.util.Date;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.job.Job;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.JobContext;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.job.JobImpl;
@@ -57,7 +58,8 @@
this.jobDbid = jobDbid;
}
- public Job execute(Environment environment) throws Exception {
+ public Job execute(Environment environmentInterface) throws Exception {
+ EnvironmentImpl environment = (EnvironmentImpl) environmentInterface;
DbSession dbSession = environment.get(DbSession.class);
if (dbSession==null) {
throw new JbpmException("no db-session configured");
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import org.jbpm.api.Execution;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionByKeyCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.ProcessDefinition;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionByIdCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.model.OpenProcessDefinition;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionKeysCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsByKeyCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,8 +23,8 @@
import java.util.List;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinatesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinatesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetActivityCoordinatesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,9 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.model.ActivityCoordinates;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariableNamesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariableNamesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariableNamesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,8 +24,8 @@
import java.util.Set;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetExecutionVariablesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,8 +26,8 @@
import java.util.Set;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,8 +26,9 @@
import java.util.Set;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.Transition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,8 +26,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.task.Participation;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.task.ParticipationImpl;
@@ -65,7 +65,7 @@
throw new JbpmException("no task nor swimlane specified");
}
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = environment.get(Session.class);
Query query = session.createQuery(hql.toString());
List<Participation> participations = query.list();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetResourceAsStreamCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.RepositorySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartActivityNamesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartActivityNamesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartActivityNamesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
@@ -46,7 +47,7 @@
public List<String> execute(Environment environment) {
List<String> activityNames = new ArrayList<String>();
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = environment.get(RepositorySession.class);
ProcessDefinitionImpl processDefinition = repositorySession.findProcessDefinitionById(processDefinitionId);
for (ActivityImpl activity: (List<ActivityImpl>) processDefinition.getActivities()) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartFormResourceNameCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartFormResourceNameCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetStartFormResourceNameCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,8 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.activity.ActivityBehaviour;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
@@ -49,7 +50,7 @@
}
public String execute(Environment environment) {
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = environment.get(RepositorySession.class);
ProcessDefinitionImpl processDefinition = repositorySession.findProcessDefinitionById(processDefinitionId);
ActivityImpl activity = processDefinition.getActivity(activityName);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,8 +25,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskCommentsCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,8 +25,8 @@
import java.util.Collections;
import java.util.List;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariableNamesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariableNamesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariableNamesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,8 +24,8 @@
import java.util.Set;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariablesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetTaskVariablesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/RemoveParticipantCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,7 +26,7 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.task.ParticipationImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
@@ -53,7 +53,7 @@
}
public Object execute(Environment environment) throws Exception {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = environment.get(Session.class);
if (taskDbid!=null) {
TaskImpl task = (TaskImpl) session.get(TaskImpl.class, taskDbid);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ResumeDeploymentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.HistorySession;
import org.jbpm.pvm.internal.history.events.TaskCreated;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SendMessageCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.job.Message;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.MessageSession;
/** sends a given message to the configured message service.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetExecutionVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetExecutionVariablesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetExecutionVariablesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetTaskVariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetTaskVariablesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SetTaskVariablesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.task.TaskImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,8 +25,8 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,9 +26,9 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.client.ClientProcessInstance;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.RepositorySession;
/**
@@ -61,7 +61,7 @@
processInstance.start();
if (!processInstance.isEnded()) {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = environment.get(Session.class);
session.save(processInstance);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/StartProcessInstanceInLatestCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,9 +26,10 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.client.ClientProcessInstance;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
/**
@@ -64,7 +65,7 @@
processInstance.start();
if (!processInstance.isEnded()) {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
session.save(processInstance);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SuspendDeploymentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,10 +22,10 @@
package org.jbpm.pvm.internal.cmd;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.repository.RepositoryCache;
-import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.session.RepositorySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/VariablesCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,8 +25,8 @@
import java.util.Map;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.session.DbSession;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/DefaultAddressResolver.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -31,7 +31,7 @@
import org.jbpm.api.identity.Group;
import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.email.spi.AddressResolver;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
/**
@@ -53,7 +53,7 @@
}
public Address[] resolveAddresses(Group group) {
- List<User> users = Environment.getFromCurrent(IdentitySession.class)
+ List<User> users = EnvironmentImpl.getFromCurrent(IdentitySession.class)
.findUsersByGroup(group.getId());
int userCount = users.size();
Address[] addresses = new Address[userCount];
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -50,7 +50,7 @@
import org.jbpm.api.identity.User;
import org.jbpm.pvm.internal.email.spi.AddressResolver;
import org.jbpm.pvm.internal.email.spi.MailProducer;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
import org.jbpm.pvm.internal.script.ScriptManager;
@@ -110,7 +110,7 @@
}
}
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
IdentitySession identitySession = environment.get(IdentitySession.class);
AddressResolver addressResolver = environment.get(AddressResolver.class);
@@ -133,7 +133,7 @@
}
private String evaluateExpression(String expression, Execution execution) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
Object value = scriptManager.evaluateExpression(expression, template.getLanguage());
if (!(value instanceof String)) {
throw new JbpmException("expected expression '"
@@ -201,7 +201,7 @@
}
}
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
IdentitySession identitySession = environment.get(IdentitySession.class);
AddressResolver addressResolver = environment.get(AddressResolver.class);
@@ -366,7 +366,7 @@
// resolve and read classpath resource
else {
String resource = evaluateExpression(attachmentTemplate.getResource(), execution);
- targetUrl = Environment.getCurrent().getClassLoader().getResource(resource);
+ targetUrl = EnvironmentImpl.getCurrent().getClassLoader().getResource(resource);
if (targetUrl == null) {
throw new JbpmException("could not read attachment content, resource not found: "
+ resource);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -32,7 +32,7 @@
/**
* @author Tom Baeyens
*/
-public class BasicEnvironment extends Environment {
+public class BasicEnvironment extends EnvironmentImpl {
private static final long serialVersionUID = 1L;
@@ -149,7 +149,7 @@
public void close() {
log.trace("closing "+this);
- Environment popped = Environment.popEnvironment();
+ EnvironmentImpl popped = EnvironmentImpl.popEnvironment();
if (this!=popped) {
throw new JbpmException("environment nesting problem");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Context.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import java.util.Set;
/**
- * a group of named objects in an {@link Environment} that have a similar lifespan.
+ * a group of named objects in an {@link EnvironmentImpl} that have a similar lifespan.
*
* @author Tom Baeyens
*/
Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/Environment.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,269 +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.pvm.internal.env;
-
-import java.io.Serializable;
-import java.util.Stack;
-
-import org.jbpm.api.JbpmException;
-
-
-/**
- * maintains contextual information for a thread in a set of
- * {@link Context}s.
- *
- * <h3>Introduction</h3>
- *
- * <p>Objects have different lifecycles and different context's (aka scopes). An
- * environment provides the structure to easily manage objects with different
- * contexts.
- * </p>
- *
- * <p>Examples of contexts are:
- * <ul>
- * <li><b>process-engine</b>: The process-engine context is used to store e.g. data sources,
- * session factories and other static resources needed by an application.
- * The process-engine context lives for the complete duration of the {@link EnvironmentFactory}.
- * So if the {@link EnvironmentFactory} is maintained in a static member field, the
- * process-engine context lives for the duration of the application.
- * The same process-engine context is shared for all the Environments produced by one
- * EnvironmentFactory.</li>
- * <li><b>environment</b>: The environment context is used for e.g. a transaction
- * and transactional resources, user authentication. This results in an efficient and
- * configurable use of transactional resources that need to be lazily initialized.</li>
- * <li>The environment can accomodate other contexts as well. They can be added
- * and removed dynamically. Examples of other potential contexts are web-request, web-session,
- * web-application, business processDefinition, jobImpl, ... </li>
- * </ul>
- *
- * <center><img src="environment.gif"/></center>
- *
- * <p>An environment is typically installed like this
- * </p>
- *
- * <b><pre>static EnvironmentFactory environmentFactory = new DefaultEnvironmentFactory();
- *
- * ...
- *
- * Environment environment = environmentFactory.openEnvironment();
- * try {
- *
- * ... everything available in this block ...
- *
- * } finally {
- * environment.close();
- * }
- * </pre></b>
- *
- * <h3>Purpose</h3>
- *
- * <p>The first purpose of the environment is to separate the application from the
- * environment. Standard Java and Enterprise Java are quite different and an environment
- * abstraction like this allows for the development of applications that can run in
- * both Standard and Enterprise environments. Also test environments are easier to
- * tweak this way.
- * </p>
- *
- * <p>A second purpose of the environment is to enable specific to global searching
- * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts
- * 'execution', 'transaction' and 'process-engine' in the given order.
- * That way, a global adminEmailAddress can be specified in the process-engine context
- * and it can be refined in more specific contexts.
- * </p>
- *
- * <h3>Search order</h3>
- *
- * <p>To find an object in the environment, a searchOrder can be specified. A
- * search order is an sequence that specifies the order in which the contexts should
- * be searched.
- * </p>
- *
- * <p>The default search order is the inverse sequence of how the contexts are
- * added to the environment. This is because in general, we can assume that the
- * more recent a context was added, the more specific it is.
- * </p>
- *
- * <h3>Transaction, username and classloader</h3>
- *
- * <p>Three objects are used so frequently in an environment that they get
- * special treatment:
- * </p>
- *
- * <ul>
- * <li><b>Transaction</b>: an abstraction for marking a transaction with
- * setRollbackOnly.</li>
- * <li><b>Classloader</b>: the current class loader.</li>
- * <li><b>Username</b>: the name of the currently authenticated user.</li>
- * </ul>
- *
- * <p>For these special properties, setters are also available. That is to support
- * programmatic injection into the environment. Alternatively, they can be configured
- * in one of the contexts.
- * </p>
- *
- *
- * @see EnvironmentFactory
- * @author Tom Baeyens
- */
-public abstract class Environment implements Serializable {
-
- /**
- * searches a named object in all the contexts in the default search order.
- * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment.
- */
- public abstract Object get(String name);
-
- /**
- * searches a named object in all the contexts in the given search order. The given
- * search order doesn't have to include all contexts. It can be a subset of the
- * contexts available.
- * @param searchOrder list of contexts names. The object will be searched in these contexts, in the given order.
- * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the specified searchOrder contexts.
- */
- public abstract Object get(String name, String[] searchOrder);
-
- /** searches an object based on type. The search doesn take superclasses of the context elements
- * into account.
- * @return the first object of the given type or null in case no such element was found.
- */
- public abstract <T> T get(Class<T> type);
-
-
- /** searches an object based on type. The search doesn take superclasses of the context elements
- * into account.
- * @return the first object of the given type or null in case no such element was found.
- */
- public abstract <T> T get(Class<T> type, String[] searchOrder);
-
- /** get the authenticated user id */
- public abstract String getAuthenticatedUserId();
-
- /** set the authenticated user id */
- public abstract void setAuthenticatedUserId(String authenticatedUserId);
-
- /**
- * closes the Environment by removing all its contexts.
- */
- public abstract void close();
-
- public abstract Context getContext(String contextName);
- public abstract void setContext(Context context);
- public abstract Context removeContext(Context context);
- public abstract Context removeContext(String contextName);
-
- public abstract ClassLoader getClassLoader();
- public abstract void setClassLoader(ClassLoader classLoader);
-
- // current environment //////////////////////////////////////////////////////
- /** the current environment is maintained in the currentEnvironment thread local */
- static ThreadLocal<Environment> currentEnvironment = new ThreadLocal<Environment>();
-
- /** in case of nested environments, the current environment stack maintains the outer environments */
- static ThreadLocal<Stack<Environment>> currentEnvironmentStack = new ThreadLocal<Stack<Environment>>();
-
- /** gets the most inner open environment. */
- public static Environment getCurrent() {
- return currentEnvironment.get();
- }
-
- public static <T> T getFromCurrent(Class<T> type) {
- return getFromCurrent(type, true);
- }
-
- public static <T> T getFromCurrent(Class<T> type, boolean required) {
- Environment environment = getCurrent();
- if (environment==null) {
- if (required) {
- throw new JbpmException("no environment to get "+type.getName());
- }
- return null;
- }
- T object = environment.get(type);
- if (object==null) {
- if (required) {
- throw new JbpmException("no "+type.getName()+" in current environment");
- }
- return null;
- }
- return object;
- }
-
- public static Object getFromCurrent(String name) {
- return getFromCurrent(name, true);
- }
-
- public static Object getFromCurrent(String name, boolean required) {
- Environment environment = getCurrent();
- if (environment==null) {
- if (required) {
- throw new JbpmException("no environment to get '"+name+"'");
- }
- return null;
- }
- Object object = environment.get(name);
- if (object==null) {
- if (required) {
- throw new JbpmException("no '"+name+"' in current environment");
- }
- return null;
- }
- return object;
- }
-
- static Stack<Environment> getStack() {
- // lazy initialize the current environment stack
- Stack<Environment> stack = currentEnvironmentStack.get();
- if (stack==null) {
- stack = new Stack<Environment>();
- currentEnvironmentStack.set(stack);
- }
- return stack;
- }
-
-
- /** pops the closing context from the stack of current contexts. This
- * is the first thing that needs to be done when an environment is closed.
- * @see EnvironmentFactory#push(Environment) */
- public static synchronized Environment popEnvironment() {
- Environment popped = currentEnvironment.get();
- currentEnvironment.set(null);
- Stack<Environment> stack = currentEnvironmentStack.get();
- if ( (stack!=null)
- && (! stack.isEmpty())
- ) {
- currentEnvironment.set(stack.pop());
- }
- return popped;
- }
-
- /** after opening of a new environment succeeded, the environment
- * must be pushed in the stack of current environments.
- *
- * @see Environment#pop() */
- public static synchronized void pushEnvironment(Environment environment) {
- Environment current = currentEnvironment.get();
- if (current!=null) {
- getStack().push(current);
- }
- currentEnvironment.set(environment);
- }
-}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -37,7 +37,7 @@
public abstract class EnvironmentDefaults {
public static ScriptManager getScriptManager() {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class, false);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class, false);
if (scriptManager!=null) {
return scriptManager;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentFactory.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,7 +28,7 @@
import org.xml.sax.InputSource;
/**
- * factory for {@link Environment}s.
+ * factory for {@link EnvironmentImpl}s.
*
* <p>Default implementation is
* {@link PvmEnvironmentFactory}. EnvironmentFactory is thread safe, you
@@ -51,10 +51,10 @@
public interface EnvironmentFactory extends Context, Serializable {
/**
- * open a new Environment. The client is responsible for
- * closing the environment with {@link Environment#close()}.
+ * open a new EnvironmentImpl. The client is responsible for
+ * closing the environment with {@link EnvironmentImpl#close()}.
*/
- Environment openEnvironment();
+ EnvironmentImpl openEnvironment();
/**
* closes this environment factory and cleans any allocated
Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentImpl.java (from rev 5489, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentImpl.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,270 @@
+/*
+ * 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.pvm.internal.env;
+
+import java.io.Serializable;
+import java.util.Stack;
+
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
+
+
+/**
+ * maintains contextual information for a thread in a set of
+ * {@link Context}s.
+ *
+ * <h3>Introduction</h3>
+ *
+ * <p>Objects have different lifecycles and different context's (aka scopes). An
+ * environment provides the structure to easily manage objects with different
+ * contexts.
+ * </p>
+ *
+ * <p>Examples of contexts are:
+ * <ul>
+ * <li><b>process-engine</b>: The process-engine context is used to store e.g. data sources,
+ * session factories and other static resources needed by an application.
+ * The process-engine context lives for the complete duration of the {@link EnvironmentFactory}.
+ * So if the {@link EnvironmentFactory} is maintained in a static member field, the
+ * process-engine context lives for the duration of the application.
+ * The same process-engine context is shared for all the Environments produced by one
+ * EnvironmentFactory.</li>
+ * <li><b>environment</b>: The environment context is used for e.g. a transaction
+ * and transactional resources, user authentication. This results in an efficient and
+ * configurable use of transactional resources that need to be lazily initialized.</li>
+ * <li>The environment can accomodate other contexts as well. They can be added
+ * and removed dynamically. Examples of other potential contexts are web-request, web-session,
+ * web-application, business processDefinition, jobImpl, ... </li>
+ * </ul>
+ *
+ * <center><img src="environment.gif"/></center>
+ *
+ * <p>An environment is typically installed like this
+ * </p>
+ *
+ * <b><pre>static EnvironmentFactory environmentFactory = new DefaultEnvironmentFactory();
+ *
+ * ...
+ *
+ * EnvironmentImpl environment = environmentFactory.openEnvironment();
+ * try {
+ *
+ * ... everything available in this block ...
+ *
+ * } finally {
+ * environment.close();
+ * }
+ * </pre></b>
+ *
+ * <h3>Purpose</h3>
+ *
+ * <p>The first purpose of the environment is to separate the application from the
+ * environment. Standard Java and Enterprise Java are quite different and an environment
+ * abstraction like this allows for the development of applications that can run in
+ * both Standard and Enterprise environments. Also test environments are easier to
+ * tweak this way.
+ * </p>
+ *
+ * <p>A second purpose of the environment is to enable specific to global searching
+ * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts
+ * 'execution', 'transaction' and 'process-engine' in the given order.
+ * That way, a global adminEmailAddress can be specified in the process-engine context
+ * and it can be refined in more specific contexts.
+ * </p>
+ *
+ * <h3>Search order</h3>
+ *
+ * <p>To find an object in the environment, a searchOrder can be specified. A
+ * search order is an sequence that specifies the order in which the contexts should
+ * be searched.
+ * </p>
+ *
+ * <p>The default search order is the inverse sequence of how the contexts are
+ * added to the environment. This is because in general, we can assume that the
+ * more recent a context was added, the more specific it is.
+ * </p>
+ *
+ * <h3>Transaction, username and classloader</h3>
+ *
+ * <p>Three objects are used so frequently in an environment that they get
+ * special treatment:
+ * </p>
+ *
+ * <ul>
+ * <li><b>Transaction</b>: an abstraction for marking a transaction with
+ * setRollbackOnly.</li>
+ * <li><b>Classloader</b>: the current class loader.</li>
+ * <li><b>Username</b>: the name of the currently authenticated user.</li>
+ * </ul>
+ *
+ * <p>For these special properties, setters are also available. That is to support
+ * programmatic injection into the environment. Alternatively, they can be configured
+ * in one of the contexts.
+ * </p>
+ *
+ *
+ * @see EnvironmentFactory
+ * @author Tom Baeyens
+ */
+public abstract class EnvironmentImpl implements Serializable, Environment {
+
+ /**
+ * searches a named object in all the contexts in the default search order.
+ * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the environment.
+ */
+ public abstract Object get(String name);
+
+ /**
+ * searches a named object in all the contexts in the given search order. The given
+ * search order doesn't have to include all contexts. It can be a subset of the
+ * contexts available.
+ * @param searchOrder list of contexts names. The object will be searched in these contexts, in the given order.
+ * @return the object if it exists in the environment, <code>null</code> if there is no object with the given name in the specified searchOrder contexts.
+ */
+ public abstract Object get(String name, String[] searchOrder);
+
+ /** searches an object based on type. The search doesn take superclasses of the context elements
+ * into account.
+ * @return the first object of the given type or null in case no such element was found.
+ */
+ public abstract <T> T get(Class<T> type);
+
+
+ /** searches an object based on type. The search doesn take superclasses of the context elements
+ * into account.
+ * @return the first object of the given type or null in case no such element was found.
+ */
+ public abstract <T> T get(Class<T> type, String[] searchOrder);
+
+ /** get the authenticated user id */
+ public abstract String getAuthenticatedUserId();
+
+ /** set the authenticated user id */
+ public abstract void setAuthenticatedUserId(String authenticatedUserId);
+
+ /**
+ * closes the EnvironmentImpl by removing all its contexts.
+ */
+ public abstract void close();
+
+ public abstract Context getContext(String contextName);
+ public abstract void setContext(Context context);
+ public abstract Context removeContext(Context context);
+ public abstract Context removeContext(String contextName);
+
+ public abstract ClassLoader getClassLoader();
+ public abstract void setClassLoader(ClassLoader classLoader);
+
+ // current environment //////////////////////////////////////////////////////
+ /** the current environment is maintained in the currentEnvironment thread local */
+ static ThreadLocal<EnvironmentImpl> currentEnvironment = new ThreadLocal<EnvironmentImpl>();
+
+ /** in case of nested environments, the current environment stack maintains the outer environments */
+ static ThreadLocal<Stack<EnvironmentImpl>> currentEnvironmentStack = new ThreadLocal<Stack<EnvironmentImpl>>();
+
+ /** gets the most inner open environment. */
+ public static EnvironmentImpl getCurrent() {
+ return currentEnvironment.get();
+ }
+
+ public static <T> T getFromCurrent(Class<T> type) {
+ return getFromCurrent(type, true);
+ }
+
+ public static <T> T getFromCurrent(Class<T> type, boolean required) {
+ EnvironmentImpl environment = getCurrent();
+ if (environment==null) {
+ if (required) {
+ throw new JbpmException("no environment to get "+type.getName());
+ }
+ return null;
+ }
+ T object = environment.get(type);
+ if (object==null) {
+ if (required) {
+ throw new JbpmException("no "+type.getName()+" in current environment");
+ }
+ return null;
+ }
+ return object;
+ }
+
+ public static Object getFromCurrent(String name) {
+ return getFromCurrent(name, true);
+ }
+
+ public static Object getFromCurrent(String name, boolean required) {
+ EnvironmentImpl environment = getCurrent();
+ if (environment==null) {
+ if (required) {
+ throw new JbpmException("no environment to get '"+name+"'");
+ }
+ return null;
+ }
+ Object object = environment.get(name);
+ if (object==null) {
+ if (required) {
+ throw new JbpmException("no '"+name+"' in current environment");
+ }
+ return null;
+ }
+ return object;
+ }
+
+ static Stack<EnvironmentImpl> getStack() {
+ // lazy initialize the current environment stack
+ Stack<EnvironmentImpl> stack = currentEnvironmentStack.get();
+ if (stack==null) {
+ stack = new Stack<EnvironmentImpl>();
+ currentEnvironmentStack.set(stack);
+ }
+ return stack;
+ }
+
+
+ /** pops the closing context from the stack of current contexts. This
+ * is the first thing that needs to be done when an environment is closed.
+ * @see EnvironmentFactory#push(EnvironmentImpl) */
+ public static synchronized EnvironmentImpl popEnvironment() {
+ EnvironmentImpl popped = currentEnvironment.get();
+ currentEnvironment.set(null);
+ Stack<EnvironmentImpl> stack = currentEnvironmentStack.get();
+ if ( (stack!=null)
+ && (! stack.isEmpty())
+ ) {
+ currentEnvironment.set(stack.pop());
+ }
+ return popped;
+ }
+
+ /** after opening of a new environment succeeded, the environment
+ * must be pushed in the stack of current environments.
+ *
+ * @see EnvironmentImpl#pop() */
+ public static synchronized void pushEnvironment(EnvironmentImpl environment) {
+ EnvironmentImpl current = currentEnvironment.get();
+ if (current!=null) {
+ getStack().push(current);
+ }
+ currentEnvironment.set(environment);
+ }
+}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -37,7 +37,7 @@
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.client.ClientExecution;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.job.JobImpl;
@@ -255,7 +255,7 @@
}
// delete remaining jobs for this process instance
- JobImpl currentJob = Environment.getFromCurrent(JobImpl.class, false);
+ JobImpl currentJob = EnvironmentImpl.getFromCurrent(JobImpl.class, false);
List<JobImpl> jobs = findJobs(processInstanceId);
for (JobImpl job: jobs) {
if (job!=currentJob){
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/HistoryEvent.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/HistoryEvent.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/HistoryEvent.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
/** base class for process logs. Process logs are dispatched to the
@@ -53,7 +53,7 @@
}
public static void fire(HistoryEvent historyEvent, ExecutionImpl execution) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
HistorySession historySession = environment.get(HistorySession.class);
if (historySession!=null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.util.Clock;
@@ -45,7 +45,7 @@
}
public void process() {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
Long historyActivityInstanceDbId = execution.getHistoryActivityInstanceDbid();
HistoryActivityInstanceImpl historyActivityInstance = (HistoryActivityInstanceImpl)
session.load(getHistoryActivityInstanceClass(), historyActivityInstanceDbId);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityStart.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.jbpm.api.history.HistoryProcessInstance;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
@@ -37,7 +37,7 @@
private static final long serialVersionUID = 1L;
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
long processInstanceDbid = execution.getProcessInstance().getDbid();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceCreate.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceCreate.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceCreate.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.hibernate.Session;
import org.jbpm.api.history.HistoryProcessInstance;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
@@ -39,7 +39,7 @@
public void process() {
HistoryProcessInstance historyProcessInstanceImpl = new HistoryProcessInstanceImpl(execution);
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
session.save(historyProcessInstanceImpl);
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceEnd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.util.Clock;
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 1L;
public void process() {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
HistoryProcessInstanceImpl historyProcessInstanceImpl = (HistoryProcessInstanceImpl)
session.load(HistoryProcessInstanceImpl.class, execution.getDbid());
historyProcessInstanceImpl.setEndTime(Clock.getCurrentTime());
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskActivityStart.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskActivityStart.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskActivityStart.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.jbpm.api.history.HistoryProcessInstance;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
@@ -47,7 +47,7 @@
}
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
ExecutionImpl processInstance = execution.getProcessInstance();
long processInstanceDbid = processInstance.getDbid();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskAssign.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskAssign.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskAssign.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.session.DbSession;
@@ -43,7 +43,7 @@
}
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
HistoryTaskImpl historyTaskInstance = (HistoryTaskImpl)
dbSession.get(HistoryTaskImpl.class, task.getDbid());
historyTaskInstance.setAssignee(assignee);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskComplete.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import org.hibernate.Session;
import org.jbpm.api.history.HistoryTask;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl;
@@ -45,7 +45,7 @@
}
public void process() {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
Long historyActivityInstanceDbId = execution.getHistoryActivityInstanceDbid();
HistoryTaskInstanceImpl historyTaskInstance = (HistoryTaskInstanceImpl)
session.load(HistoryTaskInstanceImpl.class, historyActivityInstanceDbId);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskCreated.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskCreated.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskCreated.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.session.DbSession;
@@ -42,7 +42,7 @@
}
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
HistoryTaskImpl historyTask = new HistoryTaskImpl(task);
dbSession.save(historyTask);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskDelete.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.history.events;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl;
@@ -53,7 +53,7 @@
protected void updateHistoryActivityInstance(HistoryActivityInstanceImpl historyActivityInstance) {
super.updateHistoryActivityInstance(historyActivityInstance);
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
HistoryTaskImpl historyTask = (HistoryTaskImpl) dbSession.get(HistoryTaskImpl.class, task.getDbid());
historyTask.setState(reason);
historyTask.setEndTime(Clock.getCurrentTime());
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskUpdated.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskUpdated.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskUpdated.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
import org.jbpm.pvm.internal.session.DbSession;
@@ -42,7 +42,7 @@
}
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
HistoryTaskImpl historyTask = dbSession.get(HistoryTaskImpl.class, task.getDbid());
historyTask.updated(task);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.api.history.HistoryTask;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
import org.jbpm.pvm.internal.history.model.HistoryTaskImpl;
@@ -48,7 +48,7 @@
}
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
dbSession.save(variable);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableUpdate.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableUpdate.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableUpdate.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.history.events;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.model.HistoryVariableImpl;
import org.jbpm.pvm.internal.session.DbSession;
@@ -43,7 +43,7 @@
@Override
public void process() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
HistoryVariableImpl historyVariable = dbSession.get(HistoryVariableImpl.class, variable.getDbid());
historyVariable.updated(variable);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.util.Date;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.util.Clock;
import org.jbpm.pvm.internal.util.EqualsUtil;
@@ -57,7 +57,7 @@
protected HistoryDetailImpl(String dummy) {
this.time = Clock.getCurrentTime();
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
this.userId = environment.getAuthenticatedUserId();
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateGroupCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateMembershipCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/CreateUserCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteGroupCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteMembershipCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/DeleteUserCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.identity.Group;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindGroupsCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,9 +23,9 @@
import java.util.List;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.identity.Group;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUserCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.identity.cmd;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.identity.User;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/cmd/FindUsersCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,9 +23,9 @@
import java.util.List;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.identity.User;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JbpmIdentityStore.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jboss.identity.idm.common.exception.IdentityException;
import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl;
import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
@@ -46,7 +46,7 @@
}
protected HibernateEntityManager getEntityManagerFromEnvironment() {
- return Environment.getFromCurrent(HibernateEntityManager.class);
+ return EnvironmentImpl.getFromCurrent(HibernateEntityManager.class);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.job;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -8,8 +8,8 @@
import java.util.Date;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.api.job.Job;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.lob.Lob;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,11 +25,12 @@
import java.util.Date;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.job.Timer;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cal.BusinessCalendar;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.env.EnvironmentDefaults;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.jobexecutor.JobAddedNotification;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
@@ -65,7 +66,7 @@
}
public void schedule() {
- TimerSession timerSession = Environment.getFromCurrent(TimerSession.class);
+ TimerSession timerSession = EnvironmentImpl.getFromCurrent(TimerSession.class);
timerSession.schedule(this);
}
@@ -73,7 +74,7 @@
ScriptManager scriptManager = EnvironmentDefaults.getScriptManager();
dueDateDescription = (String) scriptManager.evaluateExpression(dueDateDescription, null);
Date now = Clock.getCurrentTime();
- BusinessCalendar businessCalendar = Environment.getFromCurrent(BusinessCalendar.class);
+ BusinessCalendar businessCalendar = EnvironmentImpl.getFromCurrent(BusinessCalendar.class);
duedate = businessCalendar.add(now, dueDateDescription);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,9 +28,9 @@
import java.util.Date;
import java.util.List;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,8 +24,8 @@
import java.util.Collection;
import java.util.Date;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
/** this thread is responsible for acquiring jobs in the job that need to be
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,9 +23,9 @@
import java.util.Date;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,10 +27,10 @@
import javax.transaction.Synchronization;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -36,8 +36,8 @@
import java.util.concurrent.TimeUnit;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
/** manager for job execution threads and their configuration.
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import org.jbpm.api.job.Message;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.session.MessageSession;
@@ -52,7 +52,7 @@
if (!isNotificationAdded) {
isNotificationAdded = true;
- JobExecutor jobExecutor = Environment.getCurrent().get(JobExecutor.class);
+ JobExecutor jobExecutor = EnvironmentImpl.getCurrent().get(JobExecutor.class);
if (jobExecutor!=null) {
// notify the job executor after the transaction is completed
log.trace("registering job executor notifier with "+transaction);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import java.io.Serializable;
import java.util.List;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
@@ -86,7 +86,7 @@
protected ClobStrategy getClobStrategy() {
ClobStrategy clobStrategy = null;
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
clobStrategy = environment.get(ClobStrategy.class);
}
@@ -99,7 +99,7 @@
}
protected BlobStrategy getBlobStrategy() {
- BlobStrategy blobStrategy = Environment.getFromCurrent(BlobStrategy.class, false);
+ BlobStrategy blobStrategy = EnvironmentImpl.getFromCurrent(BlobStrategy.class, false);
if (blobStrategy==null) {
blobStrategy = DEFAULT_BLOB_STRATEGY;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jbpm.api.Execution;
import org.jbpm.api.ProcessDefinition;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
@@ -37,7 +37,7 @@
public String createId(ProcessDefinition processDefinition, Execution parent, ExecutionImpl execution) {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
session.save(execution);
// the next flush is introduced because of the following situation:
// for hsqldb: id generation is done by inserting and then reading the id value
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,7 +30,7 @@
import org.jbpm.api.listener.EventListener;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.model.op.AtomicOperation;
import org.jbpm.pvm.internal.model.op.MoveToChildActivity;
@@ -118,7 +118,7 @@
public void handle(ExecutionImpl execution, Exception exception) {
if (isTransactional) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
Transaction transaction = (environment!=null ? environment.get(Transaction.class) : null);
if (transaction!=null) {
log.trace("registering exception handler to "+transaction);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,10 +25,9 @@
import javax.transaction.Synchronization;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
-import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -48,7 +48,7 @@
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.client.ClientProcessInstance;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.ExecutionContext;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.events.ActivityEnd;
@@ -278,13 +278,13 @@
protected void destroyTimers(CompositeElementImpl scope) {
- TimerSession timerSession = Environment.getFromCurrent(TimerSession.class, false);
+ TimerSession timerSession = EnvironmentImpl.getFromCurrent(TimerSession.class, false);
if (timerSession!=null) {
log.debug("destroying timers of "+this);
List<Timer> timers = timerSession.findTimersByExecution(this);
for (Timer timer: timers) {
- Job job = Environment.getFromCurrent(JobImpl.class, false);
+ Job job = EnvironmentImpl.getFromCurrent(JobImpl.class, false);
if (timer!=job) {
timerSession.cancel(timer);
}
@@ -358,7 +358,7 @@
superProcessExecution.signal();
}
- DbSession dbSession = Environment.getFromCurrent(DbSession.class, false);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class, false);
if (dbSession!=null) {
dbSession.deleteProcessInstance(id, false);
}
@@ -599,7 +599,7 @@
}
public void sendContinuationMessage(AtomicOperation operation) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
MessageSession messageSession = environment.get(MessageSession.class);
if (messageSession==null) {
throw new JbpmException("no message-session configured to send asynchronous continuation message");
@@ -618,7 +618,7 @@
ExecutionContext originalExecutionContext = null;
ExecutionContext executionContext = null;
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
originalExecutionContext = (ExecutionContext) environment.getContext(Context.CONTEXTNAME_EXECUTION);
if ( (originalExecutionContext!=null)
@@ -746,7 +746,7 @@
}
protected String resolveAssignmentExpression(String expression, String expressionLanguage) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
Object result = scriptManager.evaluateExpression(expression, expressionLanguage);
if ( (result ==null)
|| (result instanceof String)
@@ -811,7 +811,7 @@
childExecution.name = name;
// id generation (after initialization)
- IdGenerator keyGenerator = Environment.getFromCurrent(IdGenerator.class, false);
+ IdGenerator keyGenerator = EnvironmentImpl.getFromCurrent(IdGenerator.class, false);
if (keyGenerator!=null) {
childExecution.id = keyGenerator.createId(getProcessDefinition(), this, childExecution);
}
@@ -979,7 +979,7 @@
public void suspend() {
super.suspend();
this.propagation = Propagation.EXPLICIT;
- DbSession dbSession = Environment.getFromCurrent(DbSession.class, false);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class, false);
if (dbSession!=null) {
dbSession.cascadeExecutionSuspend(this);
}
@@ -988,7 +988,7 @@
/** @see Execution#resume() */
public void resume() {
super.resume();
- DbSession hibernatePvmDbSession = Environment.getFromCurrent(DbSession.class, false);
+ DbSession hibernatePvmDbSession = EnvironmentImpl.getFromCurrent(DbSession.class, false);
if (hibernatePvmDbSession!=null) {
hibernatePvmDbSession.cascadeExecutionResume(this);
}
@@ -1093,7 +1093,7 @@
if ( (processDefinition==null)
&& (processDefinitionId!=null)
) {
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
processDefinition = (ProcessDefinitionImpl) repositorySession.findProcessDefinitionById(processDefinitionId);
if (processDefinition==null) {
throw new JbpmException("couldn't find process definition "+processDefinitionId+" in the repository");
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
@@ -88,11 +88,11 @@
}
protected T resolveValueExpression() {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
return null;
}
- protected T resolveMethodExpression(Environment environment) {
+ protected T resolveMethodExpression(EnvironmentImpl environment) {
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,7 +30,7 @@
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.client.ClientProcessInstance;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
/**
@@ -130,7 +130,7 @@
* is not persistent and there is an environment present (like in the case
* of task lifecycle for jpdl processes), this method needs to be overwritten. */
public IdGenerator getIdGenerator() {
- return Environment.getFromCurrent(IdGenerator.class, false);
+ return EnvironmentImpl.getFromCurrent(IdGenerator.class, false);
}
// task definitions /////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -32,7 +32,7 @@
import org.jbpm.api.Execution;
import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.events.VariableCreate;
import org.jbpm.pvm.internal.job.TimerImpl;
@@ -97,7 +97,7 @@
Type type = null;
if (type==null) {
- TypeSet typeSet = Environment.getFromCurrent(TypeSet.class, false);
+ TypeSet typeSet = EnvironmentImpl.getFromCurrent(TypeSet.class, false);
if (typeSet!=null) {
if (typeName!=null) {
type = typeSet.findTypeByName(typeName);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import java.io.Serializable;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -54,7 +54,7 @@
return WireContext.create(initDescriptor);
}
if (initExpression!=null) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
return scriptManager.evaluateExpression(initExpression, initLanguage);
}
return null;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableOutDefinitionSet.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,7 +26,7 @@
import java.util.Collections;
import java.util.List;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
/**
@@ -44,7 +44,7 @@
for (VariableOutDefinitionImpl variableOutDefinition: variableOutDefinitions) {
String variableName = variableOutDefinition.getName();
if (variableName!=null) {
- ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
+ ScriptManager scriptManager = EnvironmentImpl.getFromCurrent(ScriptManager.class);
// TODO update evaluateExpression so that scopeInstance can be passed in directly
String expression = variableOutDefinition.getExpression();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListenerMessage.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.EventImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import java.util.Map;
import org.jbpm.api.Execution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivityMessage.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.model.op;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,9 +27,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
@@ -60,7 +61,7 @@
if (commandService!=null) {
return (List) commandService.execute(this);
}
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
return (List) execute(session);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,8 +27,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,8 +27,8 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,7 +30,7 @@
import org.jbpm.api.Deployment;
import org.jbpm.api.ProcessDefinition;
import org.jbpm.api.ProcessDefinitionQuery;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
import org.jbpm.pvm.internal.repository.DeploymentProperty;
@@ -68,7 +68,7 @@
for (Map<String, Object> properties: propertyMaps) {
String deploymentId = properties.get("deploymentDbid").toString();
String objectName = (String)properties.get("objectName");
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) repositorySession.getObject(deploymentId, objectName);
processDefinitions.add(processDefinition);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/TaskQueryImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -30,7 +30,7 @@
import org.jbpm.api.identity.Group;
import org.jbpm.api.task.Task;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.task.ParticipationImpl;
@@ -150,7 +150,7 @@
appendWhereClause("participant.task = task ", hql);
appendWhereClause("participant.type = 'candidate' ", hql);
- IdentitySession identitySession = Environment.getFromCurrent(IdentitySession.class);
+ IdentitySession identitySession = EnvironmentImpl.getFromCurrent(IdentitySession.class);
List<Group> groups = identitySession.findGroupsByUser(candidate);
if (groups.isEmpty()) {
groupIds = null;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeployerManager.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,7 +26,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.xml.Problem;
@@ -52,7 +52,7 @@
throw jbpmException;
}
- RepositoryCache repositoryCache = Environment.getFromCurrent(RepositoryCache.class);
+ RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
repositoryCache.set(deployment.getId(), deployment.getObjects());
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -40,7 +40,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.cmd.DeployCmd;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.lob.Lob;
import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;
import org.jbpm.pvm.internal.stream.FileStreamInput;
@@ -251,10 +251,10 @@
state = Deployment.STATE_SUSPENDED;
- RepositorySessionImpl repositorySession = Environment.getFromCurrent(RepositorySessionImpl.class);
+ RepositorySessionImpl repositorySession = EnvironmentImpl.getFromCurrent(RepositorySessionImpl.class);
repositorySession.cascadeDeploymentSuspend(this);
- RepositoryCache repositoryCache = Environment.getFromCurrent(RepositoryCache.class);
+ RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
repositoryCache.remove(Long.toString(dbid));
}
@@ -265,10 +265,10 @@
state = Deployment.STATE_ACTIVE;
- RepositorySessionImpl repositorySession = Environment.getFromCurrent(RepositorySessionImpl.class);
+ RepositorySessionImpl repositorySession = EnvironmentImpl.getFromCurrent(RepositorySessionImpl.class);
repositorySession.cascadeDeploymentResume(this);
- RepositoryCache repositoryCache = Environment.getFromCurrent(RepositoryCache.class);
+ RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
repositoryCache.remove(Long.toString(dbid));
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,7 +28,7 @@
import org.jbpm.api.ProcessDefinition;
import org.jbpm.api.ProcessDefinitionQuery;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
import org.jbpm.pvm.internal.xml.Parse;
@@ -112,7 +112,7 @@
processDefinition.setKey(processDefinitionKey);
}
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
List<ProcessDefinition> existingProcesses = repositorySession.createProcessDefinitionQuery()
.processDefinitionName(processDefinitionName)
@@ -143,7 +143,7 @@
processDefinition.setId(id);
}
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
ProcessDefinition existingProcessDefinition = repositorySession.createProcessDefinitionQuery()
.processDefinitionId(id)
.uniqueResult();
@@ -156,7 +156,7 @@
int version = processDefinition.getVersion();
String key = processDefinition.getKey();
if (version==ProcessDefinitionImpl.UNASSIGNED_VERSION) {
- RepositorySession repositorySession = Environment.getFromCurrent(RepositorySession.class);
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
ProcessDefinition latestDeployedVersion = repositorySession
.createProcessDefinitionQuery()
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,7 +27,7 @@
import javax.script.Bindings;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
@@ -35,10 +35,10 @@
*/
public class EnvironmentBindings implements Bindings {
- protected Environment environment;
+ protected EnvironmentImpl environment;
public EnvironmentBindings(String[] readContextNames, String writeContextName) {
- environment = Environment.getCurrent();
+ environment = EnvironmentImpl.getCurrent();
}
public Object get(Object key) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.spring;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
import org.springframework.orm.hibernate3.HibernateTransactionManager;
import org.springframework.orm.hibernate3.SessionFactoryUtils;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,9 +22,11 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.api.Execution;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.job.MessageImpl;
@@ -47,7 +49,8 @@
this.userId = userId;
}
- public Object execute(Environment environment) throws Exception {
+ public Object execute(Environment environmentInterface) throws Exception {
+ EnvironmentImpl environment = (EnvironmentImpl) environmentInterface;
execution.setState(Execution.STATE_ACTIVE_ROOT);
if (userId!=null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,9 +22,9 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.session.MessageSession;
@@ -36,7 +36,7 @@
boolean propagateUserId = true;
public <T> T execute(Command<T> command) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new JbpmException("no environment for verifying authorization");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/** performs an authorization check before the command is executed.
* @author Tom Baeyens
@@ -31,7 +31,7 @@
public class AuthorizationInterceptor extends Interceptor {
public <T> T execute(Command<T> command) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new JbpmException("no environment for verifying authorization");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,9 +1,9 @@
package org.jbpm.pvm.internal.svc;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
public interface AuthorizationSession {
- void checkPermission(Command<?> command, Environment environment);
+ void checkPermission(Command<?> command, EnvironmentImpl environment);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,10 +22,10 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
@@ -36,7 +36,7 @@
private static final Log log = Log.getLog(DefaultCommandService.class.getName());
public <T> T execute(Command<T> command) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
try {
return command.execute(environment);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.svc;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;
@@ -38,7 +38,7 @@
protected EnvironmentFactory environmentFactory;
public <T> T execute(Command<T> command) {
- Environment environment;
+ EnvironmentImpl environment;
environment = environmentFactory.openEnvironment();
try {
@@ -50,7 +50,7 @@
}
}
- protected void injectEnvironmentObjects(Environment environment) {
+ protected void injectEnvironmentObjects(EnvironmentImpl environment) {
WireContext transactionContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
transactionContext.getWireDefinition().addDescriptor(new ProvidedObjectDescriptor());
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/FindGroupIds.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -3,9 +3,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.identity.Group;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.identity.cmd.FindGroupsCmd;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.pvm.internal.svc;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.hibernate.StaleStateException;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,8 +27,8 @@
import java.io.ObjectOutputStream;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
/**
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -35,7 +35,7 @@
import org.jbpm.api.task.Swimlane;
import org.jbpm.api.task.Task;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.events.TaskComplete;
import org.jbpm.pvm.internal.history.events.TaskDelete;
@@ -228,7 +228,7 @@
}
public TaskImpl createSubTask() {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class);
TaskImpl subTask = (TaskImpl) dbSession.createTask();
if (subTasks == null) {
subTasks = new HashSet<TaskImpl>();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,11 +24,11 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.jbpm.api.Execution;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.job.Job;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.cmd.ExecuteJobCmd;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.MessageImpl;
import org.jbpm.pvm.internal.job.TimerImpl;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringTransactionInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,9 +23,9 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.spring.CommandTransactionCallback;
import org.jbpm.pvm.internal.svc.Interceptor;
import org.springframework.transaction.PlatformTransactionManager;
@@ -48,7 +48,7 @@
@SuppressWarnings("unchecked")
public <T> T execute(Command<T> command) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment == null) {
throw new JbpmException("no environment for managing hibernate transaction");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,9 +22,9 @@
package org.jbpm.pvm.internal.tx;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.svc.Interceptor;
@@ -38,7 +38,7 @@
private static final Log log = Log.getLog(StandardTransactionInterceptor.class.getName());
public <T> T execute(Command<T> command) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new JbpmException("no environment for managing hibernate transaction");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,9 +24,9 @@
import javax.transaction.Status;
import javax.transaction.UserTransaction;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.svc.RetryInterceptor;
@@ -38,7 +38,7 @@
private static Log log = Log.getLog(JtaRetryInterceptor.class.getName());
public <T> T execute(Command<T> command) {
- JtaTransaction jtaTransaction = Environment.getFromCurrent(JtaTransaction.class);
+ JtaTransaction jtaTransaction = EnvironmentImpl.getFromCurrent(JtaTransaction.class);
UserTransaction userTransaction = jtaTransaction.lookupJeeUserTransaction();
int status = JtaTransaction.getUserTransactionStatus(userTransaction);
if (status == Status.STATUS_NO_TRANSACTION) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,9 +27,9 @@
import javax.transaction.UserTransaction;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.svc.Interceptor;
@@ -41,7 +41,7 @@
private static Log log = Log.getLog(JtaTransactionInterceptor.class.getName());
public <T> T execute(Command<T> command) {
- JtaTransaction jtaTransaction = Environment.getFromCurrent(JtaTransaction.class);
+ JtaTransaction jtaTransaction = EnvironmentImpl.getFromCurrent(JtaTransaction.class);
UserTransaction userTransaction = jtaTransaction.lookupJeeUserTransaction();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.HistorySession;
import org.jbpm.pvm.internal.history.events.VariableUpdate;
@@ -89,7 +89,7 @@
}
setObject(value);
- HistorySession historySession = Environment.getFromCurrent(HistorySession.class, false);
+ HistorySession historySession = EnvironmentImpl.getFromCurrent(HistorySession.class, false);
if ( isHistoryEnabled
&& (historySession!=null)
) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/HibernateIdMatcher.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.Type;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.type.Matcher;
@@ -48,7 +48,7 @@
public boolean matches(String name, Object value) {
boolean matches = false;
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
SessionFactory sessionFactory = null;
if (hibernateSessionFactoryName!=null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/BlobVariable.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.type.variable;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.lob.Lob;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.type.Variable;
@@ -44,7 +44,7 @@
public void setObject(Object value) {
if (this.lob!=null) {
- DbSession dbSession = Environment.getFromCurrent(DbSession.class, false);
+ DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class, false);
if (dbSession!=null) {
dbSession.delete(this.lob);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -12,7 +12,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.descriptor.ArgDescriptor;
public abstract class ReflectUtil {
@@ -27,7 +27,7 @@
}
// 2) if the user provided a classloader through the environment, use that one
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
classLoader = environment.getClassLoader();
if (classLoader!=null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -33,7 +33,7 @@
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.model.ProcessElementImpl;
import org.jbpm.pvm.internal.util.Closable;
@@ -64,7 +64,7 @@
*
* <h3>Purpose</h3>
*
- * <p>A WireContext is used often in combination with {@link Environment} to
+ * <p>A WireContext is used often in combination with {@link EnvironmentImpl} to
* decouple the processDefinition virtual machine from its environment. In the
* {@link JbpmConfiguration}, both the process-engine context and
* the environment contexts are WireContexts. The PVM will use the persistence service,
@@ -136,7 +136,7 @@
* <li><b>{@link SubscribeOperation}</b>: subscribes to an {@link Observable observable}.</li>
* </ul>
*
- * <h3>Environment</h3>
+ * <h3>EnvironmentImpl</h3>
*
* <p>When an environment is injected into a WireContext, lookup of all
* referenced object names will be done first in this WireContext, but
@@ -228,7 +228,7 @@
this(wireDefinition, null, null, false);
}
- /** when this {@link Context} is used in an {@link Environment}, it
+ /** when this {@link Context} is used in an {@link EnvironmentImpl}, it
* needs a name. */
public WireContext(WireDefinition wireDefinition, String name) {
this.wireDefinition = wireDefinition;
@@ -246,7 +246,7 @@
* set and the scope needs to be added to the environment before the creation of this wire scope is done.
* @see JbpmConfiguration#openEnvironment()
*/
- public WireContext(WireDefinition wireDefinition, String name, Environment environment, boolean delayCreate) {
+ public WireContext(WireDefinition wireDefinition, String name, EnvironmentImpl environment, boolean delayCreate) {
this.wireDefinition = wireDefinition;
this.name = name;
this.classLoader = (wireDefinition!=null ? wireDefinition.getClassLoader() : null);
@@ -265,7 +265,7 @@
/**
* initializes the eager objects and then fires the create event. This method
* only needs to be called explicitly in case <code>delayCreate</code> is true
- * in {@link #WireContext(WireDefinition, String, Environment, boolean)}.
+ * in {@link #WireContext(WireDefinition, String, EnvironmentImpl, boolean)}.
*/
public void create() {
log.trace("creating "+name);
@@ -422,7 +422,7 @@
}
// then check if we can find it in the environment (if one is available)
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
log.trace("delivering "+objectName+" from environment");
return environment.get(objectName);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvRefBinding.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,13 +21,13 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.descriptor.EnvironmentDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
import org.w3c.dom.Element;
-/** parses a descriptor for obtaining a reference to the {@link Environment}.
+/** parses a descriptor for obtaining a reference to the {@link EnvironmentImpl}.
*
* See schema docs for more details.
*
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VersionTimestampPolicy.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.repository.DeploymentImpl;
/**
@@ -138,9 +138,9 @@
return evaluation;
}
- private Environment getEnvironment()
+ private EnvironmentImpl getEnvironment()
{
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null)
throw new RuntimeException("Failed to access current environment");
return environment;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -54,7 +54,7 @@
}
public Class< ? > getType(WireDefinition wireDefinition) {
- return CommandService.class;
+ return (name==null ? CommandService.class : null);
}
public void addInterceptorDescriptor(Descriptor descriptor) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ContextRefDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
@@ -15,7 +15,7 @@
if (contextName==null) {
return wireContext;
}
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new WireException("can't get context '"+contextName+"': no current environment");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.wire.descriptor;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireException;
@@ -47,7 +47,7 @@
}
public Object construct(WireContext wireContext) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new WireException("no environment to get object "+(objectName!=null ? objectName : typeName));
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,6 +1,6 @@
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -18,6 +18,6 @@
private static final long serialVersionUID = 1L;
public Object construct(WireContext wireContext) {
- return Environment.getCurrent();
+ return EnvironmentImpl.getCurrent();
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,7 +27,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.impl.SessionImpl;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.tx.HibernateSessionResource;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -50,7 +50,7 @@
protected String connectionName;
public Object construct(WireContext wireContext) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment==null) {
throw new WireException("no environment");
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jboss.identity.idm.api.IdentitySessionFactory;
import org.jboss.identity.idm.common.exception.IdentityException;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.identity.impl.IdentitySessionResource;
import org.jbpm.pvm.internal.identity.impl.JBossIdmIdentitySessionImpl;
import org.jbpm.pvm.internal.tx.StandardTransaction;
@@ -45,11 +45,11 @@
public Object construct(WireContext wireContext) {
- IdentitySessionFactory identitySessionFactory = Environment.getFromCurrent(IdentitySessionFactory.class);
+ IdentitySessionFactory identitySessionFactory = EnvironmentImpl.getFromCurrent(IdentitySessionFactory.class);
try {
IdentitySession identitySession = identitySessionFactory.createIdentitySession(realmName);
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
StandardTransaction transaction = environment.get(StandardTransaction.class);
if (transaction != null) {
IdentitySessionResource identitySessionResource = new IdentitySessionResource(identitySession);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -10,7 +10,7 @@
import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentDefaults;
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.internal.util.ReflectUtil;
@@ -280,7 +280,7 @@
Object autoWireValue = null;
if ("environment".equals(fieldName)) {
- autoWireValue = Environment.getCurrent();
+ autoWireValue = EnvironmentImpl.getCurrent();
} else if ( ("context".equals(fieldName))
|| ("wireContext".equals(fieldName))
@@ -296,7 +296,7 @@
// if auto wire value has not been found in current context,
// search in environment
if (autoWireValue == null) {
- Environment currentEnvironment = Environment.getCurrent();
+ EnvironmentImpl currentEnvironment = EnvironmentImpl.getCurrent();
if (currentEnvironment != null) {
autoWireValue = currentEnvironment.get(fieldName);
if (autoWireValue == null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TransactionRefDescriptor.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.descriptor;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 1L;
public Object construct(WireContext wireContext) {
- return Environment.getCurrent().get(Transaction.class);
+ return EnvironmentImpl.getCurrent().get(Transaction.class);
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -6,7 +6,7 @@
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.util.FilterListener;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.util.Observable;
@@ -77,7 +77,7 @@
// identify the wireContext
WireContext wireContext = null;
if (contextName!=null) {
- Environment environment = Environment.getCurrent();
+ EnvironmentImpl environment = EnvironmentImpl.getCurrent();
if (environment!=null) {
try {
wireContext = (WireContext) environment.getContext(contextName);
Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.cmd.cfg.xml (from rev 5489, jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.tx.cmd.cfg.xml)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.cmd.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.tx.cmd.cfg.xml 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <process-engine-context>
+ <command-service name="user.command.service">
+ <retry-interceptor />
+ <environment-interceptor />
+ <standard-transaction-interceptor />
+ </command-service>
+ <command-service />
+ </process-engine-context>
+
+ <transaction-context>
+ <transaction />
+ <hibernate-session />
+ </transaction-context>
+
+</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,7 +23,7 @@
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.test.BaseJbpmTestCase;
@@ -48,7 +48,7 @@
Object firstA;
Object firstB;
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
firstA = environment.get("a");
assertNotNull(firstA);
@@ -85,19 +85,19 @@
);
assertNotNull(environmentFactory);
- Environment outerEnvironment = environmentFactory.openEnvironment();
+ EnvironmentImpl outerEnvironment = environmentFactory.openEnvironment();
try {
- assertSame(outerEnvironment, Environment.getCurrent());
+ assertSame(outerEnvironment, EnvironmentImpl.getCurrent());
- Environment innerEnvironment = environmentFactory.openEnvironment();
+ EnvironmentImpl innerEnvironment = environmentFactory.openEnvironment();
try {
- assertSame(innerEnvironment, Environment.getCurrent());
+ assertSame(innerEnvironment, EnvironmentImpl.getCurrent());
} finally {
innerEnvironment.close();
}
- assertSame(outerEnvironment, Environment.getCurrent());
+ assertSame(outerEnvironment, EnvironmentImpl.getCurrent());
} finally {
outerEnvironment.close();
@@ -118,7 +118,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertNull(environment.get("unexisting element"));
@@ -135,7 +135,7 @@
);
assertNotNull(environmentFactory);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
assertNotNull(environmentFactoryCtxt);
@@ -156,7 +156,7 @@
);
assertNotNull(environmentFactory);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertNotNull(environment);
Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
@@ -176,7 +176,7 @@
);
assertNotNull(environmentFactory);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertNotNull(environment);
Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.env;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
@@ -47,7 +47,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals("environment-a", environment.get("a"));
@@ -69,7 +69,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
// only search in context 'process-engine' and then in 'environment'
@@ -94,7 +94,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
// only search in context 'process-engine'
@@ -119,7 +119,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
// create a new context
@@ -153,7 +153,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
// create a new context
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.env;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.test.BaseJbpmTestCase;
@@ -46,7 +46,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
A a = environment.get(A.class);
@@ -70,7 +70,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
A a = environment.get(A.class);
@@ -94,7 +94,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertNull(environment.get(Thread.class));
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.env;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.test.BaseJbpmTestCase;
@@ -43,24 +43,24 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
- assertSame(environment, Environment.getCurrent());
+ assertSame(environment, EnvironmentImpl.getCurrent());
Object outerB = environment.get("b");
assertNotNull(outerB);
- Environment nestedEnvironment = environmentFactory.openEnvironment();
+ EnvironmentImpl nestedEnvironment = environmentFactory.openEnvironment();
try {
- assertSame(nestedEnvironment, Environment.getCurrent());
+ assertSame(nestedEnvironment, EnvironmentImpl.getCurrent());
assertNotSame(outerB, nestedEnvironment.get("b"));
} finally {
nestedEnvironment.close();
}
- assertSame(environment, Environment.getCurrent());
+ assertSame(environment, EnvironmentImpl.getCurrent());
assertSame(outerB, environment.get("b"));
} finally {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.script.ScriptManager;
@@ -65,7 +65,7 @@
execution.setVariable("pv", "hello");
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals("hello", scriptManager.evaluateExpression("pv", "groovy"));
} finally {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.client.ClientExecution;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.env.ExecutionContext;
import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -62,7 +62,7 @@
execution.setVariable("pv", "hello");
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
environment.setContext(new ExecutionContext(execution));
try {
assertEquals("hello", scriptManager.evaluateExpression("#{pv}", null));
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -4,7 +4,7 @@
import java.util.List;
import org.jbpm.api.Configuration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -26,7 +26,7 @@
super.tearDown();
}
- public static Environment openEnvironment(String xmlString) {
+ public static EnvironmentImpl openEnvironment(String xmlString) {
EnvironmentFactory environmentFactory = (EnvironmentFactory)
new Configuration().setXmlString(xmlString).buildProcessEngine();
return environmentFactory.openEnvironment();
@@ -41,7 +41,7 @@
}
public void testEnlist() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -71,7 +71,7 @@
}
public void testEnlistRollback() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -101,7 +101,7 @@
}
public void testEnlistInOtherContext() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -134,7 +134,7 @@
}
public void testEnlistInOtherContextWithRollback() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -167,7 +167,7 @@
}
public void testEnlistNotAResource() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -191,7 +191,7 @@
}
public void testEnlistNotATransaction() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -215,7 +215,7 @@
}
public void testMissingTransactionName() {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.tx;
import org.jbpm.api.Configuration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.test.BaseJbpmTestCase;
@@ -45,7 +45,7 @@
}
}
- public static Environment openEnvironment(String xmlString) {
+ public static EnvironmentImpl openEnvironment(String xmlString) {
EnvironmentFactory environmentFactory = (EnvironmentFactory)
new Configuration().setXmlString(xmlString).buildProcessEngine();
return environmentFactory.openEnvironment();
@@ -58,7 +58,7 @@
TestResource resourceThree = null;
try {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -130,7 +130,7 @@
TestResource resourceThree = null;
try {
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.tx;
import org.jbpm.api.Configuration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.tx.StandardTransaction;
import org.jbpm.test.BaseJbpmTestCase;
@@ -33,7 +33,7 @@
*/
public class TransactionResourcesCommitTest extends BaseJbpmTestCase {
- public static Environment openEnvironment(String xmlString) {
+ public static EnvironmentImpl openEnvironment(String xmlString) {
EnvironmentFactory environmentFactory = (EnvironmentFactory)
new Configuration().setXmlString(xmlString).buildProcessEngine();
return environmentFactory.openEnvironment();
@@ -44,7 +44,7 @@
TestResource resourceOne = null;
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -81,7 +81,7 @@
TestResource resourceTwo = null;
TestResource resourceThree = null;
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -139,7 +139,7 @@
public void testFetchOneResourceOutOfManyCommit() {
TestResource resourceTwo = null;
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.tx;
import org.jbpm.api.Configuration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.tx.StandardTransaction;
@@ -34,7 +34,7 @@
*/
public class TransactionResourcesSetRollbackOnlyTest extends BaseJbpmTestCase {
- public static Environment openEnvironment(String xmlString) {
+ public static EnvironmentImpl openEnvironment(String xmlString) {
EnvironmentFactory environmentFactory = (EnvironmentFactory)
new Configuration().setXmlString(xmlString).buildProcessEngine();
return environmentFactory.openEnvironment();
@@ -45,7 +45,7 @@
TestResource resourceOne = null;
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -84,7 +84,7 @@
TestResource resourceTwo = null;
TestResource resourceThree = null;
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
@@ -144,7 +144,7 @@
public void testFetchOneResourceOutOfManySetRollbackOnly() {
TestResource resourceTwo = null;
- Environment environment = openEnvironment(
+ EnvironmentImpl environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
" <transaction-context>" +
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -2,7 +2,7 @@
import java.util.List;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.xml.Problem;
/**
@@ -82,14 +82,14 @@
public void testExternalClass() {
WireContext wireContext = createWireContext(
"<objects>" +
- " <class name='o' class-name='"+Environment.class.getName()+"' />" +
+ " <class name='o' class-name='"+EnvironmentImpl.class.getName()+"' />" +
"</objects>"
);
Object o = wireContext.get("o");
assertNotNull(o);
- assertEquals(org.jbpm.pvm.internal.env.Environment.class, o);
+ assertEquals(org.jbpm.pvm.internal.env.EnvironmentImpl.class, o);
}
}
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,7 +24,7 @@
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -87,7 +87,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environment.get("recorder"));
@@ -137,7 +137,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 3, events.size());
int index=0;
@@ -172,7 +172,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertNotNull(environment.get("o"));
@@ -212,7 +212,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
@@ -248,7 +248,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
@@ -296,7 +296,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertNotNull(environment.get("o"));
@@ -336,7 +336,7 @@
int index=0;
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
@@ -386,7 +386,7 @@
int index=0;
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
@@ -419,12 +419,12 @@
"</jbpm-configuration>"
);
- assertNull(Environment.getCurrent());
+ assertNull(EnvironmentImpl.getCurrent());
try {
environmentFactory.openEnvironment();
fail("expected exception");
} catch (WireException e) {
- assertNull(Environment.getCurrent());
+ assertNull(EnvironmentImpl.getCurrent());
assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe because context unexistingcontext doesn't exist", e.getMessage());
}
}
@@ -452,7 +452,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
WireContext transactionContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environment.get("a"));
@@ -510,7 +510,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environment.get("a"));
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -17,7 +17,7 @@
import java.util.Set;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -153,7 +153,7 @@
"<environment-scopes/>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Object foo = environment.get("foo");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.wire;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -21,14 +21,14 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try{
Object e = environment.get("e");
assertNotNull(e);
assertEquals(environment, e);
- assertEquals(e, ((Environment) e).get("e"));
+ assertEquals(e, ((EnvironmentImpl) e).get("e"));
} finally {
environment.close();
}
@@ -45,7 +45,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Object f = environment.get("f");
@@ -68,7 +68,7 @@
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Object c = environment.get("c");
@@ -92,7 +92,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Object c = environment.get("c");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,7 +1,7 @@
package org.jbpm.pvm.internal.wire;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.util.DefaultObservable;
import org.jbpm.pvm.internal.util.Observable;
@@ -55,7 +55,7 @@
" </transaction-context>" +
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable a = (Observable) environment.get("a");
assertNotNull(a);
@@ -97,7 +97,7 @@
" </transaction-context>" +
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable a = (Observable) environment.get("a");
assertNotNull(a);
@@ -138,7 +138,7 @@
" </transaction-context>" +
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable a = (Observable) environment.get("a");
assertNotNull(a);
@@ -196,7 +196,7 @@
" </transaction-context>" +
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable a = (Observable) environment.get("a");
assertNotNull(a);
@@ -251,7 +251,7 @@
" </transaction-context>" +
"</jbpm-configuration>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable a = (Observable) environment.get("a");
assertNotNull(a);
@@ -303,7 +303,7 @@
" </transaction-context>" +
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable a = (Observable) environment.get("a");
assertNotNull(a);
@@ -388,7 +388,7 @@
" </transaction-context>" +
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
OverloadingRecorder r = (OverloadingRecorder) environment.get("l");
assertNotNull(r);
@@ -443,7 +443,7 @@
" </transaction-context>" +
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
OverloadingRecorder r = (OverloadingRecorder) environment.get("l");
assertNotNull(r);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.wire;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.util.DefaultObservable;
import org.jbpm.pvm.internal.util.Observable;
@@ -50,7 +50,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable observable = (Observable) environment.get("o");
assertNotNull(observable);
@@ -92,7 +92,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable observable = (Observable) environment.get("o");
assertNotNull(observable);
@@ -141,7 +141,7 @@
);
int index=0;
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
// fire 2 events on newsletter: "look at our website" and "buy our product"
Observable newsletter = (Observable) environment.get("newsletter");
@@ -228,7 +228,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable observable = (Observable) environment.get("o");
assertNotNull(observable);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,7 +22,7 @@
package org.jbpm.pvm.internal.wire;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.util.DefaultObservable;
import org.jbpm.pvm.internal.util.Observable;
@@ -54,7 +54,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
Observable observable = (Observable) environment.get("o");
assertNotNull(observable);
@@ -97,7 +97,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
@@ -153,7 +153,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
@@ -229,7 +229,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
@@ -270,7 +270,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
assertEquals(events.toString(), 0, events.size());
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,7 +25,7 @@
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.env.Context;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -57,7 +57,7 @@
"</environment-scopes>"
);
- Environment environment = environmentFactory.openEnvironment();
+ EnvironmentImpl environment = environmentFactory.openEnvironment();
try {
WireContext environmentContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentTestCase.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,14 +21,14 @@
*/
package org.jbpm.pvm.test;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
/**
* @author Tom Baeyens
*/
public abstract class EnvironmentTestCase extends EnvironmentFactoryTestCase {
- protected Environment environment;
+ protected EnvironmentImpl environment;
public EnvironmentTestCase() {
}
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,13 +27,13 @@
import org.hibernate.Session;
import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.Transaction;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
-import org.jbpm.pvm.internal.type.variable.StringVariable;
import org.jbpm.test.JbpmTestCase;
/**
@@ -130,7 +130,7 @@
public static class SuccessfulSynchronization implements Synchronization {
public void beforeCompletion() {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
session.save(new HistoryCommentImpl("b) hello from before completion"));
}
@@ -168,7 +168,7 @@
public static class UnsuccessfulSynchronization implements Synchronization {
public void beforeCompletion() {
- Session session = Environment.getFromCurrent(Session.class);
+ Session session = EnvironmentImpl.getFromCurrent(Session.class);
session.save(new HistoryCommentImpl("b) hello from before completion"));
throw new MyOwnRuntimeException();
}
Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx (from rev 5489, jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx)
Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,43 +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.tx;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.Session;
-
-
-/**
- * @author Tom Baeyens
- */
-public abstract class TxCommand {
-
- protected Map<String, Object> params = new HashMap<String, Object>();
-
- public TxCommand setParam(String name, Object value) {
- params.put(name, value);
- return this;
- }
-
- public abstract Object execute(Session session);
-}
Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java (from rev 5489, jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java)
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java (rev 0)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,43 @@
+/*
+ * 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.tx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.Session;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public abstract class TxCommand {
+
+ protected Map<String, Object> params = new HashMap<String, Object>();
+
+ public TxCommand setParam(String name, Object value) {
+ params.put(name, value);
+ return this;
+ }
+
+ public abstract Object execute(Session session);
+}
Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,74 +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.tx;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.classic.Session;
-import org.hibernate.context.ThreadLocalSessionContext;
-
-
-/**
- * @author Tom Baeyens
- */
-public class TxTemplate {
-
- private SessionFactory sessionFactory;
-
- public TxTemplate(SessionFactory sessionFactory) {
- this.sessionFactory = sessionFactory;
- }
-
- public Object execute(TxCommand txCommand) {
- Session session = sessionFactory.openSession();
- Transaction transaction = session.beginTransaction();
- ThreadLocalSessionContext.bind(session);
- try {
- return txCommand.execute(session);
- } catch (Exception e) {
- transaction.rollback();
- } finally {
- ThreadLocalSessionContext.unbind(sessionFactory);
- if (!transaction.wasRolledBack()) {
- transaction.commit();
- }
- session.close();
- }
- return null;
- }
-
- public void execute(VoidTxCommand voidTxCommand) {
- execute(new VoidWrapper(voidTxCommand));
- }
-
- static class VoidWrapper extends TxCommand {
- VoidTxCommand voidTxCommand;
- public VoidWrapper(VoidTxCommand voidTxCommand) {
- this.voidTxCommand = voidTxCommand;
- this.params = voidTxCommand.params;
- }
- public Object execute(org.hibernate.Session session) {
- voidTxCommand.execute(session);
- return null;
- }
- }
-}
Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java (from rev 5489, jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java)
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java (rev 0)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/TxTemplate.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,74 @@
+/*
+ * 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.tx;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.classic.Session;
+import org.hibernate.context.ThreadLocalSessionContext;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class TxTemplate {
+
+ private SessionFactory sessionFactory;
+
+ public TxTemplate(SessionFactory sessionFactory) {
+ this.sessionFactory = sessionFactory;
+ }
+
+ public Object execute(TxCommand txCommand) {
+ Session session = sessionFactory.openSession();
+ Transaction transaction = session.beginTransaction();
+ ThreadLocalSessionContext.bind(session);
+ try {
+ return txCommand.execute(session);
+ } catch (Exception e) {
+ transaction.rollback();
+ } finally {
+ ThreadLocalSessionContext.unbind(sessionFactory);
+ if (!transaction.wasRolledBack()) {
+ transaction.commit();
+ }
+ session.close();
+ }
+ return null;
+ }
+
+ public void execute(VoidTxCommand voidTxCommand) {
+ execute(new VoidWrapper(voidTxCommand));
+ }
+
+ static class VoidWrapper extends TxCommand {
+ VoidTxCommand voidTxCommand;
+ public VoidWrapper(VoidTxCommand voidTxCommand) {
+ this.voidTxCommand = voidTxCommand;
+ this.params = voidTxCommand.params;
+ }
+ public Object execute(org.hibernate.Session session) {
+ voidTxCommand.execute(session);
+ return null;
+ }
+ }
+}
Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,46 +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.tx;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.Session;
-
-
-/** TxCommand without return value. This can be handy if you
- * don't want to type the 'return null;' at the end of a
- * transactional command.
- *
- * @author Tom Baeyens
- */
-public abstract class VoidTxCommand {
-
- protected Map<String, Object> params = new HashMap<String, Object>();
-
- public VoidTxCommand setParam(String name, Object value) {
- params.put(name, value);
- return this;
- }
-
- public abstract void execute(Session session);
-}
Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java (from rev 5489, jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java)
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java (rev 0)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/tx/VoidTxCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,46 @@
+/*
+ * 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.tx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.Session;
+
+
+/** TxCommand without return value. This can be handy if you
+ * don't want to type the 'return null;' at the end of a
+ * transactional command.
+ *
+ * @author Tom Baeyens
+ */
+public abstract class VoidTxCommand {
+
+ protected Map<String, Object> params = new HashMap<String, Object>();
+
+ public VoidTxCommand setParam(String name, Object value) {
+ params.put(name, value);
+ return this;
+ }
+
+ public abstract void execute(Session session);
+}
Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/HibernateLongIdTest.java
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/HibernateLongIdTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/HibernateLongIdTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -28,25 +28,24 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.cmd.ParamCommand;
import org.jbpm.test.JbpmCustomCfgTestCase;
+import org.jbpm.test.tx.TxCommand;
+import org.jbpm.test.tx.TxTemplate;
+import org.jbpm.test.tx.VoidTxCommand;
/**
- * @author Tom Baeyens
+ * @authorX Tom Baeyens
*/
public class HibernateLongIdTest extends JbpmCustomCfgTestCase {
- private TxTemplate txTemplate;
-
- protected void setUp() throws Exception {
- super.setUp();
- SessionFactory sessionFactory = processEngine.get(SessionFactory.class);
- this.txTemplate = new TxTemplate(sessionFactory);
- }
-
protected void deleteRegisteredDeployments() {
- txTemplate.execute(new TxCommand() {
- public Object execute(Session session) {
+ processEngine.execute(new Command<Void>() {
+ public Void execute(Environment environment) {
+ Session session = environment.get(Session.class);
for (String deploymentId : registeredDeployments) {
repositoryService.deleteDeploymentCascade(deploymentId);
}
@@ -55,15 +54,15 @@
for (Order order: orders) {
session.delete(order);
}
-
+
return null;
}
});
}
public void testHibernateLongId() {
- txTemplate.execute(new TxCommand() {
- public Object execute(Session session) {
+ processEngine.execute(new Command<Void>() {
+ public Void execute(Environment environment) {
deployJpdlXmlString(
"<process name='HibernateLongId'>" +
" <start>" +
@@ -76,8 +75,9 @@
}
});
- String processInstanceId = (String) txTemplate.execute(new TxCommand() {
- public Object execute(Session session) {
+ String processInstanceId = (String) processEngine.execute(new Command<String>() {
+ public String execute(Environment environment) {
+ Session session = environment.get(Session.class);
Order order = new Order();
order.setClient("Contador");
order.setProduct("Shampoo");
@@ -93,8 +93,9 @@
}
});
- txTemplate.execute(new TxCommand() {
- public Object execute(Session session) {
+ processEngine.execute(new ParamCommand<Void>() {
+ public Void execute(Environment environment) {
+ Session session = environment.get(Session.class);
String processInstanceId = (String) params.get("processInstanceId");
Order order = (Order) executionService.getVariable(processInstanceId, "order");
assertNotNull(order);
Deleted: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxCommand.java
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,43 +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.hibernatelongid;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.Session;
-
-
-/**
- * @author Tom Baeyens
- */
-public abstract class TxCommand {
-
- protected Map<String, Object> params = new HashMap<String, Object>();
-
- public TxCommand setParam(String name, Object value) {
- params.put(name, value);
- return this;
- }
-
- public abstract Object execute(Session session);
-}
Deleted: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxTemplate.java
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxTemplate.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatelongid/TxTemplate.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,66 +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.hibernatelongid;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.classic.Session;
-import org.hibernate.context.ThreadLocalSessionContext;
-
-
-/**
- * @author Tom Baeyens
- */
-public class TxTemplate {
-
- private SessionFactory sessionFactory;
-
- public TxTemplate(SessionFactory sessionFactory) {
- this.sessionFactory = sessionFactory;
- }
-
- public Object execute(TxCommand txCommand) {
- Session session = sessionFactory.openSession();
- Transaction transaction = session.beginTransaction();
- ThreadLocalSessionContext.bind(session);
- try {
- return txCommand.execute(session);
- } catch (Exception e) {
- transaction.rollback();
- } finally {
- ThreadLocalSessionContext.unbind(sessionFactory);
- if (!transaction.wasRolledBack()) {
- transaction.commit();
- }
- session.close();
- }
- return null;
- }
-
- public SessionFactory getSessionFactory() {
- return sessionFactory;
- }
-
- public void setSessionFactory(SessionFactory sessionFactory) {
- this.sessionFactory = sessionFactory;
- }
-}
Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatestringid/HibernateStringIdTest.java
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatestringid/HibernateStringIdTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/hibernatestringid/HibernateStringIdTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,12 +25,13 @@
import java.util.List;
import java.util.Map;
+import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.classic.Session;
-import org.hibernate.context.ThreadLocalSessionContext;
import org.jbpm.api.ProcessInstance;
import org.jbpm.test.JbpmCustomCfgTestCase;
+import org.jbpm.test.tx.TxCommand;
+import org.jbpm.test.tx.TxTemplate;
+import org.jbpm.test.tx.VoidTxCommand;
/**
@@ -38,89 +39,69 @@
*/
public class HibernateStringIdTest extends JbpmCustomCfgTestCase {
- protected void deleteRegisteredDeployments() {
+ private TxTemplate txTemplate;
+
+ protected void setUp() throws Exception {
+ super.setUp();
SessionFactory sessionFactory = processEngine.get(SessionFactory.class);
-
- Session session = sessionFactory.openSession();
- Transaction transaction = session.beginTransaction();
- ThreadLocalSessionContext.bind(session);
+ this.txTemplate = new TxTemplate(sessionFactory);
+ }
- try {
- super.deleteRegisteredDeployments();
-
- List<Order> orders = session.createQuery("from "+Order.class.getName()).list();
- for (Order order: orders) {
- session.delete(order);
- }
+ protected void deleteRegisteredDeployments() {
+ txTemplate.execute(new VoidTxCommand() {
+ public void execute(Session session) {
+ for (String deploymentId : registeredDeployments) {
+ repositoryService.deleteDeploymentCascade(deploymentId);
+ }
- } finally {
- ThreadLocalSessionContext.unbind(sessionFactory);
- transaction.commit();
- session.close();
- }
+ List<Order> orders = session.createQuery("from "+Order.class.getName()).list();
+ for (Order order: orders) {
+ session.delete(order);
+ }
+ }
+ });
}
public void testHibernateStringId() {
- SessionFactory sessionFactory = processEngine.get(SessionFactory.class);
-
- Session session = sessionFactory.openSession();
- Transaction transaction = session.beginTransaction();
- ThreadLocalSessionContext.bind(session);
+ txTemplate.execute(new VoidTxCommand() {
+ public void execute(Session session) {
+ deployJpdlXmlString(
+ "<process name='HibernateStringId'>" +
+ " <start>" +
+ " <transition to='a' />" +
+ " </start>" +
+ " <state name='a' />" +
+ "</process>"
+ );
+ }
+ });
- try {
- deployJpdlXmlString(
- "<process name='HibernateStringId'>" +
- " <start>" +
- " <transition to='a' />" +
- " </start>" +
- " <state name='a' />" +
- "</process>"
- );
- } finally {
- ThreadLocalSessionContext.unbind(sessionFactory);
- transaction.commit();
- session.close();
- }
+ String processInstanceId = (String) txTemplate.execute(new TxCommand() {
+ public Object execute(Session session) {
+ Order order = new Order("order1");
+ order.setClient("Contador");
+ order.setProduct("Shampoo");
+
+ session.save(order);
+ session.flush();
+
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("order", order);
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("HibernateStringId", variables);
+ return processInstance.getId();
+ }
+ });
- String processInstanceId;
-
- session = sessionFactory.openSession();
- transaction = session.beginTransaction();
- ThreadLocalSessionContext.bind(session);
-
- try {
- Order order = new Order("order1");
- order.setClient("Contador");
- order.setProduct("Shampoo");
-
- session.save(order);
- session.flush();
-
- Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("order", order);
-
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("HibernateStringId", variables);
- processInstanceId = processInstance.getId();
-
- } finally {
- ThreadLocalSessionContext.unbind(sessionFactory);
- transaction.commit();
- session.close();
- }
-
- session = sessionFactory.openSession();
- transaction = session.beginTransaction();
- ThreadLocalSessionContext.bind(session);
-
- try {
- Order order = (Order) executionService.getVariable(processInstanceId, "order");
- assertNotNull(order);
- assertEquals("Contador", order.getClient());
- assertEquals("Shampoo", order.getProduct());
- } finally {
- ThreadLocalSessionContext.unbind(sessionFactory);
- transaction.commit();
- session.close();
- }
+ txTemplate.execute(new VoidTxCommand() {
+ public void execute(Session session) {
+ String processInstanceId = (String) params.get("processInstanceId");
+ Order order = (Order) executionService.getVariable(processInstanceId, "order");
+ assertNotNull(order);
+ assertEquals("Contador", order.getClient());
+ assertEquals("Shampoo", order.getProduct());
+ }
+ }.setParam("processInstanceId", processInstanceId)
+ );
}
}
Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/logging.properties 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,10 +1,12 @@
handlers= java.util.logging.ConsoleHandler
redirect.commons.logging = enabled
-java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.level = FINEST
java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter
org.jbpm.level=FINE
+org.jbpm.pvm.internal.tx.level=FINEST
+# org.jbpm.pvm.internal.wire.level=FINEST
# org.jbpm.pvm.internal.tx.level=FINE
# org.jbpm.pvm.internal.wire.level=FINE
# org.jbpm.pvm.internal.util.level=FINE
Deleted: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbpm-configuration>
-
- <import resource="jbpm.businesscalendar.cfg.xml" />
- <import resource="org/jbpm/test/hibernatelongid/jbpm.tx.hibernate.cfg.xml" />
- <import resource="jbpm.jpdl.cfg.xml" />
- <import resource="jbpm.identity.cfg.xml" />
-
- <process-engine-context>
-
- <repository-service />
- <repository-cache />
- <execution-service />
- <history-service />
- <management-service />
- <identity-service />
- <task-service />
-
- <hibernate-configuration>
- <cfg resource="org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml" />
- </hibernate-configuration>
-
- <hibernate-session-factory />
-
- <script-manager default-expression-language="juel"
- default-script-language="juel">
- <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
- </script-manager>
-
- <id-generator />
- <types resource="jbpm.variable.types.xml" />
-
- <address-resolver />
-
- <mail-template name='task-notification'>
- <to users="${task.assignee}"/>
- <subject>${task.name}</subject>
- <text><![CDATA[Hi ${task.assignee},
-Task "${task.name}" has been assigned to you.
-${task.description}
-
-Sent by JBoss jBPM
-]]></text>
- </mail-template>
-
- <mail-template name='task-reminder'>
- <to users="${task.assignee}"/>
- <subject>${task.name}</subject>
- <text><![CDATA[Hey ${task.assignee},
-Do not forget about task "${task.name}".
-${task.description}
-
-Sent by JBoss jBPM
-]]></text>
- </mail-template>
-
- </process-engine-context>
-
- <transaction-context>
- <repository-session />
- <db-session />
-
- <message-session />
- <timer-session />
- <history-session />
- <mail-session>
- <mail-server>
- <session-properties resource="jbpm.mail.properties" />
- </mail-server>
- </mail-session>
- </transaction-context>
-
-</jbpm-configuration>
Copied: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml (from rev 5489, jbpm4/branches/tbaeyens/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml)
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <import resource="jbpm.businesscalendar.cfg.xml" />
+ <import resource="jbpm.tx.cmd.cfg.xml" />
+ <import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.identity.cfg.xml" />
+
+ <process-engine-context>
+
+ <repository-service />
+ <repository-cache />
+ <execution-service />
+ <history-service />
+ <management-service />
+ <identity-service />
+ <task-service />
+
+ <hibernate-configuration>
+ <cfg resource="org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml" />
+ </hibernate-configuration>
+
+ <hibernate-session-factory />
+
+ <script-manager default-expression-language="juel"
+ default-script-language="juel">
+ <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />
+ </script-manager>
+
+ <id-generator />
+ <types resource="jbpm.variable.types.xml" />
+
+ <address-resolver />
+
+ <mail-template name='task-notification'>
+ <to users="${task.assignee}"/>
+ <subject>${task.name}</subject>
+ <text><![CDATA[Hi ${task.assignee},
+Task "${task.name}" has been assigned to you.
+${task.description}
+
+Sent by JBoss jBPM
+]]></text>
+ </mail-template>
+
+ <mail-template name='task-reminder'>
+ <to users="${task.assignee}"/>
+ <subject>${task.name}</subject>
+ <text><![CDATA[Hey ${task.assignee},
+Do not forget about task "${task.name}".
+${task.description}
+
+Sent by JBoss jBPM
+]]></text>
+ </mail-template>
+
+ </process-engine-context>
+
+ <transaction-context>
+ <repository-session />
+ <db-session />
+
+ <message-session />
+ <timer-session />
+ <history-session />
+ <mail-session>
+ <mail-server>
+ <session-properties resource="jbpm.mail.properties" />
+ </mail-server>
+ </mail-session>
+ </transaction-context>
+
+</jbpm-configuration>
Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml 2009-08-18 15:12:29 UTC (rev 5490)
@@ -15,9 +15,6 @@
<property name="hibernate.hbm2ddl.auto">create-drop</property>
<property name="hibernate.format_sql">true</property>
- <!-- Enable Hibernate's automatic session context management -->
- <property name="current_session_context_class">thread</property>
-
<mapping resource="jbpm.repository.hbm.xml" />
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
Deleted: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.tx.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.tx.hibernate.cfg.xml 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.tx.hibernate.cfg.xml 2009-08-18 15:12:29 UTC (rev 5490)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbpm-configuration>
-
- <process-engine-context>
- <command-service>
- <retry-interceptor />
- <environment-interceptor />
- </command-service>
- </process-engine-context>
-
- <transaction-context>
- <hibernate-session current="true" />
- </transaction-context>
-
-</jbpm-configuration>
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,9 +27,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.ReflectUtil;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,9 +25,9 @@
import java.util.List;
import org.hibernate.Session;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.model.OpenProcessDefinition;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveMessagesTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -29,10 +29,10 @@
import org.jbpm.api.Execution;
import org.jbpm.api.activity.ActivityExecution;
import org.jbpm.api.activity.ExternalActivityBehaviour;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.StartProcessInstanceCmd;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,9 +27,9 @@
import org.hibernate.Session;
import org.jbpm.api.Execution;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -26,10 +26,10 @@
import java.util.List;
import org.hibernate.Session;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.session.MessageSession;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceTestCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,10 +21,10 @@
*/
package org.jbpm.test.load.async;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.session.DbSession;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -23,12 +23,10 @@
import java.util.List;
-import org.hibernate.Session;
import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.job.Job;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
-import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.session.MessageSession;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,10 +21,8 @@
*/
package org.jbpm.test.load.async;
-import org.jbpm.api.history.HistoryComment;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
-import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/GenerateExceptionTestCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -21,8 +21,8 @@
*/
package org.jbpm.test.load.async;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -27,9 +27,9 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.cmd.CommandService;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.test.JbpmTestCase;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageCommand.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -24,8 +24,8 @@
import java.util.Random;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,9 +25,9 @@
import java.util.List;
import org.hibernate.Session;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -22,8 +22,8 @@
package org.jbpm.test.load.messages;
import org.hibernate.Session;
-import org.jbpm.pvm.internal.cmd.Command;
-import org.jbpm.pvm.internal.env.Environment;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-08-18 14:05:46 UTC (rev 5489)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2009-08-18 15:12:29 UTC (rev 5490)
@@ -25,12 +25,12 @@
import java.util.List;
import org.hibernate.Session;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.api.cmd.Environment;
import org.jbpm.api.history.HistoryComment;
import org.jbpm.internal.log.Log;
-import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CompositeCmd;
import org.jbpm.pvm.internal.cmd.SendMessageCmd;
-import org.jbpm.pvm.internal.env.Environment;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
Copied: jbpm4/trunk/qa/hudson-jbpm4-cfg.bat (from rev 5489, jbpm4/branches/tbaeyens/qa/hudson-jbpm4-cfg.bat)
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-cfg.bat (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-cfg.bat 2009-08-18 15:12:29 UTC (rev 5490)
@@ -0,0 +1,8 @@
+@echo off
+
+mvn clean install
+cd modules\test-cfg
+mvn clean test
+cd ..\..
+
+echo
16 years, 8 months
- 1
- 0