[jbpm-commits] JBoss JBPM SVN: r3873 - in jbpm4/trunk/modules: enterprise/src/main/java/org/jbpm/enterprise/mgmt and 27 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-02-13 11:04:59 -0500 (Fri, 13 Feb 2009) New Revision: 3873 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml Log: JBPM-1986 renamed startExecutionXxx methods to startProcessInstanceXxx Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -25,63 +25,60 @@ import java.util.Map; import java.util.Set; -import org.jbpm.history.HistoryActivityInstanceQuery; -import org.jbpm.history.HistoryProcessInstanceQuery; - /** manages runtime process executions. * * @author Tom Baeyens */ public interface ExecutionService { - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */ - Execution startExecutionById(String processDefinitionId); + Execution startProcessInstanceById(String processDefinitionId); - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param executionKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startExecutionById(String processDefinitionId, String executionKey); + Execution startProcessInstanceById(String processDefinitionId, String executionKey); - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. */ - Execution startExecutionById(String processDefinitionId, Map<String, Object> variables); + Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables); - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. * @param executionKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startExecutionById(String processDefinitionId, Map<String, Object> variables, String executionKey); + Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey); - /** starts a new execution in the latest version of the given process definition. + /** starts a new process instance in the latest version of the given process definition. * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */ - Execution startExecutionByKey(String processDefinitionKey); + Execution startProcessInstanceByKey(String processDefinitionKey); - /** starts a new execution in the latest version of the given processDefinitionName. + /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition * for which the latest version will be taken. * @param executionKey is a user provided reference for the new execution * that must be unique over all process versions with the same name. */ - Execution startExecutionByKey(String processDefinitionKey, String executionKey); + Execution startProcessInstanceByKey(String processDefinitionKey, String executionKey); - /** starts a new execution in the latest version of the given processDefinitionName. + /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition * for which the latest version will be taken. * @param variables are the initial values of the process variables that * will be set before the execution starts (read: before the initial * activity is executed). */ - Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables); + Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables); - /** starts a new execution in the latest version of the given processDefinitionName. + /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. * @param variables are the initial values of the process variables that will be set before the execution starts. * @param executionKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey); + Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey); /** the execution that is uniquely defined by the process definition and the business key. */ Execution findExecution(String processDefinitionName, String executionKey); Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -122,7 +122,7 @@ public ProcessInstanceRef newInstance(String definitionId) { ExecutionService execService = this.processEngine.getExecutionService(); - Execution exec = execService.startExecutionById(definitionId); + Execution exec = execService.startProcessInstanceById(definitionId); return ModelAdaptor.adoptExecution((OpenExecution)exec); } Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -142,7 +142,7 @@ */ public void testCancel() throws CreateException { // start an execution - environment.get(ExecutionService.class).startExecutionById(processDefinitionId); + environment.get(ExecutionService.class).startProcessInstanceById(processDefinitionId); // wait past the due date, ensure activity did not execute Date executionDate = HappyListener.waitFor(2 * TIMEOUT); Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -133,7 +133,7 @@ environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(), processDefinition).deploy(); // start execution - Execution execution = environment.get(ExecutionService.class).startExecutionById( + Execution execution = environment.get(ExecutionService.class).startProcessInstanceById( processDefinition.getId()); TimerImpl timer = new TimerImpl(); @@ -176,7 +176,7 @@ processDefinition).deploy(); // start execution ExecutionService executionService = environment.get(ExecutionService.class); - ExecutionImpl execution = (ExecutionImpl) executionService.startExecutionById(processDefinition + ExecutionImpl execution = (ExecutionImpl) executionService.startProcessInstanceById(processDefinition .getId()); TimerImpl timer = new TimerImpl(); @@ -226,7 +226,7 @@ processDefinition).deploy(); // start execution ExecutionImpl execution = (ExecutionImpl) environment.get(ExecutionService.class) - .startExecutionById(processDefinition.getId()); + .startProcessInstanceById(processDefinition.getId()); TimerImpl timer = new TimerImpl(); timer.setEventName("timeout"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -36,7 +36,7 @@ public void testConcurrencyGraphBased() { deployJpdlResource("org/jbpm/examples/concurrency/graphbased/process.jpdl.xml"); - Execution processInstance = executionService.startExecutionByKey("ConcurrencyGraphBased"); + Execution processInstance = executionService.startProcessInstanceByKey("ConcurrencyGraphBased"); String pid = processInstance.getId(); Set<String> expectedActivityNames = new HashSet<String>(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testEndMultipleOk() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndMultiple"); + Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "200"); assertTrue(execution.isEnded()); @@ -43,7 +43,7 @@ public void testEndMultipleBadRequest() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndMultiple"); + Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); assertTrue(execution.isEnded()); @@ -53,7 +53,7 @@ public void testEndMultipleInternalServerError() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndMultiple"); + Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "500"); assertTrue(execution.isEnded()); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testEndProcessInstance() { deployJpdlResource("org/jbpm/examples/end/processinstance/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndProcessInstance"); + Execution execution = executionService.startProcessInstanceByKey("EndProcessInstance"); assertTrue(execution.isEnded()); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testEndStateCompleted() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndState"); + Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "200"); assertEquals("completed", execution.getState()); @@ -43,7 +43,7 @@ public void testEndStateErrorBadRequest() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndState"); + Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); assertEquals("cancel", execution.getState()); @@ -53,7 +53,7 @@ public void testEndStateErrorInternalServerError() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndState"); + Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "500"); assertEquals("error", execution.getState()); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -57,7 +57,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("title", "Internetworking with TCP/IP"); - Execution execution = executionService.startExecutionByKey("Esb", variables); + Execution execution = executionService.startProcessInstanceByKey("Esb", variables); Message message = courier.getMessage(); Body body = message.getBody(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -38,7 +38,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "good"); - Execution execution = executionService.startExecutionByKey("ExclusiveConditions", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveConditions", variables); assertEquals("submit document", execution.getActivityName()); } @@ -47,7 +47,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "bad"); - Execution execution = executionService.startExecutionByKey("ExclusiveConditions", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveConditions", variables); assertEquals("try again", execution.getActivityName()); } @@ -56,7 +56,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "ugly"); - Execution execution = executionService.startExecutionByKey("ExclusiveConditions", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveConditions", variables); assertEquals("give up", execution.getActivityName()); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -38,7 +38,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "good"); - Execution execution = executionService.startExecutionByKey("ExclusiveExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveExpression", variables); assertEquals("submit document", execution.getActivityName()); } @@ -47,7 +47,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "bad"); - Execution execution = executionService.startExecutionByKey("ExclusiveExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveExpression", variables); assertEquals("try again", execution.getActivityName()); } @@ -56,7 +56,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "ugly"); - Execution execution = executionService.startExecutionByKey("ExclusiveExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveExpression", variables); assertEquals("give up", execution.getActivityName()); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -38,7 +38,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "you're great"); - Execution execution = executionService.startExecutionByKey("ExclusiveHandler", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveHandler", variables); assertEquals("submit document", execution.getActivityName()); } @@ -47,7 +47,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "you gotta improve"); - Execution execution = executionService.startExecutionByKey("ExclusiveHandler", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveHandler", variables); assertEquals("try again", execution.getActivityName()); } @@ -56,7 +56,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "you suck"); - Execution execution = executionService.startExecutionByKey("ExclusiveHandler", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveHandler", variables); assertEquals("give up", execution.getActivityName()); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ public void testHql() { deployJpdlResource("org/jbpm/examples/hql/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Hql"); + Execution execution = executionService.startProcessInstanceByKey("Hql"); String executionId = execution.getId(); Set<String> variableNames = executionService.getVariableNames(executionId); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testJavaInstantiate() { deployJpdlResource("org/jbpm/examples/java/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Java"); + Execution execution = executionService.startProcessInstanceByKey("Java"); String executionId = execution.getId(); String answer = (String) executionService.getVariable(executionId, "answer"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -40,7 +40,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("person", new Person("Honolulu")); - Execution execution = executionService.startExecutionByKey("ScriptExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ScriptExpression", variables); String executionId = execution.getId(); String text = (String) executionService.getVariable(executionId, "text"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("person", new Person("Honolulu")); - Execution execution = executionService.startExecutionByKey("ScriptText", variables); + Execution execution = executionService.startProcessInstanceByKey("ScriptText", variables); String executionId = execution.getId(); String text = (String) executionService.getVariable(executionId, "text"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -36,7 +36,7 @@ public void testSql() { deployJpdlResource("org/jbpm/examples/sql/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Sql"); + Execution execution = executionService.startProcessInstanceByKey("Sql"); String executionId = execution.getId(); List<String> expectedActivityNames = new ArrayList<String>(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testStateChoiceAccept() { deployJpdlResource("org/jbpm/examples/state/choice/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("StateChoice"); + Execution execution = executionService.startProcessInstanceByKey("StateChoice"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "accept"); assertEquals("submit document", execution.getActivityName()); @@ -42,7 +42,7 @@ public void testStateChoiceReject() { deployJpdlResource("org/jbpm/examples/state/choice/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("StateChoice"); + Execution execution = executionService.startProcessInstanceByKey("StateChoice"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "reject"); assertEquals("try again", execution.getActivityName()); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testWaitStatesSequence() { deployJpdlResource("org/jbpm/examples/state/sequence/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("StateSequence"); + Execution execution = executionService.startProcessInstanceByKey("StateSequence"); assertEquals("a", execution.getActivityName()); String executionId = execution.getId(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -36,7 +36,7 @@ public void testTask() { deployJpdlResource("org/jbpm/examples/task/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Task"); + Execution execution = executionService.startProcessInstanceByKey("Task"); String executionId = execution.getId(); List<Task> taskList = taskService.getPersonalTaskList("johndoe", 0, 10); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -53,37 +53,37 @@ protected CommandService commandService; - public Execution startExecutionById(String processDefinitionId){ + public Execution startProcessInstanceById(String processDefinitionId){ return commandService.execute(new StartExecutionCmd(processDefinitionId, null, null)); } - public Execution startExecutionById(String processDefinitionId, String executionKey) { + public Execution startProcessInstanceById(String processDefinitionId, String executionKey) { return commandService.execute(new StartExecutionCmd(processDefinitionId, null, executionKey)); } - public Execution startExecutionById(String processDefinitionId, Map<String, Object> variables){ + public Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables){ return commandService.execute(new StartExecutionCmd(processDefinitionId, variables, null)); } - public Execution startExecutionById(String processDefinitionId, Map<String, Object> variables, String executionKey){ + public Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey){ return commandService.execute(new StartExecutionCmd(processDefinitionId, variables, executionKey)); } - public Execution startExecutionByKey(String processDefinitionKey) { + public Execution startProcessInstanceByKey(String processDefinitionKey) { return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, null, null)); } - public Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables){ + public Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables){ return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, variables, null)); } - public Execution startExecutionByKey(String processDefinitionKey, String executionKey) { + public Execution startProcessInstanceByKey(String processDefinitionKey, String executionKey) { return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, null, executionKey)); } - public Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey){ + public Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey){ return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, variables, executionKey)); } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ public void testContinuations() { deployProcess(); - Execution execution = executionService.startExecutionByKey("continuations"); + Execution execution = executionService.startProcessInstanceByKey("continuations"); assertEquals("start", execution.getActivityName()); assertEquals(Execution.STATE_ASYNC, execution.getState()); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -50,11 +50,11 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", "far"); - Execution execution = executionService.startExecutionByKey("Poolcar", variables); + Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Big car", execution.getActivityName()); variables.put("distance", "nearby"); - execution = executionService.startExecutionByKey("Poolcar", variables); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Small car", execution.getActivityName()); } @@ -81,15 +81,15 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", new Integer(69)); - Execution execution = executionService.startExecutionByKey("Poolcar", variables); + Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Big car", execution.getActivityName()); variables.put("distance", new Integer(6)); - execution = executionService.startExecutionByKey("Poolcar", variables); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Small car", execution.getActivityName()); variables.put("distance", new Integer(2)); - execution = executionService.startExecutionByKey("Poolcar", variables); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("No car", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -46,7 +46,7 @@ "</process>" ); - Execution execution = executionService.startExecutionById("ThreeStates:1"); + Execution execution = executionService.startProcessInstanceById("ThreeStates:1"); assertEquals("b", execution.getActivityName()); String executionId = execution.getId(); @@ -75,16 +75,16 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("p", "one"); + Execution execution = executionService.startProcessInstanceByKey("p", "one"); assertEquals("ed", execution.getActivityName()); execution = executionService.signalExecutionById("p/one", "left"); assertEquals("b", execution.getActivityName()); - executionService.startExecutionById("p:1", "two"); + executionService.startProcessInstanceById("p:1", "two"); execution = executionService.signalExecutionById("p/two", "middle"); assertEquals("c", execution.getActivityName()); - executionService.startExecutionById("p:1", "three"); + executionService.startProcessInstanceById("p:1", "three"); execution = executionService.signalExecutionById("p/three", "right"); assertEquals("d", execution.getActivityName()); } @@ -106,7 +106,7 @@ "</process>" ); - executionService.startExecutionByKey("p", "one"); + executionService.startProcessInstanceByKey("p", "one"); try { executionService.signalExecutionById("p/one", "left"); } catch (JbpmException e) { @@ -131,7 +131,7 @@ "</process>" ); - executionService.startExecutionByKey("p", "one"); + executionService.startProcessInstanceByKey("p", "one"); Execution execution = executionService.signalExecutionById("p/one", "up"); assertEquals("a", execution.getActivityName()); } @@ -146,7 +146,7 @@ "</process>" ); - executionService.startExecutionByKey("p", "one"); + executionService.startProcessInstanceByKey("p", "one"); Execution execution = executionService.signalExecutionById("p/one"); assertEquals("a", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("p"); + Execution execution = executionService.startProcessInstanceByKey("p"); // take the id and see if the execution service can still find it back execution = executionService.findExecution(execution.getId()); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -51,7 +51,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "82436"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "82436"); assertEquals("a", execution.getActivityName()); @@ -80,7 +80,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "82436"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "82436"); assertEquals("a", execution.getActivityName()); @@ -106,7 +106,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "82436"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "82436"); Map<String,Object> variables = new HashMap<String,Object>(); variables.put("customer", "John Doe"); @@ -139,7 +139,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("p"); + Execution execution = executionService.startProcessInstanceByKey("p"); execution = executionService.signalExecutionById(execution.getId()); assertEquals("a", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -46,7 +46,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL"); + Execution execution = executionService.startProcessInstanceByKey("ICL"); assertNotNull(execution); assertEquals("a", execution.getActivityName()); @@ -62,7 +62,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL"); + Execution execution = executionService.startProcessInstanceByKey("ICL"); assertNotNull(execution); assertEquals("a", execution.getActivityName()); @@ -76,7 +76,7 @@ "</process>" ); - execution = executionService.startExecutionByKey("ICL"); + execution = executionService.startProcessInstanceByKey("ICL"); assertNotNull(execution); assertEquals("b", execution.getActivityName()); @@ -107,7 +107,7 @@ variables.put("b", "text"); // feed the variables in - Execution execution = executionService.startExecutionByKey("ICL", variables); + Execution execution = executionService.startProcessInstanceByKey("ICL", variables); String executionId = execution.getId(); assertEquals("b", execution.getActivityName()); @@ -129,7 +129,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "one"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "one"); assertNotNull(execution); assertEquals("ICL/one", execution.getId()); @@ -150,7 +150,7 @@ variables.put("type", "Accident"); variables.put("amount", new Float(763.74)); - Execution execution = executionService.startExecutionByKey("ICL", variables); + Execution execution = executionService.startProcessInstanceByKey("ICL", variables); String executionId = execution.getId(); @@ -178,7 +178,7 @@ ProcessDefinition processDefinition = processService.findProcessDefinitionsByKey("ICL").get(0); // start an execution for the process with the given id - Execution execution = executionService.startExecutionById("ICL:1"); + Execution execution = executionService.startProcessInstanceById("ICL:1"); assertNotNull(execution); // checking the state @@ -210,7 +210,7 @@ variables.put("b", "text"); // provide the variables in the start execution method - Execution execution = executionService.startExecutionById("ICL:1", variables); + Execution execution = executionService.startProcessInstanceById("ICL:1", variables); String executionId = execution.getId(); assertEquals(new Integer(1), executionService.getVariable(executionId, "a")); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -75,7 +75,7 @@ } protected void executeProcess() throws InterruptedException { - Execution execution = executionService.startExecutionByKey("ICL"); + Execution execution = executionService.startProcessInstanceByKey("ICL"); Thread.sleep(50); executionService.signalExecutionById(execution.getId()); Thread.sleep(20); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -52,16 +52,16 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", "far"); - executionService.startExecutionByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); variables.put("distance", "nearby"); - executionService.startExecutionByKey("TRS", variables); - executionService.startExecutionByKey("TRS", variables); - executionService.startExecutionByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); variables.put("distance", "other country"); - executionService.startExecutionByKey("TRS", variables); - executionService.startExecutionByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); Map<String, Integer> choiceDistribution = historyService.choiceDistribution("TRS:1", "How far?"); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -43,9 +43,9 @@ "</process>" ); - executionService.startExecutionByKey("ICL"); - executionService.startExecutionByKey("ICL"); - executionService.startExecutionByKey("ICL"); + executionService.startProcessInstanceByKey("ICL"); + executionService.startProcessInstanceByKey("ICL"); + executionService.startProcessInstanceByKey("ICL"); List<HistoryProcessInstance> historyProcessInstances = historyService .createHistoryProcessInstanceQuery() Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -164,10 +164,10 @@ "</process>") .deploy(); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); // delete it all processService.deleteProcessDefinitionCascade("deleteme:33"); @@ -187,10 +187,10 @@ "</process>" ); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); // delete it all try { @@ -334,7 +334,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("minimal"); + Execution execution = executionService.startProcessInstanceByKey("minimal"); assertEquals("end", execution.getActivityName()); assertTrue(execution.isEnded()); @@ -348,7 +348,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("minimal"); + Execution execution = executionService.startProcessInstanceByKey("minimal"); assertTrue(execution.isEnded()); assertFalse(execution.isActive()); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -44,7 +44,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); Set<String> variableNames = executionService.getVariableNames("var/one"); assertNotNull(variableNames); assertEquals(0, variableNames.size()); @@ -68,7 +68,7 @@ Set<String> expectedVariableNames = new HashSet<String>(variables.keySet()); Map<String, Object> expectedVariables = new HashMap<String, Object>(variables); - executionService.startExecutionByKey("var", variables, "one"); + executionService.startProcessInstanceByKey("var", variables, "one"); Set<String> variableNames = executionService.getVariableNames("var/one"); assertNotNull(variableNames); @@ -90,7 +90,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); executionService.setVariable("var/one", "msg", "hello"); assertEquals("hello", executionService.getVariable("var/one", "msg")); executionService.setVariable("var/one", "msg", "world"); @@ -107,7 +107,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); executionService.setVariable("var/one", "msg", "hello"); assertEquals("hello", executionService.getVariable("var/one", "msg")); executionService.setVariable("var/one", "msg", new Integer(5)); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -42,7 +42,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); executionService.setVariable("var/one", "msg", variableValue); assertEquals(variableValue, executionService.getVariable("var/one", "msg")); } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -101,7 +101,7 @@ public void startExecutions() { for (int i = 0; i < nbrOfExecutions; i++) { - executionService.startExecutionByKey("continuations"); + executionService.startProcessInstanceByKey("continuations"); } } } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -99,7 +99,7 @@ } } public void executeProcess() { - Execution execution = executionService.startExecutionByKey("Process"); + Execution execution = executionService.startProcessInstanceByKey("Process"); assertEquals("c", execution.getActivityName()); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId); Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2009-02-13 16:04:59 UTC (rev 3873) @@ -198,7 +198,7 @@ &lt;/process&gt;</programlisting> <para>After you start an execution like this:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>the created process instance will be positioned in state <literal>a</literal>. Providing an external trigger can be done with the <literal>signalExecution</literal> methods.</para> @@ -232,7 +232,7 @@ &lt;/process&gt;</programlisting> <para>Let's start a new process instance for this process definition:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>Now, the execution is arrived in the <literal>wait for response</literal>. The execution will wait there until an external trigger is given. In case a <literal>state</literal> has multiple outgoing flows, the signalName given @@ -598,7 +598,7 @@ </para> <programlisting>Map&lt;String, Object&gt; variables = new HashMap&lt;String, Object&gt;(); variables.put("distance", "far"); -Execution execution = executionService.startExecutionByKey(&quot;Poolcar&quot;, variables);</programlisting> +Execution execution = executionService.startProcessInstanceByKey(&quot;Poolcar&quot;, variables);</programlisting> <para>then the new execution will go to activity <literal>Big car</literal>.</para> </section> @@ -768,7 +768,7 @@ </programlisting> <para>Now if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>bad request</literal> end event.</para> - <programlisting>Execution execution = executionService.startExecutionByKey(&quot;EndMultiple&quot;); + <programlisting>Execution execution = executionService.startProcessInstanceByKey(&quot;EndMultiple&quot;); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, &quot;400&quot;); </programlisting> @@ -834,7 +834,7 @@ </programlisting> <para>This time, if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>cancel</literal> state.</para> - <programlisting>Execution execution = executionService.startExecutionByKey(&quot;EndState&quot;); + <programlisting>Execution execution = executionService.startProcessInstanceByKey(&quot;EndState&quot;); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, &quot;400&quot;); </programlisting> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml 2009-02-13 16:04:59 UTC (rev 3873) @@ -180,13 +180,13 @@ <para>Simplest and most common way to start a new process instance for a process definition is like this: </para> - <programlisting>executionService.startExecutionByKey("ICL");</programlisting> + <programlisting>executionService.startProcessInstanceByKey("ICL");</programlisting> <para>In this case, the service method will first look up the latest version of the processes with key <literal>ICL</literal>. Then a new process instance is started in that latest process definition. </para> <para>When a new version of the insurance claim process - is deployed, all invocations of <literal>startExecutionByKey</literal> + is deployed, all invocations of <literal>startProcessInstanceByKey</literal> will automatically switch to the newly deployed version. </para> </section> @@ -196,7 +196,7 @@ <para>If instead you want to start a new process instance in a very specific version, you can use the id of the process definition like this: </para> - <programlisting>executionService.startExecutionById("ICL:1");</programlisting> + <programlisting>executionService.startProcessInstanceById("ICL:1");</programlisting> </section> <section id="withakey"> @@ -207,7 +207,7 @@ to find such a key in the domain of the business process. For example, an order id or an insurance claim number. </para> - <programlisting>executionService.startExecutionByKey("ICL", "CL92837");</programlisting> + <programlisting>executionService.startProcessInstanceByKey("ICL", "CL92837");</programlisting> <para>The key is used to create the id of the process instance. The format used is <literal>{process-key}/{execution-id}</literal>. So execution created in the previous code snippet will have id @@ -215,7 +215,7 @@ </para> <para>If no user defined key is provided, the DB primary key is taken as the key. In that case, the id can be retrieved like this: - <programlisting>Execution execution = executionService.startExecutionByKey("ICL"); + <programlisting>Execution execution = executionService.startProcessInstanceByKey("ICL"); String executionId = execution.getId();</programlisting> </para> <para>We recommend the use of a user defined keys. Typically in your application @@ -236,7 +236,7 @@ variables.put("type", "Accident"); variables.put("amount", new Float(763.74)); -executionService.startExecutionByKey("ICL", variables);</programlisting> +executionService.startProcessInstanceByKey("ICL", variables);</programlisting> </section> </section> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-02-13 16:04:59 UTC (rev 3873) @@ -201,7 +201,7 @@ &lt;/process&gt;</programlisting> <para>After you start an execution like this:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>the created process instance will be positioned in state <literal>a</literal>. Providing an external trigger can be done with the <literal>signalExecution</literal> methods.</para> @@ -235,7 +235,7 @@ &lt;/process&gt;</programlisting> <para>Let's start a new process instance for this process definition:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>Now, the execution is arrived in the <literal>wait for response</literal>. The execution will wait there until an external trigger is given. In case a <literal>state</literal> has multiple outgoing flows, the signalName given @@ -389,7 +389,7 @@ </para> <programlisting>Map&lt;String, Object&gt; variables = new HashMap&lt;String, Object&gt;(); variables.put("distance", "far"); -Execution execution = executionService.startExecutionByKey(&quot;Poolcar&quot;, variables);</programlisting> +Execution execution = executionService.startProcessInstanceByKey(&quot;Poolcar&quot;, variables);</programlisting> <para>then the new execution will go to activity <literal>Big car</literal>.</para> </section> @@ -621,7 +621,7 @@ </programlisting> <para>Now if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>bad request</literal> end event.</para> - <programlisting>Execution execution = executionService.startExecutionByKey(&quot;EndMultiple&quot;); + <programlisting>Execution execution = executionService.startProcessInstanceByKey(&quot;EndMultiple&quot;); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, &quot;400&quot;); </programlisting> @@ -687,7 +687,7 @@ </programlisting> <para>This time, if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>cancel</literal> state.</para> - <programlisting>Execution execution = executionService.startExecutionByKey(&quot;EndState&quot;); + <programlisting>Execution execution = executionService.startProcessInstanceByKey(&quot;EndState&quot;); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, &quot;400&quot;); </programlisting> @@ -870,7 +870,7 @@ &lt;/process&gt;</programlisting> <para>After starting a process like this </para> - <programlisting>executionService.startExecutionByKey(&quot;Task&quot;);</programlisting> + <programlisting>executionService.startProcessInstanceByKey(&quot;Task&quot;);</programlisting> <para>The task list for user johndoe can be obtained from the <literal>TaskService</literal> like this</para> <programlisting>taskService.getPersonalTaskList("johndoe", 0, 10);</programlisting> @@ -977,7 +977,7 @@ <programlisting>Map&lt;String, Object&gt; variables = new HashMap&lt;String, Object&gt;(); variables.put("<emphasis role="bold">person</emphasis>", <emphasis role="bold">new Person(&quot;Honolulu&quot;)</emphasis>); -executionService.startExecutionByKey(&quot;ScriptText&quot;, variables);</programlisting> +executionService.startProcessInstanceByKey(&quot;ScriptText&quot;, variables);</programlisting> <para>After the execution of the script activity, variable <literal>text</literal> will contain 'Send packet to Honolulu'. </para>