[jbpm-commits] JBoss JBPM SVN: r2241 - in jbpm4/pvm/trunk/modules: core/src/main/java/org/jbpm/pvm/activity and 20 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-09-15 06:19:54 -0400 (Mon, 15 Sep 2008) New Revision: 2241 Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientExecution.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessDefinition.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessInstance.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Loan.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml Log: start-stop Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/Execution.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -69,7 +69,7 @@ public interface Execution extends Serializable { /** between {@link ClientProcessDefinition#createProcessInstance() creation of - * a new process instance} and the {@link ClientExecution#begin() start} of that + * a new process instance} and the {@link ClientExecution#start() start} of that * process instance. The motivation of this state is that variables can be * set programmatically on the process instance so that they can be used during * initializations of variables and timers */ Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/activity/ActivityExecution.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -201,10 +201,10 @@ * * <p>This method should not be called in {@link Activity}s. It can be called from * outside the process execution and in {@link ExternalActivity}s. </p> */ - void end(); + void stop(); /** ends this execution and assigns the state {@link #STATE_CANCELLED}. - * @see #end(String) */ + * @see #stop(String) */ void cancel(); /** ends this execution and all it's child executions with a user defined @@ -215,7 +215,7 @@ * side effects.</p> * * <p>The execution will be removed from it's parent.</p> */ - void end(String state); + void stop(String state); // firing events //////////////////////////////////////////////////////////// Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientExecution.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientExecution.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientExecution.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -47,10 +47,10 @@ * * <p>This method should not be called in {@link Activity}s. It can be called from * outside the process execution and in {@link ExternalActivity}s. </p> */ - void end(); + void stop(); /** ends this execution and assigns the state {@link #STATE_CANCELLED}. - * @see #end(String) */ + * @see #stop(String) */ void cancel(); /** ends this execution and all it's child executions with a user defined @@ -59,7 +59,7 @@ * * * Giving states {@link */ - void end(String state); + void stop(String state); // signal /////////////////////////////////////////////////////////////////// Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessDefinition.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessDefinition.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessDefinition.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -34,25 +34,25 @@ /** creates a new process instances. The returned process instance * is not started yet. This way, * {@link OpenExecution#setVariable(String, Object) variables can be set} - * before execution is started. Invoke {@link ClientProcessInstance#begin()} + * before execution is started. Invoke {@link ClientProcessInstance#start()} * to start execution of the process. */ ClientProcessInstance createProcessInstance(); /** creates a new process instances with a given key. The returned process instance * is not started yet. This way, * {@link OpenExecution#setVariable(String, Object) variables can be set} - * before execution is started. Invoke {@link ClientProcessInstance#begin()} + * before execution is started. Invoke {@link ClientProcessInstance#start()} * to start execution of the process. * @param key is a user provided reference that uniquely identifies this * process instance in the scope of the process name. */ ClientProcessInstance createProcessInstance(String key); /** creates the process instance and immediately start its execution. */ - ClientExecution beginProcessInstance(); + ClientExecution startProcessInstance(); /** creates the process instance with the given key and immediately start its * execution. * @param key is a user provided reference that uniquely identifies this * process instance in the scope of the process name. */ - ClientExecution beginProcessInstance(String key); + ClientExecution startProcessInstance(String key); } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessInstance.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessInstance.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/client/ClientProcessInstance.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -30,7 +30,7 @@ // start //////////////////////////////////////////////////////////////////// /** starts this process instance */ - void begin(); + void start(); } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionCmd.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -58,7 +58,7 @@ ClientProcessInstance processInstance = processDefinition.createProcessInstance(executionKey); processInstance.setVariables(variables); - processInstance.begin(); + processInstance.start(); pvmDbSession.save(processInstance); return processInstance; Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/StartExecutionInLatestCmd.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -59,7 +59,7 @@ ClientProcessInstance processInstance = processDefinition.createProcessInstance(executionKey); processInstance.setVariables(variables); - processInstance.begin(); + processInstance.start(); pvmDbSession.save(processInstance); return processInstance; Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -204,7 +204,7 @@ // execution method : start ///////////////////////////////////////////////// - public void begin() { + public void start() { if (state!=STATE_CREATED) { throw new PvmException(toString()+" is already begun: "+state); } @@ -276,7 +276,7 @@ getParent().setPreviousTransition(getPreviousTransition()); getParent().setPreviousNode(getPreviousNode()); - end(); + stop(); parent.removeExecution(this); return parent; @@ -296,11 +296,11 @@ // execution method : end /////////////////////////////////////////////////// - public void end() { - end(Execution.STATE_ENDED); + public void stop() { + stop(Execution.STATE_ENDED); } - public void end(String state) { + public void stop(String state) { if (state==null) { throw new PvmException("state is null"); } @@ -323,7 +323,7 @@ // end all child executions if (executions!=null) { for (ExecutionImpl child: executions) { - child.end(state); + child.stop(state); } } @@ -340,7 +340,7 @@ } public void cancel() { - end(Execution.STATE_CANCELLED); + stop(Execution.STATE_CANCELLED); } // execution method : suspend and resume //////////////////////////////////// @@ -501,7 +501,7 @@ // throw new PvmException("don't know how to proceed"); // or to end the execution. Because of convenience for testing, // I opted to end the execution. - end(); + stop(); } } } @@ -1292,7 +1292,7 @@ public ClientProcessInstance beginSubProcessInstance(ClientProcessDefinition processDefinition, String key) { createSubProcessInstance(processDefinition, key); - subProcessInstance.begin(); + subProcessInstance.start(); return subProcessInstance; } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -99,15 +99,15 @@ return processInstance; } - public ClientProcessInstance beginProcessInstance() { + public ClientProcessInstance startProcessInstance() { ClientProcessInstance processInstance = createProcessInstance(null, null); - processInstance.begin(); + processInstance.start(); return processInstance; } - public ClientProcessInstance beginProcessInstance(String key) { + public ClientProcessInstance startProcessInstance(String key) { ClientProcessInstance processInstance = createProcessInstance(key, null); - processInstance.begin(); + processInstance.start(); return processInstance; } Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -82,7 +82,7 @@ ClientProcessInstance execution = processDefinition.createProcessInstance(); execution.setVariable("creditRate", 7); - execution.begin(); + execution.start(); assertEquals("priority delivery", execution.getNode().getName()); } @@ -92,7 +92,7 @@ ClientProcessInstance execution = processDefinition.createProcessInstance(); execution.setVariable("creditRate", 2); - execution.begin(); + execution.start(); assertEquals("bulk delivery", execution.getNode().getName()); } @@ -102,7 +102,7 @@ ClientProcessInstance execution = processDefinition.createProcessInstance(); execution.setVariable("creditRate", -7); - execution.begin(); + execution.start(); assertEquals("payment upfront", execution.getNode().getName()); } Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -89,7 +89,7 @@ .node("f").behaviour(automaticActivity) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); List<String> expectedEvents = new ArrayList<String>(); @@ -137,7 +137,7 @@ List<String> expectedEvents = new ArrayList<String>(); assertEquals(expectedEvents, recordedEvents); - processInstance.begin(); + processInstance.start(); expectedEvents.add("execute[a]"); assertEquals(expectedEvents, recordedEvents); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -90,7 +90,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); assertEquals("event(node-end) on initial", recorder.events.get(0)); @@ -108,7 +108,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); assertEquals("event(node-begin) on end", recorder.events.get(0)); @@ -126,7 +126,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); assertEquals("event(transition-take) on go", recorder.events.get(0)); @@ -173,7 +173,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, recorder.events.size()); execution.signal(); assertEquals("event(node-end) on one", recorder.events.get(0)); @@ -200,7 +200,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, recorder.events.size()); execution.signal(); @@ -227,7 +227,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("event(node-begin) on one", recorder.events.get(0)); assertEquals(1, recorder.events.size()); execution.signal(); @@ -252,7 +252,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, recorder.events.size()); execution.signal(); @@ -287,7 +287,7 @@ .compositeEnd() .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, processRecorder.events.size()); execution.signal("hello"); @@ -336,7 +336,7 @@ .compositeEnd() .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); // the middle action should not be executed for an event that was propagated from the nested state execution.signal("hello"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -94,7 +94,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); execution.signal(); @@ -125,7 +125,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); execution.signal("t"); @@ -157,7 +157,7 @@ .listener(nodeBeginAction) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); execution.signal(); @@ -206,7 +206,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); assertNull(execution.getVariable("msg")); @@ -224,7 +224,7 @@ public static class EndState implements Activity { private static final long serialVersionUID = 1L; public void execute(ActivityExecution execution) throws Exception { - execution.end(); + execution.stop(); } } @@ -250,7 +250,7 @@ .node("end").behaviour(new EndState()) .done(); - RecordingExecution execution = (RecordingExecution) processDefinition.beginProcessInstance(); + RecordingExecution execution = (RecordingExecution) processDefinition.startProcessInstance(); int index = 0; assertEquals("process-begin on processDefinition(basic)", execution.events.get(index)); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -76,7 +76,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); assertEquals(0, catcher.timesInvoked); @@ -98,7 +98,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); assertEquals(0, catcher.timesInvoked); @@ -120,7 +120,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); assertEquals(0, catcher.timesInvoked); @@ -142,7 +142,7 @@ .exceptionHandlerEnd() .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); assertEquals(0, catcher.timesInvoked); @@ -168,7 +168,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); try { @@ -200,7 +200,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); try { @@ -224,7 +224,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); try { @@ -257,7 +257,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); try { execution.signal(); @@ -288,7 +288,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("initial", execution.getNode().getName()); execution.signal(); @@ -314,7 +314,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); try { execution.signal(); fail("expected exception"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -89,7 +89,7 @@ assertEquals(Execution.STATE_CREATED, processInstance.getState()); - processInstance.begin(); + processInstance.start(); assertEquals(Execution.STATE_ACTIVE, processInstance.getState()); @@ -109,7 +109,7 @@ .done(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); - processInstance.begin(); + processInstance.start(); assertEquals(Execution.STATE_INACTIVE, processInstance.getState()); @@ -132,7 +132,7 @@ .done(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); - processInstance.begin(); + processInstance.start(); processInstance.cancel(); assertEquals(Execution.STATE_CANCELLED, processInstance.getState()); @@ -156,8 +156,8 @@ .done(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); - processInstance.begin(); - processInstance.end("error"); + processInstance.start(); + processInstance.stop("error"); assertEquals("error", processInstance.getState()); @@ -180,38 +180,38 @@ .done(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); - processInstance.begin(); + processInstance.start(); try { - processInstance.end("active"); + processInstance.stop("active"); fail("expected exception"); } catch (PvmException e) { // OK assertTextPresent("invalid end state: active", e.getMessage()); } try { - processInstance.end("suspended"); + processInstance.stop("suspended"); fail("expected exception"); } catch (PvmException e) { // OK assertTextPresent("invalid end state: suspended", e.getMessage()); } try { - processInstance.end("created"); + processInstance.stop("created"); fail("expected exception"); } catch (PvmException e) { // OK assertTextPresent("invalid end state: created", e.getMessage()); } try { - processInstance.end("async"); + processInstance.stop("async"); fail("expected exception"); } catch (PvmException e) { // OK assertTextPresent("invalid end state: async", e.getMessage()); } try { - processInstance.end("inactive"); + processInstance.stop("inactive"); fail("expected exception"); } catch (PvmException e) { // OK Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ExternalDecisionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -73,7 +73,7 @@ public void testGoodRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal("good"); @@ -82,7 +82,7 @@ public void testAverageRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal("average"); @@ -91,7 +91,7 @@ public void testBadRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal("bad"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -89,7 +89,7 @@ assertFalse(processInstance.isEnded()); assertEquals(expectedEvents, recordedEvents); - processInstance.begin(); + processInstance.start(); expectedEvents.add("performed automatic activity"); expectedEvents.add("performed automatic activity"); @@ -117,7 +117,7 @@ .done(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); - processInstance.begin(); + processInstance.start(); List<String> expectedEvents = new ArrayList<String>(); expectedEvents.add("performed automatic activity"); @@ -146,7 +146,7 @@ .done(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); - processInstance.begin(); + processInstance.start(); List<String> expectedEvents = new ArrayList<String>(); expectedEvents.add("performed automatic activity"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -93,7 +93,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); List<Object> expectedIndexes = new ArrayList<Object>(); for (int i=0; i<loops; i++) expectedIndexes.add(i); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -71,7 +71,7 @@ assertEquals(Execution.STATE_CREATED, processInstance.getState()); - processInstance.begin(); + processInstance.start(); Execution scopeExecution = processInstance.getExecutions().iterator().next(); assertEquals(Execution.STATE_INACTIVE, processInstance.getState()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -66,7 +66,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); assertTrue(processInstance.hasVariable("flight")); assertNull(processInstance.getVariable("flight")); @@ -78,7 +78,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); assertTrue(processInstance.hasVariable("flight")); assertEquals("B52", processInstance.getVariable("flight")); @@ -103,7 +103,7 @@ Map<String, Object> expectedVariables = new HashMap<String, Object>(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); expectedVariables.put("flight", "B52"); assertEquals(expectedVariables, processInstance.getVariables()); @@ -135,7 +135,7 @@ .compositeEnd() .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); OpenExecution executionC = processInstance.getExecution("c"); OpenExecution executionI = executionC.getExecution("i"); @@ -187,7 +187,7 @@ .compositeEnd() .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); OpenExecution outerExecution = processInstance.getExecution("outer"); OpenExecution leftMiddleExecution = outerExecution.getExecution("left-middle"); OpenExecution leftInnerExecution = leftMiddleExecution.getExecution("left-inner"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -65,7 +65,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("destination", "anywhere"); processInstance.signal(); @@ -90,7 +90,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.signal(); OpenExecution bScope = processInstance.getExecution("b"); @@ -116,7 +116,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.signal(); OpenExecution bScope = processInstance.getExecution("b"); @@ -142,7 +142,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.signal(); OpenExecution bScope = processInstance.getExecution("b"); @@ -166,7 +166,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.signal(); OpenExecution bScope = processInstance.getExecution("b"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -70,7 +70,7 @@ public static class EndState implements Activity { public void execute(ActivityExecution execution) throws Exception { - execution.end(); + execution.stop(); } } @@ -91,7 +91,7 @@ .node("super3").behaviour(new WaitState()) .done(); - ClientExecution superProcesInstance = superProcess.beginProcessInstance(); + ClientExecution superProcesInstance = superProcess.startProcessInstance(); assertEquals("super2", superProcesInstance.getNode().getName()); ClientExecution subProcessInstance = (ClientExecution) superProcesInstance.getSubProcessInstance(); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -71,7 +71,7 @@ .node("make profit").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertNull(execution.getNode()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -48,7 +48,7 @@ public void execute(ActivityExecution execution) throws Exception { // end the child execution execution // this will also remove the execution from it's parent - execution.end(); + execution.stop(); Node join = execution.getNode(); List<OpenExecution> joinedExecutions = findJoinedExecutions(execution, join); @@ -128,7 +128,7 @@ .node("end").behaviour(new WaitState()) .done(); - ClientExecution main = processDefinition.beginProcessInstance(); + ClientExecution main = processDefinition.startProcessInstance(); assertEquals("fork", main.getNode().getName()); assertEquals(Execution.STATE_INACTIVE, main.getState()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -106,7 +106,7 @@ .listener(outsideListener) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, processListener.events.size()); assertEquals(0, outsideListener.events.size()); @@ -181,7 +181,7 @@ .compositeEnd() .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, processListener.events.size()); assertEquals(0, outsideListener.events.size()); @@ -248,7 +248,7 @@ .compositeEnd() .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, processListener.events.size()); assertEquals(0, compositeListener.events.size()); @@ -321,7 +321,7 @@ .listener(outsideListener) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, processListener.events.size()); assertEquals(0, outsideListener.events.size()); @@ -418,7 +418,7 @@ .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("source inside", execution.getNode().getName()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -53,7 +53,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("customer", "coca-cola"); assertEquals("coca-cola", processInstance.getVariable("customer")); @@ -70,7 +70,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("customer", "coca-cola"); @@ -83,7 +83,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); Map<String, Object> variables = new HashMap<String, Object>(); variables.put("customer", "coca-cola"); @@ -102,7 +102,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("customer", "coca-cola"); processInstance.setVariable("address", "usa"); @@ -120,7 +120,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("customer", "coca-cola"); processInstance.setVariable("address", "usa"); @@ -154,7 +154,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("customer", "coca-cola"); processInstance.setVariable("address", "usa"); @@ -171,7 +171,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("customer", "coca-cola"); processInstance.setVariable("address", "usa"); @@ -189,7 +189,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); assertNull(processInstance.getVariable("answer to life, the universe and everything")); } @@ -213,7 +213,7 @@ // here, the process instance is created first, and only later it is begun ClientProcessInstance processInstance = processDefinition.createProcessInstance(); processInstance.setVariable("customer", "coca-cola"); - processInstance.begin(); + processInstance.start(); assertEquals("Killroy was here", processInstance.getVariable("message")); } @@ -222,7 +222,7 @@ .node("a").initial().behaviour(new WaitState()) .done(); - ClientExecution processInstance = processDefinition.beginProcessInstance(); + ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("niks", null); processInstance.setVariable("nada", null); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -117,7 +117,7 @@ public Object execute(Environment environment) throws Exception { PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); ClientProcessDefinition processDefinition = pvmDbSession.findLatestProcessDefinitionByName("continuations"); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); pvmDbSession.save(execution); return null; } Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Loan.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Loan.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/db/embedded/Loan.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -32,19 +32,24 @@ public class Loan { // the loan process definition as a static resource - private static final ClientProcessDefinition processDefinition = ProcessFactory - .build("loan") - .node("submit loan request").initial().behaviour(AutomaticActivity.class) - .transition().to("evaluate") - .node("evaluate").behaviour(WaitState.class) - .transition("approve").to("wire money") - .transition("reject").to("end") - .node("wire money").behaviour(AutomaticActivity.class) - .transition().to("archive") - .node("archive").behaviour(WaitState.class) - .transition().to("end") - .node("end").behaviour(WaitState.class) - .done(); + private static final ClientProcessDefinition processDefinition = createLoanProcess(); + + private static ClientProcessDefinition createLoanProcess() { + ClientProcessDefinition processDefinition = ProcessFactory.build("loan") + .node("submit loan request").initial().behaviour(AutomaticActivity.class) + .transition().to("evaluate") + .node("evaluate").behaviour(WaitState.class) + .transition("approve").to("wire money") + .transition("reject").to("end") + .node("wire money").behaviour(AutomaticActivity.class) + .transition().to("archive") + .node("archive").behaviour(WaitState.class) + .transition().to("end") + .node("end").behaviour(WaitState.class) + .done(); + + return processDefinition; + } long dbid; String customer; @@ -58,7 +63,7 @@ public Loan(String customer, double amount) { this.customer = customer; this.amount = amount; - this.execution = processDefinition.beginProcessInstance(); + this.execution = processDefinition.startProcessInstance(); } public void approve() { Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -66,7 +66,7 @@ newTransaction(); PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); - Execution execution = pvmDbSession.findLatestProcessDefinitionByName("addresses").beginProcessInstance(); + Execution execution = pvmDbSession.findLatestProcessDefinitionByName("addresses").startProcessInstance(); assertTrue(execution.isEnded()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -62,7 +62,7 @@ getDbSession().save(clientProcessDefinition); - ExecutionImpl execution = (ExecutionImpl) clientProcessDefinition.beginProcessInstance(); + ExecutionImpl execution = (ExecutionImpl) clientProcessDefinition.startProcessInstance(); execution = reload(execution); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -54,7 +54,7 @@ ClientExecution execution = ProcessFactory.build() .node("initial").initial().behaviour(WaitState.class) - .done().beginProcessInstance(); + .done().startProcessInstance(); execution.setVariable("pv", "hello"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -54,7 +54,7 @@ ClientExecution execution = ProcessFactory.build() .node("initial").initial().behaviour(WaitState.class) - .done().beginProcessInstance(); + .done().startProcessInstance(); execution.setVariable("pv", "hello"); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -286,7 +286,7 @@ PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); MessageSession messageSession = environment.get(MessageSession.class); for (int i=0; i<nbrOfTestExecutions; i++) { - ClientExecution execution = processDefinition.beginProcessInstance("execution-"+i); + ClientExecution execution = processDefinition.startProcessInstance("execution-"+i); pvmDbSession.save(execution); for (int j=0; j<nbrOfTestMessagesPerExecution; j++) { Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -66,7 +66,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", "hello"); Variable variable = execution.getVariableObject("v"); @@ -82,7 +82,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Long(5)); Variable variable = execution.getVariableObject("v"); @@ -97,7 +97,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Double(5.5)); Variable variable = execution.getVariableObject("v"); @@ -112,7 +112,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); Calendar calendar = new GregorianCalendar(); calendar.set(Calendar.YEAR, 2007); @@ -137,7 +137,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("affirmative", Boolean.TRUE); execution.setVariable("negative", Boolean.FALSE); @@ -159,7 +159,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Character('c')); @@ -175,7 +175,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Byte((byte)78)); @@ -191,7 +191,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Short((short)78)); @@ -207,7 +207,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Integer(78)); @@ -223,7 +223,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); execution.setVariable("v", new Float(78.65)); @@ -239,7 +239,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); byte[] bytes = generateBytes(); execution.setVariable("v", bytes); @@ -265,7 +265,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); char[] chars = generateChars(); execution.setVariable("v", chars); @@ -300,7 +300,7 @@ ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() - .beginProcessInstance(); + .startProcessInstance(); TestSerializable testSerializable = new TestSerializable(76); execution.setVariable("v", testSerializable); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex01/BasicProcessExecutionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -47,7 +47,7 @@ .node("e").behaviour(WaitState.class) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("a", execution.getNode().getName()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex03/VariablesTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -50,7 +50,7 @@ ClientProcessInstance execution = processDefinition.createProcessInstance(); execution.setVariables(variables); - execution.begin(); + execution.start(); assertEquals("business trip", execution.getVariable("reason")); assertEquals("$1500", execution.getVariable("total amount")); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex04/ExternalDecisionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -54,7 +54,7 @@ public void testGoodRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal("good"); assertEquals("priority delivery", execution.getNode().getName()); @@ -63,7 +63,7 @@ public void testAverageRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal("average"); assertEquals("bulk delivery", execution.getNode().getName()); @@ -72,7 +72,7 @@ public void testBadRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal("bad"); assertEquals("payment upfront", execution.getNode().getName()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex05/InternalDecisionTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -53,7 +53,7 @@ public void testGoodRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.setVariable("creditRate", 7); execution.signal(); @@ -63,7 +63,7 @@ public void testAverageRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.setVariable("creditRate", 2); execution.signal(); @@ -73,7 +73,7 @@ public void testBadRating() { ClientProcessDefinition processDefinition = createCreditProcess(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.setVariable("creditRate", -9); execution.signal(); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex06/HumanTaskTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -42,7 +42,7 @@ .node("business as usual").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("shred evidence", execution.getNode().getName()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex07/EventListenerTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -55,7 +55,7 @@ .listener(new Display("entering b")) .done(); - processDefinition.beginProcessInstance(); + processDefinition.startProcessInstance(); assertEquals( "leaving a" + "\n" + Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex08/SequenceTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -45,7 +45,7 @@ .compositeEnd() .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); assertTrue(execution.isEnded()); assertEquals("sequence", execution.getNode().getName()); Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/samples/ex09/EventPropagationTest.java 2008-09-15 10:19:54 UTC (rev 2241) @@ -47,7 +47,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); execution.signal(); } @@ -66,7 +66,7 @@ .node("c").behaviour(new WaitState()) .done(); - ClientExecution execution = processDefinition.beginProcessInstance(); + ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); execution.signal(); } Modified: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml =================================================================== --- jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2008-09-15 10:01:38 UTC (rev 2240) +++ jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2008-09-15 10:19:54 UTC (rev 2241) @@ -17,32 +17,49 @@ objects directly through the client API. Let's show this by an example. We start by creating a <literal>ClientProcessDefinition</literal> that looks like this: </para> + + <para>Object execution mode is the simplest form of working with the Process + Virtual Machine. This means working with the process definition and execution + objects directly through the client API. Let's show this by an example. We + start by creating a <literal>ClientProcessDefinition</literal> that looks like this: + </para> <figure id="loan.process"> <title>The loan process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/loan.process.png"/></imageobject></mediaobject> </figure> - <programlisting>ClientProcessDefinition <emphasis role="bold">processDefinition</emphasis> = ProcessFactory.build() - .node("a").initial().behaviour(AutomaticActivity.class) - .transition().to("b") - .node("b").behaviour(AutomaticActivity.class) - .transition().to("c") - .node("c").behaviour(WaitState.class) - .transition().to("d") - .node("d").behaviour(AutomaticActivity.class) - .transition().to("f") - .node("e").behaviour(AutomaticActivity.class) - .transition().to("e") - .node("f").behaviour(WaitState.class) + <programlisting>ClientProcessDefinition processDefinition = ProcessFactory.build("loan") + .node("submit loan request").initial().behaviour(AutomaticActivity.class) + .transition().to("evaluate") + .node("evaluate").behaviour(WaitState.class) + .transition("approve").to("wire money") + .transition("reject").to("end") + .node("wire money").behaviour(AutomaticActivity.class) + .transition().to("archive") + .node("archive").behaviour(WaitState.class) + .transition().to("end") + .node("end").behaviour(WaitState.class) .done();</programlisting> - <para>The <literal>ProcessFactory</literal> is a helper class that provides convenience - for building an object graph that represents a process definition. - <literal>AutomaticActivity</literal> just acts as a pass through activity without anything - happening and <literal>WaitState</literal> will wait until an external signal is given. Both - activity implementations will be covered in more depth later. - </para> - <para>A process - </para> - </section> + <para>The <literal>ProcessFactory</literal> is a helper class that provides convenience + for building an object graph that represents a process definition. + <literal>AutomaticActivity</literal> is a pass-through activity without anything + happening and <literal>WaitState</literal> will wait until an external signal is given. Both + activity implementations will be covered in more depth later. + </para> + <para>The <literal>processDefinition</literal> object serves as a factory for process + instance objects. A process instance represents one execution of the process definition. + </para> + <programlisting>ClientExecution execution = processDefinition.startProcessInstance();</programlisting> + <para>The <literal>execution</literal> can be seen as a state machine. + </para> + </section> + + <section id="persistentexecutionmode"> + <title>Persistent execution mode</title> + <para>Embedded execution mode means that process definitions, the runtime + executions and the history information all is stored in the PVM database + schema. + </para> + </section> <section id="persistentexecutionmode"> <title>Persistent execution mode</title> @@ -58,4 +75,5 @@ as a string column inside a user domain object like e.g. an Order. </para> </section> + </chapter> \ No newline at end of file