JBoss JBPM SVN: r1715 - in jbpm4/pvm/trunk: modules/core and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-07-24 10:46:43 -0400 (Thu, 24 Jul 2008)
New Revision: 1715
Modified:
jbpm4/pvm/trunk/.classpath
jbpm4/pvm/trunk/modules/core/pom.xml
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java
jbpm4/pvm/trunk/pom.xml
Log:
added juel and javax-el-api dependencies
Modified: jbpm4/pvm/trunk/.classpath
===================================================================
--- jbpm4/pvm/trunk/.classpath 2008-07-24 14:29:59 UTC (rev 1714)
+++ jbpm4/pvm/trunk/.classpath 2008-07-24 14:46:43 UTC (rev 1715)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/java"/>
- <classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/resources"/>
- <classpathentry kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/java"/>
- <classpathentry kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/java"/>
+ <classpathentry kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="modules/core/target/classes" path="modules/core/src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="modules/core/target/test-classes" path="modules/core/src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: jbpm4/pvm/trunk/modules/core/pom.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
+++ jbpm4/pvm/trunk/modules/core/pom.xml 2008-07-24 14:46:43 UTC (rev 1715)
@@ -94,6 +94,27 @@
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-engine</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+
</dependencies>
<!-- Plugins -->
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java 2008-07-24 14:29:59 UTC (rev 1714)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/expr/ExpressionTest.java 2008-07-24 14:46:43 UTC (rev 1715)
@@ -21,6 +21,8 @@
*/
package org.jbpm.pvm.expr;
+import javax.el.ExpressionFactory;
+
import org.jbpm.pvm.samples.activities.WaitState;
import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.client.ClientProcessInstance;
@@ -47,7 +49,7 @@
" read-contexts='execution, environment, environment-factory' " +
" write-context='execution'>" +
" <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" +
- " <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" +
+// " <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" +
" </script-manager>" +
" </environment-factory>" +
"</contexts>"
@@ -59,11 +61,10 @@
.node("unused").initial().behaviour(WaitState.class)
.done().beginProcessInstance();
execution.setVariable("pv", "hello");
-
Environment environment = environmentFactory.openEnvironment();
try {
assertEquals("hello", scriptManager.evaluateExpression("#{pv}", execution, null));
- assertEquals("hello", scriptManager.evaluateExpression("pv", execution, "groovy"));
+ // assertEquals("hello", scriptManager.evaluateExpression("pv", execution, "groovy"));
} finally {
environment.close();
}
Modified: jbpm4/pvm/trunk/pom.xml
===================================================================
--- jbpm4/pvm/trunk/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
+++ jbpm4/pvm/trunk/pom.xml 2008-07-24 14:46:43 UTC (rev 1715)
@@ -48,6 +48,8 @@
<jsr233.version>2.0.3</jsr233.version>
<jboss.seam.version>2.0.1.GA</jboss.seam.version>
<cactus.version>13-1.7.1</cactus.version>
+ <juel.version>2.1.0</juel.version>
+ <javax.el.api.version>1.0</javax.el.api.version>
</properties>
<!-- DependencyManagement -->
@@ -126,6 +128,31 @@
<artifactId>cactus</artifactId>
<version>${cactus.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel</artifactId>
+ <version>${juel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-engine</artifactId>
+ <version>${juel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-impl</artifactId>
+ <version>${juel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${javax.el.api.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -142,9 +169,13 @@
<!-- DistributionManagement -->
<distributionManagement>
<site>
- <id>jbws.dyndns.org</id>
- <url>file:///home/tdiesler/workspace/jbpm-site</url>
+ <id>local.site</id>
+ <url>file:///${publications}/pvm/site</url>
</site>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>file:///${publications}/repository.jboss.org</url>
+ </repository>
</distributionManagement>
<!-- Profiles -->
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1714 - in jbossbpm/impl/jbpm3/trunk: modules/bamconsole and 15 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-24 10:29:59 -0400 (Thu, 24 Jul 2008)
New Revision: 1714
Modified:
jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ear/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ejb/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/bamconsole/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/bamconsole/war/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/enterprise/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jbpm4jsf/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/db/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/examples/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/simulation/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/userguide/pom.xml
jbossbpm/impl/jbpm3/trunk/modules/jpdl/ws/pom.xml
jbossbpm/impl/jbpm3/trunk/pom.xml
jbossbpm/impl/jbpm3/trunk/profiles.xml.example
Log:
Set version to 3.3.0-SNAPSHOT
Modified: jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ear/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ear/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ear/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-bam</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ejb/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ejb/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/bamconsole/ejb/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-bam</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/bamconsole/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/bamconsole/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/bamconsole/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Modules -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/bamconsole/war/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/bamconsole/war/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/bamconsole/war/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-bam</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/console/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/distribution/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
@@ -50,11 +50,11 @@
<artifactId>jbpm-jpdl-identity</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl-integration</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>izpack</groupId>
<artifactId>standalone-compiler</artifactId>
Modified: jbossbpm/impl/jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/enterprise/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/enterprise/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jbpm4jsf/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jbpm4jsf/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jbpm4jsf/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/db/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/db/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/db/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/examples/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/examples/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/examples/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/simulation/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/simulation/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/simulation/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/userguide/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/userguide/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/userguide/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
</project>
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/ws/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/ws/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/ws/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: jbossbpm/impl/jbpm3/trunk/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/pom.xml 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/pom.xml 2008-07-24 14:29:59 UTC (rev 1714)
@@ -16,7 +16,7 @@
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>3.2.4-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: jbossbpm/impl/jbpm3/trunk/profiles.xml.example
===================================================================
--- jbossbpm/impl/jbpm3/trunk/profiles.xml.example 2008-07-24 14:24:54 UTC (rev 1713)
+++ jbossbpm/impl/jbpm3/trunk/profiles.xml.example 2008-07-24 14:29:59 UTC (rev 1714)
@@ -11,7 +11,7 @@
</property>
</activation>
<properties>
- <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+ <jboss422.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
</properties>
</profile>
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1713 - in jbossbpm/spec/trunk: modules/api/src/main/java/org/jboss/bpm and 12 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-24 10:24:54 -0400 (Thu, 24 Jul 2008)
New Revision: 1713
Added:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/BPMException.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessTimeoutException.java
Removed:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/JBPMException.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/
jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/context/
Modified:
jbossbpm/spec/trunk/.classpath
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/EngineShutdownException.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/InvalidProcessException.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
Log:
WIP
Modified: jbossbpm/spec/trunk/.classpath
===================================================================
--- jbossbpm/spec/trunk/.classpath 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/.classpath 2008-07-24 14:24:54 UTC (rev 1713)
@@ -2,12 +2,11 @@
<classpath>
<classpathentry kind="src" output="modules/api/target/classes" path="modules/api/src/main/java"/>
<classpathentry kind="src" path="modules/ri/src/main/java"/>
+ <classpathentry kind="src" output="modules/testsuite/target/test-classes" path="modules/testsuite/src/test/java"/>
<classpathentry kind="src" path="modules/dialects/api10/src/main/java"/>
- <classpathentry kind="src" path="modules/dialects/stp/src/test/java"/>
<classpathentry kind="src" path="modules/dialects/stp/src/main/java"/>
<classpathentry kind="src" path="modules/dialects/xpdl21/src/main/java"/>
<classpathentry kind="src" path="modules/dialects/jpdl32/src/main/java"/>
- <classpathentry kind="src" output="modules/testsuite/target/test-classes" path="modules/testsuite/src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/BPMException.java (from rev 1699, jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/JBPMException.java)
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/BPMException.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/BPMException.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -0,0 +1,56 @@
+/*
+ * 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.jboss.bpm;
+
+// $Id$
+
+/**
+ * A RuntimeException that can be thrown for unrecoverable API errors
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class BPMException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ public BPMException()
+ {
+ super();
+ }
+
+ public BPMException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public BPMException(String message)
+ {
+ super(message);
+ }
+
+ public BPMException(Throwable cause)
+ {
+ super(cause);
+ }
+
+}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/EngineShutdownException.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/EngineShutdownException.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/EngineShutdownException.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -30,7 +30,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class EngineShutdownException extends JBPMException {
+public class EngineShutdownException extends BPMException {
/**
*
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/InvalidProcessException.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/InvalidProcessException.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/InvalidProcessException.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -30,7 +30,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class InvalidProcessException extends JBPMException
+public class InvalidProcessException extends BPMException
{
/**
*
Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/JBPMException.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/JBPMException.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/JBPMException.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -1,55 +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.jboss.bpm;
-
-// $Id$
-
-/**
- * A RuntimeException that can be thrown for unrecoverable API errors
- *
- * @author thomas.diesler(a)jboss.com
- * @since 18-Jun-2008
- */
-public class JBPMException extends RuntimeException {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- public JBPMException() {
- super();
- }
-
- public JBPMException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public JBPMException(String message) {
- super(message);
- }
-
- public JBPMException(Throwable cause) {
- super(cause);
- }
-
-}
Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessTimeoutException.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessTimeoutException.java (rev 0)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessTimeoutException.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -0,0 +1,55 @@
+/*
+ * 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.jboss.bpm;
+
+// $Id$
+
+/**
+ * A RuntimeException that is thrown when the process does not respond in time
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Jul-2008
+ */
+public class ProcessTimeoutException extends BPMException
+{
+ private static final long serialVersionUID = 1L;
+
+ public ProcessTimeoutException()
+ {
+ super();
+ }
+
+ public ProcessTimeoutException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public ProcessTimeoutException(String message)
+ {
+ super(message);
+ }
+
+ public ProcessTimeoutException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessTimeoutException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -23,10 +23,7 @@
// $Id$
-import java.util.concurrent.Future;
-
import org.jboss.bpm.model.FlowObject;
-import org.jboss.bpm.model.Result;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.runtime.ExecutionHandler;
@@ -57,7 +54,7 @@
* @param att The Attachments in the ExecutionContext
* @return The Future from which to obtain the process result
*/
- public abstract Future<Result> startProcess(RuntimeProcess proc, Attachments att);
+ public abstract void startProcess(RuntimeProcess proc, Attachments att);
/**
* Locate the signal manager
@@ -71,19 +68,30 @@
protected ExecutionHandler getExecutionHandler(FlowObject target)
{
HandlerSupport exfo = getHandlerSupport(target);
- return exfo.getExecutionHandler();
+ ExecutionHandler handler = exfo.getExecutionHandler();
+ if (handler == null)
+ throw new IllegalStateException("Cannot obtain execution handler from: " + target);
+ return handler;
}
protected SignalHandler getSignalHandler(FlowObject target)
{
HandlerSupport exfo = getHandlerSupport(target);
- return exfo.getSignalHandler();
+ SignalHandler handler = exfo.getSignalHandler();
+ if (handler == null)
+ throw new IllegalStateException("Cannot obtain signal handler from: " + target);
+
+ return handler;
}
protected FlowHandler getFlowHandler(FlowObject target)
{
HandlerSupport exfo = getHandlerSupport(target);
- return exfo.getFlowHandler();
+ FlowHandler handler = exfo.getFlowHandler();
+ if (handler == null)
+ throw new IllegalStateException("Cannot obtain flow handler from: " + target);
+
+ return handler;
}
protected void throwSignal(Signal signal)
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -25,7 +25,7 @@
import java.net.URL;
-import org.jboss.bpm.JBPMException;
+import org.jboss.bpm.BPMException;
import org.jboss.bpm.client.internal.EmbeddedBeansDeployer;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.util.KernelLocator;
@@ -85,7 +85,7 @@
String config = ProcessEngine.JBPM_ENGINE_CONFIG;
URL url = Thread.currentThread().getContextClassLoader().getResource(config);
if (url == null)
- throw new JBPMException("Cannot find resource: " + config);
+ throw new BPMException("Cannot find resource: " + config);
new EmbeddedBeansDeployer().deploy(url);
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -32,13 +32,18 @@
import java.util.Map;
import java.util.Set;
+import javax.management.ObjectName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.BPMException;
import org.jboss.bpm.EngineShutdownException;
+import org.jboss.bpm.ProcessTimeoutException;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Process.Status;
+import org.jboss.bpm.runtime.Attachments;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -143,6 +148,23 @@
}
/**
+ * Get a Process for a given id
+ *
+ * @throws
+ */
+ public Process getProcessByID(ObjectName id)
+ {
+ for (Process aux : procs)
+ {
+ if (aux.getID().equals(id))
+ {
+ return aux;
+ }
+ }
+ throw new BPMException("Cannot find process: " + id);
+ }
+
+ /**
* Register a Process
*/
public final boolean registerProcess(Process proc)
@@ -155,9 +177,53 @@
*/
public void removeProcess(Process proc)
{
- procs.remove(proc.getName());
+ procs.remove(proc);
}
+ /**
+ * Start a Process with a given process ID
+ */
+ public abstract ObjectName startProcess(ObjectName id, Attachments att);
+
+ /**
+ * Wait for the Process to end. All Tokens that are generated at the Start Event for that Process must eventually
+ * arrive at an End Event. The Process will be in a running state until all Tokens are consumed.
+ *
+ * @param id
+ * @param timeout
+ */
+ public void waitForEnd(ObjectName id, long timeout)
+ {
+ Process proc = getProcessByID(id);
+ Status status = proc.getStatus();
+
+ if (status != Status.Active)
+ throw new IllegalStateException("Cannot wait for process in state: " + status);
+
+ boolean forever = (timeout < 1);
+ long now = System.currentTimeMillis();
+ long until = now + timeout;
+ try
+ {
+ while (forever || now < until)
+ {
+ status = proc.getStatus();
+ if (status == Status.Cancelled || status == Status.Aborted || status == Status.Completed)
+ {
+ return;
+ }
+ Thread.currentThread().sleep(100);
+ now = System.currentTimeMillis();
+ }
+ }
+ catch (InterruptedException ex)
+ {
+ log.warn(ex);
+ }
+
+ throw new ProcessTimeoutException("Process timeout for: " + id);
+ }
+
private String getNamespaceURI(InputStream inStream)
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -172,12 +238,12 @@
{
throw new IllegalStateException("Cannot parse process descriptor", ex);
}
-
+
Element root = doc.getDocumentElement();
String nsURI = root.getNamespaceURI();
if (nsURI == null)
throw new IllegalStateException("Cannot get namespace URI from root element");
-
+
return nsURI;
}
@@ -187,7 +253,7 @@
String dialectId = dialectRegistry.getDialect(nsURI);
if (dialectId == null)
throw new IllegalStateException("No dialect registered for: " + nsURI);
-
+
DialectHandler dialectHandler = dialectHandlers.get(dialectId);
if (dialectHandler == null)
throw new IllegalStateException("No dialect handler registered for: " + dialectId);
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.JBPMException;
+import org.jboss.bpm.BPMException;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
@@ -61,7 +61,7 @@
}
catch (Throwable e)
{
- throw new JBPMException("Cannot bootstrap kernel", e);
+ throw new BPMException("Cannot bootstrap kernel", e);
}
}
deployer = new BasicXMLDeployer(kernel);
@@ -82,12 +82,12 @@
// The KernelLocator is expected to get deployed as a bean
if (KernelLocator.getKernel() == null)
- throw new JBPMException("KernelLocator not deployed as MC bean");
+ throw new BPMException("KernelLocator not deployed as MC bean");
}
catch (Throwable e)
{
- throw new JBPMException("Cannot deploy beans from: " + url, e);
+ throw new BPMException("Cannot deploy beans from: " + url, e);
}
}
@@ -103,7 +103,7 @@
}
catch (Throwable e)
{
- throw new JBPMException("Cannot undeploy beans from: " + url, e);
+ throw new BPMException("Cannot undeploy beans from: " + url, e);
}
}
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -23,21 +23,27 @@
//$Id$
+import java.io.Serializable;
+
+import javax.management.ObjectName;
+
/**
* The parrent of all BPMN elements
*
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
*/
-public interface BPMNElement
+public interface BPMNElement extends Serializable
{
- /**
- * Get the associated Process
- */
- Process getProcess();
-
+ public static final String ID_DOMAIN = "jboss.bpm";
+
/**
* Get the ID of this element
*/
- String getID();
+ ObjectName getID();
+
+ /**
+ * Get the associated Process
+ */
+ Process getProcess();
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -24,8 +24,9 @@
//$Id: MultipleInFlowSupport.java 1627 2008-07-14 15:16:28Z thomas.diesler(a)jboss.com $
import java.util.List;
-import java.util.concurrent.Future;
+import javax.management.ObjectName;
+
import org.jboss.bpm.runtime.Attachments;
/**
@@ -41,7 +42,7 @@
*/
enum ProcessType
{
- None, Private, Abstract, Collaboration
+ None, Private, Abstract, Collaboration
};
/**
@@ -49,14 +50,14 @@
*/
enum Status
{
- None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
+ None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed
};
/**
* Get the process type
*/
ProcessType getProcessType();
-
+
/**
* Get the process state
*/
@@ -68,48 +69,48 @@
List<FlowObject> getFlowObjects();
/**
- * One or more Performers MAY be entered. The Performers attribute defines the
- * resource that will be responsible for the Process. The Performers entry could be in
- * the form of a specific individual, a group, an organization role or position, or an
- * organization.
+ * One or more Performers MAY be entered. The Performers attribute defines the resource that will be responsible for
+ * the Process. The Performers entry could be in the form of a specific individual, a group, an organization role or
+ * position, or an organization.
*/
List<String> getPerformers();
-
+
/**
- * One or more assignment expressions MAY be made for the object. The
- * Assignment SHALL be performed as defined by the AssignTime attribute.
+ * One or more assignment expressions MAY be made for the object. The Assignment SHALL be performed as defined by the
+ * AssignTime attribute.
*/
List<String> getAssignments();
-
+
/**
- * Modeler-defined Properties MAY be added to a Process. These Properties are
- * “local” to the Process. All Tasks, Sub-Process objects, and Sub-Processes that are
- * embedded SHALL have access to these Properties. The fully delineated name of
- * these properties are “<process name>.<property name>” (e.g., “Add Customer.Customer Name”).
- * If a process is embedded within another Process, then the fully delineated name SHALL
- * also be preceded by the Parent Process name for as many Parents there are until the top level Process.
+ * Modeler-defined Properties MAY be added to a Process. These Properties are “local” to the Process. All Tasks,
+ * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully
+ * delineated name of these properties are “<process name>.<property name>” (e.g., “Add Customer.Customer Name”). If a
+ * process is embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent
+ * Process name for as many Parents there are until the top level Process.
*/
List<Property> getProperties();
/**
- * The InputSets attribute defines the data requirements for input to the Process.
- * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the
- * Process to be performed (if it has first been instantiated by the appropriate signal
- * arriving from an incoming Sequence Flow)
+ * The InputSets attribute defines the data requirements for input to the Process. Zero or more InputSets MAY be
+ * defined. Each Input set is sufficient to allow the Process to be performed (if it has first been instantiated by
+ * the appropriate signal arriving from an incoming Sequence Flow)
*/
List<InputSet> getInputSets();
-
+
/**
- * The OutputSets attribute defines the data requirements for output from the
- * Process. Zero or more OutputSets MAY be defined. At the completion of the
- * Process, only one of the OutputSets may be produced--It is up to the
- * implementation of the Process to determine which set will be produced. However,
- * the IORules attribute MAY indicate a relationship between an OutputSet and an
- * InputSet that started the Process.
+ * The OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be
+ * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the
+ * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate
+ * a relationship between an OutputSet and an InputSet that started the Process.
*/
List<OutputSet> getOutputSets();
-
+
// Not Part of BPMN ========================================================================
+
+ /**
+ * Make a deep copy of the process
+ */
+ Process copyProcess();
/**
* Get the start event
@@ -121,13 +122,18 @@
*/
List<EndEvent> getEndEvents();
+ /**
+ * Start the process
+ * @return the process instance identifier
+ */
+ ObjectName startProcess();
- /** Start the process */
- Future<Result> startProcess();
+ /**
+ * Start the process, with a given execution context
+ * @return the process instance identifier
+ */
+ ObjectName startProcess(Attachments att);
- /** Start the process, with a given execution context */
- Future<Result> startProcess(Attachments att);
-
/**
* Find a flow object by name
*
@@ -135,5 +141,19 @@
*/
FlowObject findFlowObject(String name);
-
+ /**
+ * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
+ * The Process will be in a running state until all Tokens are consumed.
+ * <p/>
+ * This method until the process ends without timeout.
+ */
+ void waitForEnd();
+
+ /**
+ * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event.
+ * The Process will be in a running state until all Tokens are consumed.
+ * <p/>
+ * This method until the process ends with a given timeout.
+ */
+ void waitForEnd(long timeout);
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.JBPMException;
+import org.jboss.bpm.BPMException;
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.internal.EmbeddedBeansDeployer;
import org.jboss.bpm.model.Signal;
@@ -98,7 +98,7 @@
{
URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
if (url == null)
- throw new JBPMException("Cannot find resource: " + resourceName);
+ throw new BPMException("Cannot find resource: " + resourceName);
return url;
}
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -38,10 +38,7 @@
*/
protected String getDialect()
{
- String dialect = System.getProperty("jbpm.dialect");
- if (dialect == null)
- throw new IllegalStateException ("Cannot obtain jbpm.dialect");
-
+ String dialect = System.getProperty("jbpm.dialect", "api10");
return dialect;
}
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -23,21 +23,13 @@
// $Id$
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.Flow;
import org.jboss.bpm.model.FlowObject;
import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Result;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.model.internal.SequenceFlowImpl;
@@ -67,9 +59,10 @@
}
@Override
- public Future<Result> startProcess(RuntimeProcess rtProc, Attachments att)
+ public void startProcess(RuntimeProcess rtProc, Attachments att)
{
Process proc = rtProc.getProcess();
+
throwSignal(new Signal(proc, Signal.Type.ENTER_PROCESS));
MutableFlowScheduler flowScheduler = rtProc.getFlowScheduler();
try
@@ -114,7 +107,6 @@
{
throwSignal(new Signal(proc, Signal.Type.EXIT_PROCESS));
}
- return new ResultFuture(proc);
}
/**
@@ -128,60 +120,4 @@
setTargetRef(start);
}
}
-
- /**
- * A basic implementation of a Future
- */
- class ResultFuture implements Future<Result>
- {
- private Result result;
- private Process proc;
-
- public ResultFuture(Process proc)
- {
- this.proc = proc;
- }
-
- public boolean cancel(boolean mayInterruptIfRunning)
- {
- throw new NotImplementedException();
- }
-
- public Result get() throws InterruptedException, ExecutionException
- {
- return getResult();
- }
-
- public Result get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
- {
- throw new NotImplementedException();
- }
-
- public boolean isCancelled()
- {
- return false;
- }
-
- public boolean isDone()
- {
- boolean isDone = getResult() != null;
- return isDone;
- }
-
- private Result getResult()
- {
- if (result == null)
- {
- for (EndEvent aux : proc.getEndEvents())
- {
- result = aux.getResult();
- if (result != null)
- {
- break;
- }
- }
- }
- return result;
- }
- }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -25,10 +25,19 @@
import java.util.Map;
+import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.client.DialectHandler;
import org.jboss.bpm.client.DialectRegistry;
+import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process.Status;
+import org.jboss.bpm.model.internal.ProcessImpl;
+import org.jboss.bpm.model.internal.RuntimeProcessImpl;
+import org.jboss.bpm.runtime.Attachments;
/**
* The process manager is the entry point to create, find and otherwise manage processes.
@@ -38,18 +47,65 @@
*/
public class ProcessManagerImpl extends ProcessManager
{
+ // provide logging
+ private static final Log log = LogFactory.getLog(ProcessManagerImpl.class);
+
public void setProcessEngine(ProcessEngine engine)
{
this.engine = engine;
}
-
+
public void setDialectHandlers(Map<String, DialectHandler> dialectHandlers)
{
this.dialectHandlers = dialectHandlers;
}
-
+
public void setDialectRegistry(DialectRegistry dialectRegistry)
{
this.dialectRegistry = dialectRegistry;
}
+
+ public ObjectName startProcess(ObjectName id, Attachments att)
+ {
+ ProcessImpl proc = (ProcessImpl)getProcessByID(id);
+ if (proc.getStatus() != Status.Ready)
+ throw new IllegalStateException("Cannot start process in state: " + proc.getStatus());
+
+ // Copy and register the process instance
+ proc = (ProcessImpl)proc.copyProcess();
+ registerProcess(proc);
+
+ // Start the process in a thread
+ new Thread(new ProcessRunner(proc, att)).start();
+
+ return proc.getID();
+ }
+
+ class ProcessRunner implements Runnable
+ {
+ ProcessImpl proc;
+ Attachments att;
+
+ public ProcessRunner(ProcessImpl proc, Attachments att)
+ {
+ this.proc = proc;
+ this.att = att;
+ }
+
+ public void run()
+ {
+ proc.setStatus(Status.Active);
+ try
+ {
+ ExecutionManager exm = ExecutionManager.locateExecutionManager();
+ exm.startProcess(new RuntimeProcessImpl(proc), att);
+ proc.setStatus(Status.Completed);
+ }
+ catch (RuntimeException ex)
+ {
+ log.error("Process aborted: " + proc, ex);
+ proc.setStatus(Status.Aborted);
+ }
+ }
+ }
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -23,8 +23,18 @@
//$Id$
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.model.BPMNElement;
+import org.jboss.bpm.model.Event;
+import org.jboss.bpm.model.Flow;
+import org.jboss.bpm.model.Gateway;
+import org.jboss.bpm.model.NameSupport;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Task;
+import org.jboss.util.id.UID;
/**
*
@@ -33,9 +43,9 @@
*/
public class BPMNElementImpl implements BPMNElement
{
- private String id;
+ private ObjectName id;
private Process process;
-
+
public Process getProcess()
{
return process;
@@ -46,21 +56,59 @@
this.process = process;
}
- public String getID()
+ public ObjectName getID()
{
return id;
}
- public void setID(String id)
- {
- this.id = id;
- }
-
/**
* Initialize the flow object
*/
protected void initialize(Process proc)
{
setProcess(proc);
+ assignElementID();
}
+
+ protected void assignElementID()
+ {
+ try
+ {
+ StringBuilder str = new StringBuilder(ID_DOMAIN + ":");
+ if (this instanceof Event)
+ {
+ str.append("type=Event");
+ }
+ else if (this instanceof Process)
+ {
+ str.append("type=Process");
+ }
+ else if (this instanceof Task)
+ {
+ str.append("type=Task");
+ }
+ else if (this instanceof Gateway)
+ {
+ str.append("type=Gateway");
+ }
+ else if (this instanceof Flow)
+ {
+ str.append("type=Flow");
+ }
+ else
+ {
+ str.append("type=Other");
+ }
+ if (this instanceof NameSupport)
+ {
+ str.append(",name=" + ((NameSupport)this).getName());
+ }
+ str.append(",id=" + new UID());
+ this.id = new ObjectName(str.toString());
+ }
+ catch (MalformedObjectNameException ex)
+ {
+ throw new InvalidProcessException("Cannot assign id", ex);
+ }
+ }
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -23,14 +23,18 @@
//$Id$
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.concurrent.Future;
+import javax.management.ObjectName;
+
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.EndEvent;
import org.jboss.bpm.model.FlowObject;
@@ -39,7 +43,6 @@
import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.Result;
import org.jboss.bpm.model.StartEvent;
import org.jboss.bpm.runtime.Attachments;
@@ -53,7 +56,7 @@
{
private String name;
private List<FlowObject> flowObjects = new ArrayList<FlowObject>();
- private Status processState = Status.None;
+ private Status status = Status.None;
public ProcessImpl(String name)
{
@@ -95,7 +98,7 @@
{
throw new NotImplementedException();
}
-
+
public void addFlowObject(FlowObject flowObject)
{
flowObjects.add(flowObject);
@@ -131,27 +134,57 @@
public List<FlowObject> getFlowObjects()
{
- if (processState == Status.None)
+ if (status == Status.None)
return flowObjects;
return Collections.unmodifiableList(flowObjects);
}
- public Future<Result> startProcess()
+ /**
+ * A naive copy implementation that relies on serialization
+ */
+ public Process copyProcess()
{
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(this);
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ ProcessImpl proc = (ProcessImpl)ois.readObject();
+ proc.assignElementID();
+ return proc;
+ }
+ catch (Exception ex)
+ {
+ throw new InvalidProcessException("Cannot create a copy of: " + this);
+ }
+ }
+
+ public ObjectName startProcess()
+ {
return startProcess(null);
}
- public Future<Result> startProcess(Attachments att)
+ public ObjectName startProcess(Attachments att)
{
- if (processState != Status.Ready)
- throw new IllegalStateException("Cannot start process in state: " + processState);
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ return pm.startProcess(getID(), att);
+ }
- processState = Status.Active;
- ExecutionManager exm = ExecutionManager.locateExecutionManager();
- return exm.startProcess(new RuntimeProcessImpl(this), att);
+ public void waitForEnd()
+ {
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ pm.waitForEnd(getID(), -1);
}
+ public void waitForEnd(long timeout)
+ {
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ pm.waitForEnd(getID(), timeout);
+ }
+
public FlowObject findFlowObject(String name)
{
if (name == null)
@@ -175,16 +208,24 @@
public Status getStatus()
{
- return processState;
+ return status;
}
+ public void setStatus(Status status)
+ {
+ this.status = status;
+ }
+
/**
* Set the process state
*/
public void initialize()
{
- if (processState != Status.None)
- throw new IllegalStateException("Cannot initialize process in state: " + processState);
+ if (status != Status.None)
+ throw new IllegalStateException("Cannot initialize process in state: " + status);
+
+ // Initialize the Element
+ super.initialize(this);
// Set the anonymous default name
if (getName() == null)
@@ -205,7 +246,7 @@
((FlowObjectImpl)aux).initialize(this);
}
- processState = Status.Ready;
+ status = Status.Ready;
}
public String toString()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -40,7 +40,6 @@
public RuntimeProcessImpl(Process process)
{
- super();
this.process = process;
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -45,6 +45,8 @@
ProcessManager pm = ProcessManager.locateProcessManager();
Process proc = pm.createProcess(jpdlURL);
assertNotNull(proc);
+
+ proc.startProcess();
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -82,8 +82,8 @@
private void runProcess(Process proc) throws InterruptedException, ExecutionException
{
// Start the Process
- Future<Result> end = proc.startProcess();
- Result result = end.get();
+ proc.startProcess();
+ proc.waitForEnd();
// Validate received signals
List<Signal> signals = getSignals();
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -26,14 +26,12 @@
import java.net.URL;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Result;
import org.jboss.bpm.model.Signal;
import org.jboss.bpm.test.DefaultEngineTestCase;
@@ -83,13 +81,9 @@
private void runProcess(Process proc) throws InterruptedException, ExecutionException
{
// Start the Process
- Future<Result> end = proc.startProcess();
- Result result = end.get();
+ proc.startProcess();
+ proc.waitForEnd();
- // Validate the Result
- assertNotNull("Result expected", result);
- assertEquals("No attachments expected", 0, result.getAttachments().getAttachmentKeys().size());
-
// Validate received signals
List<Signal> signals = getSignals();
assertEquals(Signal.Type.ENTER_PROCESS, signals.get(0).getType());
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-24 12:40:28 UTC (rev 1712)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-24 14:24:54 UTC (rev 1713)
@@ -26,16 +26,13 @@
import java.net.URL;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.ProcessBuilder;
import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Result;
import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.runtime.Attachments;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -75,8 +72,8 @@
{
// Create a Process through the ProcessBuilder
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(getName());
- Process proc = procBuilder.addStartEvent().addSequenceFlow("stateA").addTask("stateA").addExecutionHandler(TaskA.class).
- addSequenceFlow("end").addEndEvent("end").getProcess();
+ Process proc = procBuilder.addStartEvent().addSequenceFlow("stateA").addTask("stateA").addExecutionHandler(
+ TaskA.class).addSequenceFlow("end").addEndEvent("end").getProcess();
runProcess(proc);
}
@@ -84,15 +81,9 @@
private void runProcess(Process proc) throws InterruptedException, ExecutionException
{
// Start the Process
- Future<Result> end = proc.startProcess();
- Result result = end.get();
+ proc.startProcess();
+ proc.waitForEnd();
- // Validate the Result
- assertNotNull("Result expected", result);
- Attachments att = result.getAttachments();
- assertEquals("Attachments expected", 1, att.getAttachmentKeys().size());
- assertEquals("Task: TaskA", att.getAttachment(String.class));
-
// Validate received signals
List<Signal> signals = getSignals();
assertEquals(Signal.Type.ENTER_PROCESS, signals.get(0).getType());
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1712 - in jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm: pvm and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-07-24 08:40:28 -0400 (Thu, 24 Jul 2008)
New Revision: 1712
Added:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml
Removed:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/base/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm.wire.bindings.xml
Log:
remove package org.jbpm.base
Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml (from rev 1710, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm.wire.bindings.xml)
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml 2008-07-24 12:40:28 UTC (rev 1712)
@@ -0,0 +1,5 @@
+<wire-bindings>
+
+ <binding class="org.jbpm.pvm.timer.TestTimerSessionBinding" />
+
+</wire-bindings>
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm.wire.bindings.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm.wire.bindings.xml 2008-07-24 12:30:44 UTC (rev 1711)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm.wire.bindings.xml 2008-07-24 12:40:28 UTC (rev 1712)
@@ -1,5 +0,0 @@
-<wire-bindings>
-
- <binding class="org.jbpm.pvm.timer.TestTimerSessionBinding" />
-
-</wire-bindings>
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1711 - in jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm: db and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-07-24 08:30:44 -0400 (Thu, 24 Jul 2008)
New Revision: 1711
Added:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/
Removed:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/client/
Modified:
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ExecutionServiceTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ManagementServiceTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ProcessServiceTest.java
Log:
test package rename
Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc (from rev 1674, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/client)
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ExecutionServiceTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/client/ExecutionServiceTest.java 2008-07-17 20:14:17 UTC (rev 1674)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ExecutionServiceTest.java 2008-07-24 12:30:44 UTC (rev 1711)
@@ -19,7 +19,7 @@
* 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.client;
+package org.jbpm.db.svc;
import java.util.ArrayList;
import java.util.HashMap;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ManagementServiceTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/client/ManagementServiceTest.java 2008-07-17 20:14:17 UTC (rev 1674)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ManagementServiceTest.java 2008-07-24 12:30:44 UTC (rev 1711)
@@ -19,7 +19,7 @@
* 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.client;
+package org.jbpm.db.svc;
import org.jbpm.pvm.test.base.ServiceTestCase;
import org.jbpm.pvm.ManagementService;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ProcessServiceTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/client/ProcessServiceTest.java 2008-07-17 20:14:17 UTC (rev 1674)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ProcessServiceTest.java 2008-07-24 12:30:44 UTC (rev 1711)
@@ -19,7 +19,7 @@
* 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.client;
+package org.jbpm.db.svc;
import java.util.ArrayList;
import java.util.List;
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1710 - jbossbpm/impl/jbpm3/trunk/modules/jpdl/core.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-07-24 08:07:22 -0400 (Thu, 24 Jul 2008)
New Revision: 1710
Modified:
jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml
Log:
update test excludes
Modified: jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml 2008-07-24 11:52:52 UTC (rev 1709)
+++ jbossbpm/impl/jbpm3/trunk/modules/jpdl/core/pom.xml 2008-07-24 12:07:22 UTC (rev 1710)
@@ -188,9 +188,10 @@
<exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
<exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
<exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+ <exclude>org/jbpm/job/executor/TimerOnTimerDbTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1709 - jbossbpm/impl/jbpm3/trunk.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-24 07:52:52 -0400 (Thu, 24 Jul 2008)
New Revision: 1709
Modified:
jbossbpm/impl/jbpm3/trunk/pom.xml
Log:
testFailureIgnore=false
Modified: jbossbpm/impl/jbpm3/trunk/pom.xml
===================================================================
--- jbossbpm/impl/jbpm3/trunk/pom.xml 2008-07-24 11:49:01 UTC (rev 1708)
+++ jbossbpm/impl/jbpm3/trunk/pom.xml 2008-07-24 11:52:52 UTC (rev 1709)
@@ -336,7 +336,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <testFailureIgnore>true</testFailureIgnore>
+ <testFailureIgnore>false</testFailureIgnore>
</configuration>
</plugin>
</plugins>
@@ -392,4 +392,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1708 - jbossbpm/impl/jbpm3.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-24 07:49:01 -0400 (Thu, 24 Jul 2008)
New Revision: 1708
Added:
jbossbpm/impl/jbpm3/trunk/
Log:
Recreate jbossbpm/impl from jbpm3/trunk -r1596
Copied: jbossbpm/impl/jbpm3/trunk (from rev 1707, jbpm3/branches/tdiesler)
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1707 - jbossbpm/impl/jbpm3.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-24 07:48:15 -0400 (Thu, 24 Jul 2008)
New Revision: 1707
Removed:
jbossbpm/impl/jbpm3/trunk/
Log:
Recreate jbossbpm/impl from jbpm3/trunk -r1596
15 years, 11 months
- 1
- 0
JBoss JBPM SVN: r1706 - in jbpm3/branches/tdiesler/modules/jpdl/core/src/main: resources/org/jbpm/db and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-07-24 07:46:54 -0400 (Thu, 24 Jul 2008)
New Revision: 1706
Modified:
jbpm3/branches/tdiesler/modules/jpdl/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
jbpm3/branches/tdiesler/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
Log:
Merge -r1594:1596
Modified: jbpm3/branches/tdiesler/modules/jpdl/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/branches/tdiesler/modules/jpdl/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-07-24 11:42:45 UTC (rev 1705)
+++ jbpm3/branches/tdiesler/modules/jpdl/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-07-24 11:46:54 UTC (rev 1706)
@@ -10,14 +10,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.Hibernate;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.db.JobSession;
import org.jbpm.job.Job;
-import org.jbpm.job.Timer;
import org.jbpm.persistence.JbpmPersistenceException;
-import org.jbpm.persistence.db.StaleObjectLogConfigurer;
import org.jbpm.svc.Services;
public class JobExecutorThread extends Thread {
@@ -104,12 +101,13 @@
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
JobSession jobSession = jbpmContext.getJobSession();
+ String lockOwner = getName();
log.debug("querying for acquirable job...");
- Job job = jobSession.getFirstAcquirableJob(getName());
+ Job job = jobSession.getFirstAcquirableJob(lockOwner);
if (job!=null) {
if (job.isExclusive()) {
log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx...");
- List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance());
+ List otherExclusiveJobs = jobSession.findExclusiveJobs(lockOwner, job.getProcessInstance());
jobsToLock = otherExclusiveJobs;
log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'");
} else {
@@ -117,18 +115,19 @@
jobsToLock = Collections.singletonList(job);
}
- Iterator iter = jobsToLock.iterator();
- while (iter.hasNext()) {
+ Date lockTime = new Date();
+ for (Iterator iter = jobsToLock.iterator(); iter.hasNext();) {
job = (Job) iter.next();
- job.setLockOwner(getName());
- job.setLockTime(new Date());
+ job.setLockOwner(lockOwner);
+ job.setLockTime(lockTime);
// jbpmContext.getSession().update(job);
}
// HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1
- if (job instanceof Timer) {
- Hibernate.initialize(((Timer)job).getGraphElement());
- }
+ // TODO is this still needed?
+ // if (job instanceof Timer) {
+ // Hibernate.initialize(((Timer)job).getGraphElement());
+ // }
} else {
log.debug("no acquirable jobs in job table");
}
@@ -141,7 +140,7 @@
catch (JbpmPersistenceException e) {
// if this is a stale object exception, keep it quiet
if (Services.isCausedByStaleState(e)) {
- log.debug("optimistic locking failed, couldn't obtain lock on jobs: "+jobsToLock);
+ log.debug("optimistic locking failed, couldn't obtain lock on jobs "+jobsToLock);
acquiredJobs = Collections.EMPTY_LIST;
} else {
throw e;
@@ -180,13 +179,10 @@
try {
jbpmContext.close();
} catch (JbpmPersistenceException e) {
- // if this is a stale object exception, the jbpm configuration has control over the logging
- if ("org.hibernate.StaleObjectStateException".equals(e.getCause().getClass().getName())) {
- log.info("problem committing job execution transaction: optimistic locking failed");
- StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job execution transaction: optimistic locking failed", e);
+ // if this is a stale object exception, keep it quiet
+ if (Services.isCausedByStaleState(e)) {
+ log.debug("optimistic locking failed, couldn't complete job "+job);
} else {
- // TODO run() will log this exception, log it here too?
- log.error("problem committing job execution transaction", e);
throw e;
}
}
Modified: jbpm3/branches/tdiesler/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/tdiesler/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-07-24 11:42:45 UTC (rev 1705)
+++ jbpm3/branches/tdiesler/modules/jpdl/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-07-24 11:46:54 UTC (rev 1706)
@@ -429,14 +429,6 @@
and ti.end IS NULL
]]>
</query>
-
- <query name="GraphSession.findAllTokensOfProcessInstance">
- <![CDATA[
- select token
- from org.jbpm.graph.exe.Token token
- where token.processInstance = :instance
- ]]>
- </query>
<query name="TaskMgmtSession.findTaskForNode">
<![CDATA[
15 years, 11 months
- 1
- 0