[jbpm-commits] JBoss JBPM SVN: r4538 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-04-10 10:54:55 -0400 (Fri, 10 Apr 2009) New Revision: 4538 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java Log: JBPM-2134 removed execution hierarchy methods and sub process instance methods from ActivityExecution interface Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-04-10 14:48:00 UTC (rev 4537) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-04-10 14:54:55 UTC (rev 4538) @@ -134,62 +134,6 @@ /** position the given execution in the destination activity */ void setActivity(Activity destination, Execution execution); - // managing the parent-child relation /////////////////////////////////////// - - /** creates a child execution. See - * {@link #createExecution(Execution, String)} for more information. */ - Execution createExecution(); - - /** creates a child execution with the given name. See - * {@link #createExecution(Execution, String)} for more information. */ - Execution createExecution(String name); - - /** creates a new child execution under the given parent. See - * {@link #createExecution(Execution, String)} for more information. - * @throws JbpmException if the given parent is not in this execution's - * process instance. */ - Execution createExecution(Execution parent); - - /** creates a new child execution under the given parent with the given name. - * Only leaf executions can be active. So creating the first child execution - * will {@link Execution#STATE_INACTIVE inactivate} the parent execution - * automatically. - * @throws JbpmException if the given parent is not in this execution's - * process instance. */ - Execution createExecution(String name, Execution parent); - - /** removes the child execution from this execution. Removing the last - * child execution of a parent will cause the parent's state to become - * {@link Execution#STATE_ACTIVE active}. */ - void removeExecution(Execution child); - - /** removes the child execution from the given parent. Removing the last - * child execution of a parent will cause the parent's state to become - * {@link Execution#STATE_ACTIVE active}. */ - void removeExecution(Execution child, Execution parent); - - // create sub process execution ///////////////////////////////////////////// - - /** creates a sub process related to this path of execution. - * ProcessDefinitions can be obtained from the {@link PvmDbSession} - * in the {@link Environment}. */ - ClientProcessInstance createSubProcessInstance(ClientProcessDefinition processDefinition); - - /** creates a sub process related to this path of execution. - * ProcessDefinitions can be obtained from the {@link PvmDbSession} - * in the {@link Environment}. */ - ClientProcessInstance createSubProcessInstance(ClientProcessDefinition processDefinition, String key); - - /** creates and begins a sub process related to this path of execution. - * ProcessDefinitions can be obtained from the {@link PvmDbSession} - * in the {@link Environment}. */ - ClientProcessInstance beginSubProcessInstance(ClientProcessDefinition processDefinition); - - /** creates and begins a sub process related to this path of execution. - * ProcessDefinitions can be obtained from the {@link PvmDbSession} - * in the {@link Environment}. */ - ClientProcessInstance beginSubProcessInstance(ClientProcessDefinition processDefinition, String key); - // ending an execution ////////////////////////////////////////////////////// /** ends this execution and all of its child executions. Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java 2009-04-10 14:48:00 UTC (rev 4537) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ForkActivity.java 2009-04-10 14:54:55 UTC (rev 4538) @@ -28,6 +28,7 @@ import org.jbpm.model.Activity; import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; +import org.jbpm.pvm.internal.model.ExecutionImpl; /** @@ -48,7 +49,8 @@ // launch a concurrent path of execution String childExecutionName = outgoingTransition.getName(); // creating the execution will cause the execution to become inactive - Execution childExecution = execution.createExecution(childExecutionName, processInstance); + ExecutionImpl executionImpl = (ExecutionImpl) execution; + Execution childExecution = executionImpl.createExecution(childExecutionName, processInstance); execution.take(outgoingTransition, childExecution); } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-04-10 14:48:00 UTC (rev 4537) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JoinActivity.java 2009-04-10 14:54:55 UTC (rev 4538) @@ -30,6 +30,7 @@ import org.jbpm.model.Activity; import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; +import org.jbpm.pvm.internal.model.ExecutionImpl; /** @@ -59,7 +60,8 @@ ) { outgoingExecution = processInstance; } else { - outgoingExecution = execution.createExecution(processInstance); + ExecutionImpl executionImpl = (ExecutionImpl) execution; + outgoingExecution = executionImpl.createExecution(processInstance); } execution.setActivity(join, outgoingExecution); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-04-10 14:48:00 UTC (rev 4537) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-04-10 14:54:55 UTC (rev 4538) @@ -29,6 +29,7 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; +import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.test.BaseJbpmTestCase; /** @@ -44,7 +45,8 @@ this.subProcess = subProcess; } public void execute(ActivityExecution execution) throws Exception { - ClientExecution subProcessInstance = execution.beginSubProcessInstance(subProcess); + ExecutionImpl executionImpl = (ExecutionImpl) execution; + ClientExecution subProcessInstance = executionImpl.beginSubProcessInstance(subProcess); if (!subProcessInstance.isEnded()) { execution.waitForSignal(); } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-04-10 14:48:00 UTC (rev 4537) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-04-10 14:54:55 UTC (rev 4538) @@ -15,6 +15,7 @@ import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; +import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.test.BaseJbpmTestCase; /** @@ -38,7 +39,8 @@ // launch a concurrent path of execution String childExecutionName = outgoingTransition.getName(); // creating the execution will cause the execution to become inactive - Execution childExecution = execution.createExecution(childExecutionName, processInstance); + ExecutionImpl executionImpl = (ExecutionImpl) execution; + Execution childExecution = executionImpl.createExecution(childExecutionName, processInstance); execution.take(outgoingTransition, childExecution); } @@ -71,7 +73,8 @@ ) { outgoingExecution = processInstance; } else { - outgoingExecution = execution.createExecution(processInstance); + ExecutionImpl executionImpl = (ExecutionImpl) execution; + outgoingExecution = executionImpl.createExecution(processInstance); } execution.setActivity(join, outgoingExecution);