JBoss JBPM SVN: r6939 - jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-19 02:17:05 -0400 (Thu, 19 May 2011)
New Revision: 6939
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
Log:
Changed dispatchedJobs.remove() to dispatchedJobs.remove(0): jBPM must be Java 4 compatible, and LinkedList.remove() is introduced in Java 5.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2011-05-19 06:15:13 UTC (rev 6938)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2011-05-19 06:17:05 UTC (rev 6939)
@@ -469,7 +469,7 @@
waitingExecutorCondition.await() ;
}
if (dispatchedJobs.size() > 0) {
- return (Job)dispatchedJobs.remove() ;
+ return (Job)dispatchedJobs.remove(0) ;
}
}
} catch (final InterruptedException ie) {
13 years
- 1
- 0
JBoss JBPM SVN: r6938 - jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2834.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-19 02:15:13 -0400 (Thu, 19 May 2011)
New Revision: 6938
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2834/JBPM2834Test.java
Log:
SOA-2010: JBPM-2834 is no longer a valid issue. The test has been modified so that it no longer runs, but has been left in the source in order to document the history.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2834/JBPM2834Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2834/JBPM2834Test.java 2011-05-19 06:14:13 UTC (rev 6937)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2834/JBPM2834Test.java 2011-05-19 06:15:13 UTC (rev 6938)
@@ -31,13 +31,21 @@
/**
* {@link Node#getDefaultLeavingTransition()} returns <code>null</code> when
* there is no unconditional transition.
+ *
+ * This test is no longer valid because transitions on conditions are only valid
+ * on transitions leaving Decisions. Comments explaining this were added to the
+ * jira issue (Marco Rietveld, May 18, 2011)
*
* @see <a href="https://jira.jboss.org/jira/browse/JBPM-2834">JBPM-2834</a>
* @author Alejandro Guizar
*/
public class JBPM2834Test extends AbstractJbpmTestCase {
- public void testConditionalDefaultLeavingTransition() {
+ public void testDummyTest() {
+ assertTrue(true);
+ }
+
+ public void ignoreTestConditionalDefaultLeavingTransition() {
// parse definition
ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2834/processdefinition.xml");
// start instance
13 years
- 1
- 0
JBoss JBPM SVN: r6937 - in jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm: jpdl/exe and 1 other directory.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-19 02:14:13 -0400 (Thu, 19 May 2011)
New Revision: 6937
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/TokenDbTest.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/exe/AvailableTransitionsDbTest.java
Log:
SOA-2010: these tests contained invalid processes. The processes in the tests have been modified so that the tests still work, but use valid processes.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/TokenDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/TokenDbTest.java 2011-05-18 11:09:49 UTC (rev 6936)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/graph/exe/TokenDbTest.java 2011-05-19 06:14:13 UTC (rev 6937)
@@ -128,11 +128,14 @@
public void testAvailableTransitions() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='conditionsprocess'>"
+ " <start-state name='zero'>"
+ + " <transition to='decision'/>"
+ + " </start-state>"
+ + " <decision name='decision'>"
+ " <transition to='one' condition='#{a==5}' />"
+ " <transition to='two' condition='#{a>7}' />"
+ " <transition to='three' />"
+ " <transition to='four' condition='#{a<7}' />"
- + " </start-state>"
+ + " </decision>"
+ " <state name='one' />"
+ " <state name='two' />"
+ " <state name='three' />"
@@ -142,6 +145,8 @@
ProcessInstance processInstance = jbpmContext.newProcessInstance("conditionsprocess");
processInstance.getContextInstance().setVariable("a", new Integer(5));
+ Node decisionNode = processDefinition.findNode("decision");
+ processInstance.getRootToken().setNode(decisionNode);
processInstance = saveAndReload(processInstance);
Set availableTransitions = processInstance.getRootToken().getAvailableTransitions();
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/exe/AvailableTransitionsDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/exe/AvailableTransitionsDbTest.java 2011-05-18 11:09:49 UTC (rev 6936)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/exe/AvailableTransitionsDbTest.java 2011-05-19 06:14:13 UTC (rev 6937)
@@ -6,7 +6,9 @@
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.def.SuperState;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -15,6 +17,9 @@
public void testSimpleAvailableTransitions() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='conditionalavailability' initial='start'>"
+ " <state name='start'>"
+ + " <transition to='decision'/>"
+ + " </state>"
+ + " <decision name='decision'>"
+ " <transition name='high' to='theone'>"
+ " <condition expression='#{a > 0}' />"
+ " </transition>"
@@ -25,13 +30,14 @@
+ " <condition expression='#{a <= 0}' />"
+ " </transition>"
+ " <transition name='alwaysavailable' to='theother'/>"
- + " </state>"
+ + " </decision>"
+ " <state name='theone'/>"
+ " <state name='theother'/>"
+ "</process-definition>");
deployProcessDefinition(processDefinition);
ProcessInstance processInstance = jbpmContext.newProcessInstance("conditionalavailability");
+ processInstance.getRootToken().setNode(processDefinition.findNode("decision"));
processInstance = saveAndReload(processInstance);
Set availableTransitions = processInstance.getRootToken().getAvailableTransitions();
@@ -85,22 +91,27 @@
}
public void testSuperStateAvailableTransitions() {
+ // Conditions are no longer valid on transitions from SuperStates!
+
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='conditionalavailability' initial='start'>"
+ " <super-state name='start'>"
+ " <state name='go'>"
+ + " <transition to='decn' />"
+ + " </state>"
+ + " <decision name='decn'>"
+ " <transition name='inneralwaysavailable' to='../theother' />"
+ " <transition name='five' to='../theone'>"
+ " <condition expression='#{a == 5}' />"
+ " </transition>"
- + " </state>"
+ + " </decision>"
+ " <transition name='high' to='theone'>"
- + " <condition expression='#{a > 0}' />"
+// + " <condition expression='#{a > 0}' />"
+ " </transition>"
+ " <transition name='medium' to='theone'>"
- + " <condition expression='#{a == 0}' />"
+// + " <condition expression='#{a == 0}' />"
+ " </transition>"
+ " <transition name='low' to='theother'>"
- + " <condition expression='#{a <= 0}' />"
+// + " <condition expression='#{a <= 0}' />"
+ " </transition>"
+ " <transition name='outeralwaysavailable' to='theother'/>"
+ " </super-state>"
@@ -110,8 +121,13 @@
deployProcessDefinition(processDefinition);
ProcessInstance processInstance = jbpmContext.newProcessInstance("conditionalavailability");
+ SuperState superState = (SuperState) processDefinition.findNode("start");
+ Node decisionNode = (Node) superState.getNodesMap().get("decn");
+ processInstance.getRootToken().setNode(decisionNode);
Set availableTransitions = processInstance.getRootToken().getAvailableTransitions();
- assertEquals(2, availableTransitions.size());
+ // 2 from decision + 3 from superstate: see Token.addAvailableTransitionsOfNode
+ // which is called by getAvailableTransitions();
+ assertEquals(5, availableTransitions.size());
ContextInstance contextInstance = processInstance.getContextInstance();
contextInstance.setVariable("a", new Integer(5));
@@ -123,6 +139,8 @@
expectedTransitionNames.add("inneralwaysavailable");
expectedTransitionNames.add("outeralwaysavailable");
expectedTransitionNames.add("high");
+ expectedTransitionNames.add("medium");
+ expectedTransitionNames.add("low");
availableTransitions = processInstance.getRootToken().getAvailableTransitions();
assertEquals(expectedTransitionNames, getTransitionNames(availableTransitions));
13 years
- 1
- 0
JBoss JBPM SVN: r6936 - jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-18 07:09:49 -0400 (Wed, 18 May 2011)
New Revision: 6936
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
Log:
SOA-2010: forgot how iterators work.. :(
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java 2011-05-18 08:03:05 UTC (rev 6935)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java 2011-05-18 11:09:49 UTC (rev 6936)
@@ -117,7 +117,8 @@
List problems = jpdlException.getProblems();
int conditionOnTransitionProblems = 0;
Iterator iter = problems.iterator();
- for( Problem problem = (Problem) iter.next(); iter.hasNext(); problem = (Problem) iter.next() ) {
+ while( iter.hasNext() ) {
+ Problem problem = (Problem) iter.next();
String problemMessage = problem.getDescription();
if( problemMessage.indexOf("conditions on transitions only usable leaving decisions") > -1) {
++conditionOnTransitionProblems;
@@ -126,7 +127,7 @@
fail("problem that was not conditions/transitions found: " + problemMessage );
}
}
- assertTrue("only " + expectedNumCondTransProblems + " problems expected, not " + conditionOnTransitionProblems, conditionOnTransitionProblems == expectedNumCondTransProblems);
+ assertTrue(expectedNumCondTransProblems + " problems expected, not " + conditionOnTransitionProblems, conditionOnTransitionProblems == expectedNumCondTransProblems);
}
13 years
- 1
- 0
JBoss JBPM SVN: r6935 - in jbpm3/branches/jbpm-3.2-soa/core/src: test/java/org/jbpm/soa2010 and 1 other directory.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-18 04:03:05 -0400 (Wed, 18 May 2011)
New Revision: 6935
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
Log:
SOA-2010: first commit wasn't compliant with java 1.4.
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java 2011-05-17 14:41:32 UTC (rev 6934)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java 2011-05-18 08:03:05 UTC (rev 6935)
@@ -740,7 +740,8 @@
if( nodeClass == null) {
nodeClass = node.getClass();
}
- String simpleClassName = nodeClass.getSimpleName().toLowerCase();
+ String simpleClassName = nodeClass.getName();
+ simpleClassName = simpleClassName.substring(simpleClassName.lastIndexOf('.'));
addError("conditions on transitions used leaving a " + simpleClassName
+ ", conditions on transitions only usable leaving decisions." );
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java 2011-05-17 14:41:32 UTC (rev 6934)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java 2011-05-18 08:03:05 UTC (rev 6935)
@@ -21,6 +21,7 @@
*/
package org.jbpm.soa2010;
+import java.util.Iterator;
import java.util.List;
import org.jbpm.JbpmException;
@@ -59,9 +60,14 @@
ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_good_simple.xml");
}
catch( Exception e) {
- fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
}
}
+
+ private String getExceptionClassName(Exception e) {
+ String className = e.getClass().getName();
+ return className.substring(className.lastIndexOf('.'));
+ }
/**
* Complexer flow in which there are:
@@ -73,7 +79,7 @@
ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_good_complex.xml");
}
catch( Exception e) {
- fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
}
}
@@ -85,7 +91,7 @@
checkJpdlException(je, 3);
}
catch( Exception e) {
- fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
}
}
@@ -98,7 +104,7 @@
checkJpdlException(je, 73);
}
catch( Exception e) {
- fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
}
}
@@ -108,11 +114,12 @@
* and that all problems
*/
private void checkJpdlException(JpdlException jpdlException, int expectedNumCondTransProblems ) {
- List<Problem> problems = jpdlException.getProblems();
+ List problems = jpdlException.getProblems();
int conditionOnTransitionProblems = 0;
- for( Problem problem : problems ) {
+ Iterator iter = problems.iterator();
+ for( Problem problem = (Problem) iter.next(); iter.hasNext(); problem = (Problem) iter.next() ) {
String problemMessage = problem.getDescription();
- if( problemMessage.contains("conditions on transitions only usable leaving decisions") ) {
+ if( problemMessage.indexOf("conditions on transitions only usable leaving decisions") > -1) {
++conditionOnTransitionProblems;
}
else {
@@ -149,7 +156,7 @@
processInstance.signal();
}
catch(JbpmException je) {
- assertTrue("expected exception on condition", je.getMessage().contains("guarding Transition(to false) not met"));
+ assertTrue("expected exception on condition", je.getMessage().indexOf("guarding Transition(to false) not met") > -1);
exceptionThrown = true;
}
assertTrue("expected exception on condition", exceptionThrown);
13 years
- 1
- 0
JBoss JBPM SVN: r6934 - in jbpm3/branches/jbpm-3.2-soa/core/src/test: resources/org/jbpm/soa2010 and 1 other directory.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-17 10:41:32 -0400 (Tue, 17 May 2011)
New Revision: 6934
Added:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_false.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_true.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_complex.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_simple.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_complex.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_simple.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.xml
Removed:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition1.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition2.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitiona.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitionb.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.jpg
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
Log:
SOA-2010: tests: conditions are only valid on transitions leaving decisions
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java 2011-05-17 14:41:32 UTC (rev 6934)
@@ -21,14 +21,21 @@
*/
package org.jbpm.soa2010;
+import java.util.List;
+
import org.jbpm.JbpmException;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.jpdl.JpdlException;
+import org.jbpm.jpdl.xml.Problem;
/**
- * Conditional transition cannot be considered as a default one (for a Node).
+ * SOA-2010: Conditional transition cannot be considered as a default one.
*
+ * Solution was
+ * - Parser restricts conditional transitions to only those transitions leaving decisions.
+ *
* @see <a href="https://jira.jboss.org/browse/SOA-2010">SOA-2010</a>
* @author Marco Rietveld
*/
@@ -38,7 +45,93 @@
super.setUp();
}
+ //
+ // The following tests parse different jpdl docs to test for different situations
+ //
+
/**
+ * Simple flow in which there are:
+ * - normal transitions between a couple different types (just state, node, task-node)
+ * - various conditional transitions from a decision node to an end node
+ */
+ public void testResolveTransitionDestinationGoodSimple() {
+ try{
+ ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_good_simple.xml");
+ }
+ catch( Exception e) {
+ fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ }
+ }
+
+ /**
+ * Complexer flow in which there are:
+ * - normal transitions between a couple different types (just state, node, task-node)
+ * - various conditional transitions from a decision node to an end node
+ */
+ public void testResolveTransitionDestinationGoodComplex() {
+ try{
+ ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_good_complex.xml");
+ }
+ catch( Exception e) {
+ fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ }
+ }
+
+ public void testResolveTransitionDestinationBadSimple() {
+ try {
+ ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_bad_simple.xml");
+ }
+ catch( JpdlException je) {
+ checkJpdlException(je, 3);
+ }
+ catch( Exception e) {
+ fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ }
+ }
+
+ public void testResolveTransitionDestinationBadComplex() {
+ try {
+ ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_bad_complex.xml");
+ }
+ catch( JpdlException je) {
+ // 7 types x (7 + 2) connections + 1 start x 7 conn + 1 x 3 conn = 73
+ checkJpdlException(je, 73);
+ }
+ catch( Exception e) {
+ fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+ }
+ }
+
+
+ /**
+ * Check that the given {@link JpdlException} only contains the given number of problems
+ * and that all problems
+ */
+ private void checkJpdlException(JpdlException jpdlException, int expectedNumCondTransProblems ) {
+ List<Problem> problems = jpdlException.getProblems();
+ int conditionOnTransitionProblems = 0;
+ for( Problem problem : problems ) {
+ String problemMessage = problem.getDescription();
+ if( problemMessage.contains("conditions on transitions only usable leaving decisions") ) {
+ ++conditionOnTransitionProblems;
+ }
+ else {
+ fail("problem that was not conditions/transitions found: " + problemMessage );
+ }
+ }
+ assertTrue("only " + expectedNumCondTransProblems + " problems expected, not " + conditionOnTransitionProblems, conditionOnTransitionProblems == expectedNumCondTransProblems);
+
+ }
+
+ //
+ // The following tests illustrated the behaviour of Transition.take() on non-Decision nodes
+ // **BEFORE SOA-2010 was implemented!**
+ //
+ // These tests will currently fail (because the process will no longer be accepted),
+ // but have been left in as a form of documentation.
+ //
+
+ /**
* Illustrate the following:
* - node with no unconditional transitions
* - transition with a condition that evaluates to false, as first transition (in jpdl doc)
@@ -46,11 +139,11 @@
*
* will throw an exception because the first/default transition is conditional evaluating to false.
*/
- public void testNodeWithFalseDefaultConditionalTransition() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/soa2010/processdefinitiona.xml");
+ public void ignoreTestNodeWithFalseDefaultConditionalTransition() {
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_cond_false.xml");
deployProcessDefinition(processDefinition);
- ProcessInstance processInstance = jbpmContext.newProcessInstance("soa2010a");
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("soa2010cf");
boolean exceptionThrown = false;
try {
processInstance.signal();
@@ -72,11 +165,11 @@
*
* (otherwise EXACTLY the same jpdl/graph as previous test)
*/
- public void testNodeWithTrueDefaultConditionalTransition() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/soa2010/processdefinitionb.xml");
+ public void ignoreTestNodeWithTrueDefaultConditionalTransition() {
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_cond_true.xml");
deployProcessDefinition(processDefinition);
- ProcessInstance processInstance = jbpmContext.newProcessInstance("soa2010b");
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("soa2010ct");
try {
processInstance.signal();
}
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_false.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_false.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_false.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="soa2010cf" width="1156" height="898">
+ <node name="start" x="125" y="64" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node1" x="94" y="166" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="false-condition-end" x="6" y="286" width="132" height="36"/>
+ <node name="true-condition-end" x="209" y="295" width="132" height="36"/>
+</root-container>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_false.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_true.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_true.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_true.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="soa2010ct" width="1156" height="898">
+ <node name="start" x="98" y="67" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node1" x="100" y="161" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="false-condition-end" x="252" y="282" width="132" height="36"/>
+ <node name="true-condition-end" x="21" y="285" width="132" height="36"/>
+</root-container>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_cond_true.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_complex.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_complex.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_complex.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="soa2010pbc" width="1159" height="898">
+ <node name="start" x="98" y="125" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="219" h1="178" w2="-519" h2="-388"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="396" h1="10" w2="-347" h2="92"/>
+ </edge>
+ <edge>
+ <label x="14" y="-1"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="341" h1="-104" w2="-402" h2="-22"/>
+ </edge>
+ </node>
+ <node name="node" x="779" y="513" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="state" x="769" y="337" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="task-node" x="484" y="287" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="mail-node" x="131" y="388" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="process-state" x="102" y="655" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="fork" x="376" y="794" width="252" height="24">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="join" x="776" y="697" width="252" height="24">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="end" x="841" y="43" width="132" height="36"/>
+</root-container>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_complex.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_simple.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_simple.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_simple.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="soa2010pbs" width="1276" height="609">
+ <node name="start" x="196" y="95" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node1" x="196" y="203" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="true-cond-attr-end" x="33" y="365" width="132" height="36"/>
+ <node name="false-cond-elem-end" x="191" y="363" width="157" height="36"/>
+ <node name="false-cond-elem-attr-end" x="382" y="365" width="173" height="36"/>
+</root-container>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_bad_simple.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_complex.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_complex.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_complex.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="soa2010a" width="1159" height="898">
+ <node name="start" x="706" y="85" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node-1" x="696" y="229" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="state" x="317" y="687" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="task-node" x="609" y="651" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="mail-node" x="321" y="218" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="process-state" x="68" y="362" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="fork" x="724" y="404" width="252" height="24">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="-91" y="-15"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="join" x="701" y="517" width="252" height="24">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="decision" x="700" y="845" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="-403" h1="13" w2="224" h2="317"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="-304" h1="-20" w2="79" h2="138"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="-365" h1="9" w2="262" h2="313"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node-2" x="73" y="541" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ <bendpoint w1="373" h1="160" w2="-254" h2="-144"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="end" x="120" y="765" width="132" height="36"/>
+</root-container>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_complex.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_simple.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_simple.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_simple.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="soa2010pgs" width="1159" height="898">
+ <node name="start" x="363" y="66" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node-1" x="363" y="168" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="decision" x="358" y="307" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="node-2" x="136" y="496" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="state" x="368" y="492" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="task-node" x="565" y="500" width="132" height="36">
+ <edge>
+ <label x="5" y="-10"/>
+ </edge>
+ </node>
+ <node name="end" x="350" y="625" width="132" height="36"/>
+</root-container>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.procdef_parse_good_simple.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition1.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition1.xml 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition1.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="soa2010" width="931" height="666">
- <node name="start" x="256" y="95" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="node1" x="246" y="221" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="false-condition-end" x="447" y="410" width="132" height="36"/>
- <node name="true-condition-end" x="101" y="391" width="132" height="36"/>
-</root-container>
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition2.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition2.xml 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinition2.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="soa2010" width="931" height="666">
- <node name="start" x="323" y="106" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="node1" x="289" y="228" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="false-condition-end" x="183" y="468" width="132" height="36"/>
- <node name="true-condition-end" x="414" y="470" width="132" height="36"/>
-</root-container>
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitiona.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitiona.xml 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitiona.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="soa2010a" width="931" height="666">
- <node name="start" x="300" y="68" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="node1" x="304" y="226" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="false-condition-end" x="125" y="433" width="132" height="36"/>
- <node name="true-condition-end" x="547" y="427" width="132" height="36"/>
-</root-container>
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitionb.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitionb.xml 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/.gpd.processdefinitionb.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="soa2010b" width="931" height="666">
- <node name="start" x="292" y="54" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="node1" x="294" y="184" width="132" height="36">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="false-condition-end" x="66" y="345" width="132" height="36"/>
- <node name="true-condition-end" x="547" y="347" width="132" height="36"/>
-</root-container>
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.xml (from rev 6917, jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="soa2010cf" xmlns="urn:jbpm.org:jpdl-3.2">
+
+ <start-state name="start">
+ <transition to="node1" />
+ </start-state>
+
+ <node name="node1">
+ <transition to="false-condition-end" condition="#{AAA != null}" name="to false"/>
+ <transition to="true-condition-end" condition="#{AAA == null}" name="to true" />
+ </node>
+
+ <end-state name="false-condition-end" />
+
+ <end-state name="true-condition-end" />
+
+</process-definition>
\ No newline at end of file
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_false.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.xml (from rev 6917, jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="soa2010ct" xmlns="urn:jbpm.org:jpdl-3.2">
+
+ <start-state name="start">
+ <transition to="node1" />
+ </start-state>
+
+ <node name="node1">
+ <transition to="true-condition-end" condition="#{AAA == null}" name="to true" />
+ <transition to="false-condition-end" condition="#{AAA != null}" name="to false"/>
+ </node>
+
+ <end-state name="false-condition-end" />
+
+ <end-state name="true-condition-end" />
+
+</process-definition>
\ No newline at end of file
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_cond_true.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="soa2010pbc" xmlns="urn:jbpm.org:jpdl-3.2">
+
+ <start-state name="start">
+ <!-- 10 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <transition to="end" condition="#{AAA != null}" name="cond-z-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </start-state>
+
+ <node name="node">
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </node>
+
+ <state name="state">
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </state>
+
+ <task-node name="task-node">
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </task-node>
+
+ <mail-node name="mail-node">
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </mail-node>
+
+ <process-state name="process-state">
+ <sub-process name="soa2010pbs"/>
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </process-state>
+
+ <fork name="fork">
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </fork>
+
+ <join name="join">
+ <!-- 9 bad transitions -->
+ <transition to="node" condition="#{AAA != null}" name="cond-a"/>
+ <transition to="state" condition="#{AAA != null}" name="cond-b"/>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c"/>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d"/>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e"/>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f"/>
+ <transition to="join" condition="#{AAA != null}" name="cond-g"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="end" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="end" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </join>
+
+ <end-state name="end" />
+
+</process-definition>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_complex.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="soa2010pbs" xmlns="urn:jbpm.org:jpdl-3.2">
+
+ <start-state name="start">
+ <transition to="node1" />
+ </start-state>
+
+ <node name="node1">
+ <!-- transition w/ condition attribute -->
+ <transition to="true-cond-attr-end" condition="#{AAA == null}" name="to true" />
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="false-cond-elem-end" name="to false">
+ <condition>
+ #{BBB != null}
+ </condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="false-cond-elem-attr-end" name="to false">
+ <condition expression="#{CCC != null}" />
+ </transition>
+ </node>
+
+ <end-state name="true-cond-attr-end" />
+ <end-state name="false-cond-elem-end" />
+ <end-state name="false-cond-elem-attr-end" />
+
+</process-definition>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_bad_simple.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="soa2010a" xmlns="urn:jbpm.org:jpdl-3.2">
+
+ <start-state name="start">
+ <transition to="node-1" />
+ </start-state>
+
+ <node name="node-1">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </node>
+
+ <state name="state">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </state>
+
+ <task-node name="task-node">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </task-node>
+
+ <mail-node name="mail-node">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </mail-node>
+
+ <process-state name="process-state">
+ <sub-process name="soa2010pbs"/>
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </process-state>
+
+ <fork name="fork">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </fork>
+
+ <join name="join">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ </join>
+
+ <decision name="decision">
+ <transition to="node-2" condition="#{AAA != null}" name="cond-a-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="node-2" name="cond-a-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="node-2" name="cond-a-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ <transition to="state" condition="#{AAA != null}" name="cond-b-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="state" name="cond-b-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="state" name="cond-b-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ <transition to="task-node" condition="#{AAA != null}" name="cond-c-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="task-node" name="cond-c-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="task-node" name="cond-c-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ <transition to="mail-node" condition="#{AAA != null}" name="cond-d-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="mail-node" name="cond-d-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="mail-node" name="cond-d-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ <transition to="process-state" condition="#{AAA != null}" name="cond-e-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="process-state" name="cond-e-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="process-state" name="cond-e-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ <transition to="fork" condition="#{AAA != null}" name="cond-f-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="fork" name="cond-f-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="fork" name="cond-f-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ <transition to="join" condition="#{AAA != null}" name="cond-g-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="join" name="cond-g-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="join" name="cond-g-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </decision>
+
+ <node name="node-2">
+ <transition to="decision" />
+ <transition to="node-2" name="trans-a" />
+ <transition to="state" name="trans-b"/>
+ <transition to="task-node" name="trans-c"/>
+ <transition to="mail-node" name="trans-d"/>
+ <transition to="process-state" name="trans-e"/>
+ <transition to="fork" name="trans-f"/>
+ <transition to="join" name="trans-g"/>
+ <transition to="end" />
+ </node>
+
+ <end-state name="end" />
+
+</process-definition>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_complex.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition name="soa2010pgs" xmlns="urn:jbpm.org:jpdl-3.2">
+
+ <start-state name="start">
+ <transition to="node-1" />
+ </start-state>
+
+ <node name="node-1">
+ <transition to="decision" />
+ </node>
+
+ <decision name="decision">
+ <transition to="node-2" condition="#{AAA != null}" name="cond-z-0"/>
+
+ <!-- Backwards compat style: transition w/ condition element -->
+ <transition to="state" name="cond-z-1">
+ <condition>{AAA != null}</condition>
+ </transition>
+
+ <!-- New style: transition w/ condition element w/ expression element -->
+ <transition to="task-node" name="cond-z-2">
+ <condition expression="#{AAA != null}" />
+ </transition>
+ </decision>
+
+ <node name="node-2">
+ <transition to="end" />
+ </node>
+
+ <state name="state">
+ <transition to="end" />
+ </state>
+
+ <task-node name="task-node">
+ <transition to="end" />
+ </task-node>
+
+
+ <end-state name="end" />
+
+</process-definition>
Property changes on: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/procdef_parse_good_simple.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.jpg
===================================================================
(Binary files differ)
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.xml 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitiona.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition name="soa2010a" xmlns="urn:jbpm.org:jpdl-3.2">
-
- <start-state name="start">
- <transition to="node1" />
- </start-state>
-
- <node name="node1">
- <transition to="false-condition-end" condition="#{AAA != null}" name="to false"/>
- <transition to="true-condition-end" condition="#{AAA == null}" name="to true" />
- </node>
-
- <end-state name="false-condition-end" />
-
- <end-state name="true-condition-end" />
-
-</process-definition>
\ No newline at end of file
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.jpg
===================================================================
(Binary files differ)
Deleted: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.xml 2011-05-17 14:39:43 UTC (rev 6933)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/soa2010/processdefinitionb.xml 2011-05-17 14:41:32 UTC (rev 6934)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition name="soa2010b" xmlns="urn:jbpm.org:jpdl-3.2">
-
- <start-state name="start">
- <transition to="node1" />
- </start-state>
-
- <node name="node1">
- <transition to="true-condition-end" condition="#{AAA == null}" name="to true" />
- <transition to="false-condition-end" condition="#{AAA != null}" name="to false"/>
- </node>
-
- <end-state name="false-condition-end" />
-
- <end-state name="true-condition-end" />
-
-</process-definition>
\ No newline at end of file
13 years
- 1
- 0
JBoss JBPM SVN: r6933 - jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml.
by do-not-reply＠jboss.org
Author: marco.rietveld
Date: 2011-05-17 10:39:43 -0400 (Tue, 17 May 2011)
New Revision: 6933
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
Log:
SOA-2010: conditions are only valid on transitions leaving decisions
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java 2011-05-16 15:51:59 UTC (rev 6932)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java 2011-05-17 14:39:43 UTC (rev 6933)
@@ -52,6 +52,7 @@
import org.jbpm.graph.def.NodeCollection;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.def.Transition;
+import org.jbpm.graph.node.Decision;
import org.jbpm.graph.node.NodeTypes;
import org.jbpm.graph.node.StartState;
import org.jbpm.graph.node.TaskNode;
@@ -712,11 +713,16 @@
transition.setName(transitionName);
transition.setDescription(transitionElement.elementTextTrim("description"));
+ // SOA-2010: conditions only valid on transitions leaving decisions
+ boolean conditionPresentOnTransition = true;
+
// read transition condition
String condition = transitionElement.attributeValue("condition");
if (condition == null) {
+ conditionPresentOnTransition = false;
Element conditionElement = transitionElement.element("condition");
if (conditionElement != null) {
+ conditionPresentOnTransition = true;
condition = conditionElement.getTextTrim();
// for backwards compatibility
if (condition == null || condition.length() == 0) {
@@ -724,8 +730,22 @@
}
}
}
+
transition.setCondition(condition);
+ // SOA-2010: conditions only valid on transitions leaving decisions
+ if(conditionPresentOnTransition && ! (node instanceof Decision)) {
+
+ Class nodeClass = node.getClass().getDeclaringClass();
+ if( nodeClass == null) {
+ nodeClass = node.getClass();
+ }
+ String simpleClassName = nodeClass.getSimpleName().toLowerCase();
+
+ addError("conditions on transitions used leaving a " + simpleClassName
+ + ", conditions on transitions only usable leaving decisions." );
+ }
+
// register transition in origin
node.addLeavingTransition(transition);
13 years
- 1
- 0
JBoss JBPM SVN: r6932 - jbpm3/tags.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-05-16 11:51:59 -0400 (Mon, 16 May 2011)
New Revision: 6932
Added:
jbpm3/tags/3.2.10.SP3/
Log:
Create 3.2.10.SP3 tag from 3.2.10.SP branch
13 years
- 1
- 0
JBoss JBPM SVN: r6931 - in jbpm3/branches/3.2.10.SP: core/src/main/java/org/jbpm/job/executor and 4 other directories.
by do-not-reply＠jboss.org
Author: jcoleman(a)redhat.com
Date: 2011-05-16 11:34:38 -0400 (Mon, 16 May 2011)
New Revision: 6931
Modified:
jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/async.xml
jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/extras/configuration_1.xmlt
Log:
Pull across revisions 6926, 6927, 6928, 6929 from the jbpm-3.2-soa branch:
Updates to the job executor fixes (revision 6918):
o increase the retry count when we unlock a job if an error has occurred.
Otherwise, we would decrease the value when we shouldn't
o remove the additional unlocking code, as the lock-monitor thread will
handle this for us
>From kconner@
Set the default RetryInterval to 4000ms, to go with the altered retry
behaviour.
>From kconner@.
Update documentation to match job executor changes. Add a section describing
job executor configuration variables.
JBPM-3192
Clarify need for unique job executor name.
Modified: jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/db/JobSession.java 2011-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/db/JobSession.java 2011-05-16 15:34:38 UTC (rev 6931)
@@ -275,14 +275,4 @@
}
return session.createCriteria(Job.class).add(Restrictions.in("id", jobs)).list();
}
-
- public void releaseLockedJobs(final String lockOwner) {
- try {
- session.getNamedQuery("JobSession.releaseLockedJobs")
- .setString("lockOwner", lockOwner)
- .executeUpdate();
- } catch (HibernateException e) {
- throw new JbpmPersistenceException("could not release locked jobs by owner '" + lockOwner + "'", e);
- }
- }
}
Modified: jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2011-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutor.java 2011-05-16 15:34:38 UTC (rev 6931)
@@ -17,8 +17,6 @@
import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
-import org.jbpm.db.JobSession;
import org.jbpm.job.Job;
import edu.emory.mathcs.backport.java.util.concurrent.locks.Condition;
@@ -498,37 +496,10 @@
private void activateDispatcher() {
waitingExecutorLock.lock() ;
- try {
- if (!dispatcherActive) {
- unlockOurJobs() ;
- dispatcherActive = true ;
- }
- } finally {
- waitingExecutorLock.unlock() ;
- }
+ dispatcherActive = true ;
+ waitingExecutorLock.unlock() ;
}
- private void unlockOurJobs() {
- final JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
- try {
- final String lockOwner = getName();
- final JobSession jobSession = jbpmContext.getJobSession();
- jobSession.releaseLockedJobs(lockOwner);
- } catch (RuntimeException e) {
- jbpmContext.setRollbackOnly();
- if (log.isDebugEnabled()) log.debug("failed to release locked jobs", e);
- } catch (Error e) {
- jbpmContext.setRollbackOnly();
- throw e;
- } finally {
- try {
- jbpmContext.close();
- } catch (RuntimeException e) {
- if (log.isDebugEnabled()) log.debug("failed to release locked jobs", e);
- }
- }
- }
-
private void deactivateDispatcher() {
waitingExecutorLock.lock() ;
try {
Modified: jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2011-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2011-05-16 15:34:38 UTC (rev 6931)
@@ -219,6 +219,10 @@
// unlock job
job.setLockOwner(null);
job.setLockTime(null);
+ if (job.getException() != null)
+ {
+ job.setRetries(job.getRetries()+1) ;
+ }
}
catch (RuntimeException e) {
jbpmContext.setRollbackOnly();
Modified: jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2011-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2011-05-16 15:34:38 UTC (rev 6931)
@@ -401,16 +401,6 @@
]]>
</query>
- <query name="JobSession.releaseLockedJobs">
- <![CDATA[
- update org.jbpm.job.Job job
- set job.lockOwner = null, job.lockTime = null
- where (job.lockOwner = :lockOwner)
- and job.retries > 0
- and job.isSuspended = false
- ]]>
- </query>
-
<!-- related to Tasks -->
<!-- ########################### -->
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-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2011-05-16 15:34:38 UTC (rev 6931)
@@ -109,8 +109,8 @@
<int value="60000" />
</property>
<property name="retryInterval">
- <!-- 1 second -->
- <int value="1000" />
+ <!-- 4 seconds -->
+ <int value="4000" />
</property>
<property name="maxIdleInterval">
<!-- 1 hour -->
Modified: jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/async.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/async.xml 2011-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/async.xml 2011-05-16 15:34:38 UTC (rev 6931)
@@ -186,26 +186,23 @@
executor must execute the jobs. This is done in two phases.
<itemizedlist>
<listitem>
- <para>A job executor thread must acquire a job</para>
+ <para>The dispatcher thread must acquire a job</para>
</listitem>
<listitem>
- <para>The thread that acquired the job must execute it</para>
+ <para>An executor thread must execute the job</para>
</listitem>
</itemizedlist>
</para>
- <para>Acquiring a job and executing the job are done in 2 separate transactions. A thread
- acquires a job by putting its name into the owner field of the job. Each thread has a unique
- name based on IP address and sequence number. Hibernate's optimistic locking is enabled on
- <literal>Job</literal>-objects. So if 2 threads try to acquire a job concurrently, one of
- them will get a StaleObjectException and rollback. Only the first one will succeed. The
- thread that succeeds in acquiring a job is now responsible for executing it in a separate
- transaction.
+ <para>Acquiring a job and executing the job are done in 2 separate transactions. The
+ dispatcher thread acquires jobs from the database on behalf of all the executor threads
+ on this node. When the executor thread takes the job, it adds its name into the owner
+ field of the job. Each thread has a unique name based on IP address and sequence number.
</para>
<para>A thread could die between acquisition and execution of a job. To clean-up after
those situations, there is one lock-monitor thread per job executor that checks the lock times.
- The lock monitor thread will unlock any jobs that have been locked for more than 30 minutes,
+ The lock monitor thread will unlock any jobs that have been locked for more than 10 minutes,
so that they can be executed by another job executor thread.
</para>
@@ -230,6 +227,127 @@
<literal>READ_COMMITTED</literal> is not enough because it allows for Non-Repeatable reads to occur.
So <literal>REPEATABLE_READ</literal> is required if you configure more than one job executor thread.
</para>
+
+ <para>
+ Configuration properties related to the job executor are:
+ </para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><property>jbpmConfiguration</property></term>
+ <listitem>
+ <para>
+ The bean from which configuration is retrieved.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>name</property></term>
+ <listitem>
+ <para>
+ The name of this executor.
+ </para>
+ <important>
+ <para>
+ This name should be unique for each node, when more
+ than one jBPM instance is started on a single machine.
+ </para>
+ </important>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>nbrOfThreads</property></term>
+ <listitem>
+ <para>
+ The number of executor threads that are started.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>idleInterval</property></term>
+ <listitem>
+ <para>
+ The interval that the dispatcher thread will wait before
+ checking the job queue, if there are no jobs pending.
+ </para>
+ <note>
+ <para>
+ The dispatcher thread is automatically notifed when jobs
+ are added to the queue.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>retryInterval</property></term>
+ <listitem>
+ <para>
+ The interval that a job will wait between retries, if it
+ fails during execution.
+ </para>
+ <note>
+ <para>
+ The maximum number of retries is configured by
+ <property>jbpm.job.retries</property>.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>maxIdleInterval</property></term>
+ <listitem>
+ <para>
+ The maximum period for <property>idleInterval</property>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>historyMaxSize</property></term>
+ <listitem>
+ <para>
+ This property is deprecated, and has no affect.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>maxLockTime</property></term>
+ <listitem>
+ <para>
+ The macimum time that a job can be locked, before the
+ lock-monitor thread will unlock it.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>lockMonitorInterval</property></term>
+ <listitem>
+ <para>
+ The period for which the lock-monitor thread will sleep
+ between checking for locked jobs.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><property>lockBufferTime</property></term>
+ <listitem>
+ <para>
+ This property is deprecated, and has no affect.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
</section>
<section id="jbpmsbuiltinasynchronousmessaging">
Modified: jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/extras/configuration_1.xmlt
===================================================================
--- jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/extras/configuration_1.xmlt 2011-05-16 15:27:57 UTC (rev 6930)
+++ jbpm3/branches/3.2.10.SP/userguide/src/main/docbook/en-US/extras/configuration_1.xmlt 2011-05-16 15:34:38 UTC (rev 6931)
@@ -59,7 +59,8 @@
</field>
<field name='name'><string value='JbpmJobExecutor' /></field>
<field name='nbrOfThreads'><int value='1' /></field>
- <field name='idleInterval'><int value='5000' /></field>
+ <field name='idleInterval'><int value='60000' /></field>
+ <field name='retryInterval'><int value='4000' /></field>
<!-- 1 hour -->
<field name='maxIdleInterval'><int value='3600000' /></field>
<field name='historyMaxSize'><int value='20' /></field>
@@ -70,4 +71,4 @@
<!-- 5 seconds -->
<field name='lockBufferTime'><int value='5000' /></field>
</bean>
-</jbpm-configuration>
\ No newline at end of file
+</jbpm-configuration>
13 years
- 1
- 0
JBoss JBPM SVN: r6930 - 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-05-16 11:27:57 -0400 (Mon, 16 May 2011)
New Revision: 6930
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:
Update version to 3.2.10.SP3.
Modified: jbpm3/branches/3.2.10.SP/core/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/core/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/core/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/db/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/db/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/db/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</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-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/distribution/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</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-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/module/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<artifactId>jbpm-examples-dist</artifactId>
<groupId>org.jbpm.jbpm3</groupId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</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-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/distribution/src/main/resources/examples/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<modules>
Modified: jbpm3/branches/3.2.10.SP/enterprise/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/enterprise/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/enterprise/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</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-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/enterprise-jee5/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<properties>
Modified: jbpm3/branches/3.2.10.SP/examples/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/examples/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/examples/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/identity/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/identity/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/identity/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<!-- Dependencies -->
Modified: jbpm3/branches/3.2.10.SP/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -13,7 +13,7 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</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-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/simulation/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</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-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/soa-distribution/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<properties>
Modified: jbpm3/branches/3.2.10.SP/tomcat/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/tomcat/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/tomcat/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -7,7 +7,7 @@
<parent>
<artifactId>jbpm</artifactId>
<groupId>org.jbpm.jbpm3</groupId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<properties>
Modified: jbpm3/branches/3.2.10.SP/userguide/pom.xml
===================================================================
--- jbpm3/branches/3.2.10.SP/userguide/pom.xml 2011-05-16 15:20:58 UTC (rev 6929)
+++ jbpm3/branches/3.2.10.SP/userguide/pom.xml 2011-05-16 15:27:57 UTC (rev 6930)
@@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.10.SP2</version>
+ <version>3.2.10.SP3</version>
</parent>
<!-- Plugins -->
13 years
- 1
- 0