JBoss JBPM SVN: r6911 - in jbpm3/branches/jbpm-3.2-soa/core/src: main/java/org/jbpm/graph/node and 3 other directories.
by do-not-reply＠jboss.org
Author: mputz
Date: 2011-03-30 05:44:26 -0400 (Wed, 30 Mar 2011)
New Revision: 6911
Added:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/node/ProcessState.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
Log:
JBPM-3151: Restore synchronous signaling behavior for sub-processes
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-03-29 16:00:35 UTC (rev 6910)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-03-30 09:44:26 UTC (rev 6911)
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
+import org.jbpm.JbpmConfiguration.Configs;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
import org.jbpm.context.exe.ContextInstance;
@@ -328,7 +329,7 @@
if (superProcessToken != null && !superProcessToken.hasEnded()) {
// is message service available?
MessageService messageService;
- if (jbpmContext != null
+ if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
&& (messageService = jbpmContext.getServices().getMessageService()) != null) {
// signal super-process token asynchronously to avoid stale state exceptions
// due to concurrent signals to the super-process
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/node/ProcessState.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2011-03-29 16:00:35 UTC (rev 6910)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2011-03-30 09:44:26 UTC (rev 6911)
@@ -193,7 +193,7 @@
// send the signal to start the subprocess
JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext();
MessageService messageService;
- if (jbpmContext != null
+ if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
&& (messageService = jbpmContext.getServices().getMessageService()) != null) {
// signal sub-process token asynchronously to clearly denote transactional boundaries
// https://jira.jboss.org/browse/JBPM-2948
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-03-29 16:00:35 UTC (rev 6910)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-03-30 09:44:26 UTC (rev 6911)
@@ -64,6 +64,9 @@
<bean name="jbpm.sub.process.resolver" class="org.jbpm.graph.node.DbSubProcessResolver"
singleton="true" />
+ <boolean name="jbpm.sub.process.async" value="false" />
+
+
<bean name="jbpm.expression.evaluator" class="org.jbpm.jpdl.el.impl.ExpressionEvaluatorImpl"
singleton="true" />
<bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver"
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2011-03-29 16:00:35 UTC (rev 6910)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2011-03-30 09:44:26 UTC (rev 6911)
@@ -27,6 +27,10 @@
import org.jbpm.graph.def.ProcessDefinition;
public class SubProcessPlusConcurrencyDbTest extends AbstractDbTestCase {
+
+ protected String getJbpmTestConfig() {
+ return "org/jbpm/graph/node/sub-process-async.cfg.xml";
+ }
protected void setUp() throws Exception {
super.setUp();
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml 2011-03-30 09:44:26 UTC (rev 6911)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<jbpm-configuration>
+ <boolean name="jbpm.sub.process.async" value="true" />
+</jbpm-configuration>
\ No newline at end of file
13 years
JBoss JBPM SVN: r6910 - jbpm3/tags.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-03-29 12:00:35 -0400 (Tue, 29 Mar 2011)
New Revision: 6910
Added:
jbpm3/tags/3.2.10.SP1/
Log:
Create 3.2.10.SP1 tag from 3.2.10.SP branch
13 years
JBoss JBPM SVN: r6909 - jbpm3/branches/3.2.10.SP/soa-distribution.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-03-29 11:59:13 -0400 (Tue, 29 Mar 2011)
New Revision: 6909
Modified:
jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml
Log:
Use jsf-console 3.2.10 instead of ${project.version}.
Modified: jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
+++ jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml 2011-03-29 15:59:13 UTC (rev 6909)
@@ -79,7 +79,7 @@
<artifactItem>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-soa-distribution</artifactId>
- <version>${project.version}</version>
+ <version>3.2.10</version>
<type>war</type>
</artifactItem>
</artifactItems>
13 years
JBoss JBPM SVN: r6908 - in jbpm3/branches/3.2.10.SP: core and 12 other directories.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-03-29 11:39:17 -0400 (Tue, 29 Mar 2011)
New Revision: 6908
Modified:
jbpm3/branches/3.2.10.SP/core/pom.xml
jbpm3/branches/3.2.10.SP/db/pom.xml
jbpm3/branches/3.2.10.SP/distribution/pom.xml
jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/module/pom.xml
jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/pom.xml
jbpm3/branches/3.2.10.SP/enterprise-jee5/pom.xml
jbpm3/branches/3.2.10.SP/enterprise/pom.xml
jbpm3/branches/3.2.10.SP/examples/pom.xml
jbpm3/branches/3.2.10.SP/identity/pom.xml
jbpm3/branches/3.2.10.SP/pom.xml
jbpm3/branches/3.2.10.SP/simulation/pom.xml
jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml
jbpm3/branches/3.2.10.SP/tomcat/pom.xml
jbpm3/branches/3.2.10.SP/userguide/pom.xml
Log:
Version is now "3.2.10.SP1".
Modified: jbpm3/branches/3.2.10.SP/core/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/core/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/core/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/db/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/db/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/db/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/3.2.10.SP/distribution/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/distribution/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/distribution/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Properties -->
Modified: jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/module/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/module/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/module/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<artifactId>jbpm-examples-dist</artifactId>
<groupId>org.jbpm.jbpm3</groupId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<build>
Modified: jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<modules>
Modified: jbpm3/branches/3.2.10.SP/enterprise/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/enterprise/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/enterprise/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/enterprise-jee5/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/enterprise-jee5/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/enterprise-jee5/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<properties>
Modified: jbpm3/branches/3.2.10.SP/examples/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/examples/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/examples/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/identity/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/identity/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/identity/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -13,7 +13,7 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
<!-- Source Control Management -->
<scm>
Modified: jbpm3/branches/3.2.10.SP/simulation/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/simulation/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/simulation/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Profiles -->
Modified: jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<properties>
Modified: jbpm3/branches/3.2.10.SP/tomcat/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/tomcat/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/tomcat/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -7,7 +7,7 @@
<parent>
<artifactId>jbpm</artifactId>
<groupId>org.jbpm.jbpm3</groupId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<properties>
Modified: jbpm3/branches/3.2.10.SP/userguide/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/userguide/pom.xml 2011-03-29 15:36:08 UTC (rev 6907)
+++ jbpm3/branches/3.2.10.SP/userguide/pom.xml 2011-03-29 15:39:17 UTC (rev 6908)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10</version>
+ <version>3.2.10.SP1</version>
</parent>
<!-- Plugins -->
13 years
JBoss JBPM SVN: r6907 - jbpm3/branches/3.2.10.SP/core/src/test/resources/org/jbpm/graph/node.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-03-29 11:36:08 -0400 (Tue, 29 Mar 2011)
New Revision: 6907
Added:
jbpm3/branches/3.2.10.SP/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
Log:
Add file missed in c6906 (Pull across c6904 from tags/jbpm-3.2.10_SOA-2990):
Restore synchronous signaling behavior for sub-processes
Added: jbpm3/branches/3.2.10.SP/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml (rev 0)
+++ jbpm3/branches/3.2.10.SP/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml 2011-03-29 15:36:08 UTC (rev 6907)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<jbpm-configuration>
+ <boolean name="jbpm.sub.process.async" value="true" />
+</jbpm-configuration>
\ No newline at end of file
13 years
JBoss JBPM SVN: r6906 - in jbpm3/branches/3.2.10.SP/core/src: main/java/org/jbpm/graph/node and 2 other directories.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-03-29 11:33:01 -0400 (Tue, 29 Mar 2011)
New Revision: 6906
Modified:
jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/node/ProcessState.java
jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
jbpm3/branches/3.2.10.SP/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
Log:
Pull across c6904 from tags/jbpm-3.2.10_SOA-2990:
Restore synchronous signaling behavior for sub-processes
Modified: jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-03-29 15:25:37 UTC (rev 6905)
+++ jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-03-29 15:33:01 UTC (rev 6906)
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
+import org.jbpm.JbpmConfiguration.Configs;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
import org.jbpm.context.exe.ContextInstance;
@@ -328,7 +329,7 @@
if (superProcessToken != null && !superProcessToken.hasEnded()) {
// is message service available?
MessageService messageService;
- if (jbpmContext != null
+ if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
&& (messageService = jbpmContext.getServices().getMessageService()) != null) {
// signal super-process token asynchronously to avoid stale state exceptions
// due to concurrent signals to the super-process
Modified: jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/node/ProcessState.java
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2011-03-29 15:25:37 UTC (rev 6905)
+++ jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2011-03-29 15:33:01 UTC (rev 6906)
@@ -193,7 +193,7 @@
// send the signal to start the subprocess
JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext();
MessageService messageService;
- if (jbpmContext != null
+ if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
&& (messageService = jbpmContext.getServices().getMessageService()) != null) {
// signal sub-process token asynchronously to clearly denote transactional boundaries
// https://jira.jboss.org/browse/JBPM-2948
Modified: jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-03-29 15:25:37 UTC (rev 6905)
+++ jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-03-29 15:33:01 UTC (rev 6906)
@@ -64,6 +64,9 @@
<bean name="jbpm.sub.process.resolver" class="org.jbpm.graph.node.DbSubProcessResolver"
singleton="true" />
+ <boolean name="jbpm.sub.process.async" value="false" />
+
+
<bean name="jbpm.expression.evaluator" class="org.jbpm.jpdl.el.impl.ExpressionEvaluatorImpl"
singleton="true" />
<bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver"
Modified: jbpm3/branches/3.2.10.SP/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2011-03-29 15:25:37 UTC (rev 6905)
+++ jbpm3/branches/3.2.10.SP/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2011-03-29 15:33:01 UTC (rev 6906)
@@ -27,6 +27,10 @@
import org.jbpm.graph.def.ProcessDefinition;
public class SubProcessPlusConcurrencyDbTest extends AbstractDbTestCase {
+
+ protected String getJbpmTestConfig() {
+ return "org/jbpm/graph/node/sub-process-async.cfg.xml";
+ }
protected void setUp() throws Exception {
super.setUp();
13 years
JBoss JBPM SVN: r6905 - jbpm3/branches.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-03-29 11:25:37 -0400 (Tue, 29 Mar 2011)
New Revision: 6905
Added:
jbpm3/branches/3.2.10.SP/
Log:
Create 3.2.10 service pack branch from 3.2.10 tag
13 years
JBoss JBPM SVN: r6904 - in jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src: main/java/org/jbpm/graph/node and 3 other directories.
by do-not-reply＠jboss.org
Author: mputz
Date: 2011-03-29 05:54:34 -0400 (Tue, 29 Mar 2011)
New Revision: 6904
Added:
jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
Modified:
jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java
jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
Log:
SOA-2990: Restore synchronous signaling behavior for sub-processes
Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-03-29 09:54:34 UTC (rev 6904)
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
+import org.jbpm.JbpmConfiguration.Configs;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
import org.jbpm.context.exe.ContextInstance;
@@ -328,7 +329,7 @@
if (superProcessToken != null && !superProcessToken.hasEnded()) {
// is message service available?
MessageService messageService;
- if (jbpmContext != null
+ if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
&& (messageService = jbpmContext.getServices().getMessageService()) != null) {
// signal super-process token asynchronously to avoid stale state exceptions
// due to concurrent signals to the super-process
Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java 2011-03-29 09:54:34 UTC (rev 6904)
@@ -193,7 +193,7 @@
// send the signal to start the subprocess
JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext();
MessageService messageService;
- if (jbpmContext != null
+ if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
&& (messageService = jbpmContext.getServices().getMessageService()) != null) {
// signal sub-process token asynchronously to clearly denote transactional boundaries
// https://jira.jboss.org/browse/JBPM-2948
Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-03-29 09:54:34 UTC (rev 6904)
@@ -64,6 +64,9 @@
<bean name="jbpm.sub.process.resolver" class="org.jbpm.graph.node.DbSubProcessResolver"
singleton="true" />
+ <boolean name="jbpm.sub.process.async" value="false" />
+
+
<bean name="jbpm.expression.evaluator" class="org.jbpm.jpdl.el.impl.ExpressionEvaluatorImpl"
singleton="true" />
<bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver"
Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2011-03-29 09:54:34 UTC (rev 6904)
@@ -27,6 +27,10 @@
import org.jbpm.graph.def.ProcessDefinition;
public class SubProcessPlusConcurrencyDbTest extends AbstractDbTestCase {
+
+ protected String getJbpmTestConfig() {
+ return "org/jbpm/graph/node/sub-process-async.cfg.xml";
+ }
protected void setUp() throws Exception {
super.setUp();
Added: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml (rev 0)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml 2011-03-29 09:54:34 UTC (rev 6904)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<jbpm-configuration>
+ <boolean name="jbpm.sub.process.async" value="true" />
+</jbpm-configuration>
\ No newline at end of file
13 years
JBoss JBPM SVN: r6903 - jbpm3/tags.
by do-not-reply＠jboss.org
Author: mputz
Date: 2011-03-29 05:07:36 -0400 (Tue, 29 Mar 2011)
New Revision: 6903
Added:
jbpm3/tags/jbpm-3.2.10_SOA-2990/
Log:
Create patch branch for SOA-2990 / JBPM-3151
13 years