Author: tom.baeyens(a)jboss.com Date: 2009-01-20 07:47:48 -0500 (Tue, 20 Jan 2009) New Revision: 3685 Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartActivities.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java Removed: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartNodes.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildNode.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentNode.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityBehaviour.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch04-ImplementingBasicActivities.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch05-ProcessAnatomy.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch06-ImplementingAdvancedActivities.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.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/sql/SqlTest.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ForkActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JoinActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestination.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/package.html jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AutomaticActivity.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/WaitState.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/svc/ExecutionServiceTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.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 jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java Log: JBPM-1974 rename node to activity Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityBehaviour.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityBehaviour.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityBehaviour.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -40,7 +40,7 @@ * </p> * * <p>If an activity is the activity behaviour, then it can control the propagation - * of execution. Node behaviours can be external activities. That means their + * of execution. Activity behaviours can be external activities. That means their * runtime behaviour is a wait state. In that case, {@link ExternalActivityBehaviour} * should be implemented to also handle the external triggers. * </p> 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-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -73,12 +73,12 @@ * will decide how to interpret the signal.</p> * * <p>Transitions will be looked up recursively starting from the - * {@link #getNode() current activity} and then up the {@link Activity#getParent() activity-parent-hierarchy} </p> + * {@link #getActivity() current activity} and then up the {@link Activity#getParent() activity-parent-hierarchy} </p> * * @param transitionName is the name of the transition to take. A null value will * match the first unnamed transition. * - * @throws JbpmException in case no such transition is found in {@link #getNode() the current activity} + * @throws JbpmException in case no such transition is found in {@link #getActivity() the current activity} * or in case this method is called from inside an {@link ActivityBehaviour}.*/ void take(String transitionName); @@ -129,10 +129,10 @@ // reposition the execution in another activity ///////////////////////////////// /** position this execution in the destination activity. */ - void setNode(Activity destination); + void setActivity(Activity destination); /** position the given execution in the destination activity */ - void setNode(Activity destination, Execution execution); + void setActivity(Activity destination, Execution execution); // managing the parent-child relation /////////////////////////////////////// @@ -263,11 +263,11 @@ // context. But with the previous properties as done now, these control flow // activities can be implemented without storing an extra record. It's only a property // that is only updated when the activity configuration indicates that it's needed. - // (see also Node.isPreviousNeeded()) + // (see also Activity.isPreviousNeeded()) /** returns the previously executed activity only if {@link Activity#isPreviousNeeded()} * is set to true. */ - Activity getPreviousNode(); + Activity getPreviousActivity(); /** returns the previously taken transition only if {@link Activity#isPreviousNeeded()} * is set to true. */ Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/client/ClientExecution.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -74,7 +74,7 @@ * <p>Typically a signal will cause the execution to start executing, but that is * not a must. What happens with this signal is defined in the * {@link ExternalActivityBehaviour#signal(Execution, String, Map)} of - * the {@link #getNode() current activity}. </p> + * the {@link #getActivity() current activity}. </p> * * @see #signal(String) */ void signal(); @@ -134,7 +134,7 @@ * <p>Typically a signal will cause the execution to start executing, but that is * not a must. What happens with this signal is defined in the * {@link ExternalActivityBehaviour#signal(Execution, String, Map)} of - * the {@link #getNode() current activity}. </p> + * the {@link #getActivity() current activity}. </p> * * @see #signal(String) */ void signal(Execution execution); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Activity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -37,7 +37,7 @@ * process models. Both models can be combined as well. * </p> * - * <p>Nodes have {@link #getIncomingTransitions() incoming} + * <p>Activities have {@link #getIncomingTransitions() incoming} * and {@link #getOutgoingTransitions() outgoing transitions}. * These are lists of transitions. * </p> @@ -107,7 +107,7 @@ /** retrieve the parent activity in the composite activity structure. This is * different from {@link ObservableElement#getParent()} in that it is restricted * to the parent activities. It doesn't take into account the process definition. */ - Activity getParentNode(); + Activity getParentActivity(); /** indicates if this activity should be executed * <a href="package-summary.html#asynchronouscontinuations">asynchronously</a>. */ @@ -123,9 +123,9 @@ boolean isLeaveAsync(); /** indicates if this activity behaviour needs to know - * {@link Execution#getPreviousNode() the previous activity} or + * {@link Execution#getPreviousActivity() the previous activity} or * {@link Execution#getPreviousTransition() previous transition}. - * If this property is set to true, the properties {@link Execution#getPreviousNode()} + * If this property is set to true, the properties {@link Execution#getPreviousActivity()} * and {@link Execution#getPreviousTransition()} will be available to the * activity behaviour when it is executed or signalled. */ boolean isPreviousNeeded(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -51,7 +51,7 @@ OpenProcessDefinition getProcessDefinition(); /** the current activity */ - Activity getNode(); + Activity getActivity(); /** update the state */ void setState(String state); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenProcessDefinition.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -40,7 +40,7 @@ * </p> * * <h2>Structure</h2> - * <p>A processDefinition contains a set of activities. Nodes can be connected with + * <p>A processDefinition contains a set of activities. Activities can be connected with * transitions or activities can have nested activities. But the transitions and * nested activities can be combined. * </p> Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -64,7 +64,7 @@ method. So after the <literal>startProcessInstance</literal> we can verify if the execution is positioned in the evaluate activity. </para> - <programlisting>assertEquals("evaluate", execution.getNodeName());</programlisting> + <programlisting>assertEquals("evaluate", execution.getActivityName());</programlisting> <para>To make the process execute further, we provide an external trigger with the <literal>signal</literal> method. The result of the evaluation will be given as the signalName parameter like this: @@ -75,12 +75,12 @@ the automatic activity <literal>wire money</literal> and then return after entering the next wait state <literal>archive</literal>. </para> - <programlisting>assertEquals("archive", execution.getNodeName());</programlisting> + <programlisting>assertEquals("archive", execution.getActivityName());</programlisting> <para>When the execution is waiting in the archive activity, the default signal will make it take the first unnamed transition. </para> <programlisting>execution.signal(); -assertEquals("end", execution.getNodeName());</programlisting> +assertEquals("end", execution.getActivityName());</programlisting> <para>The process has executed in the thread of the client. The <literal>startProcessInstance</literal> method only returned when the <literal>evaluate</literal> activity was reached. In other words, the <literal>ClientProcessDefinition.startProcessInstance</literal> @@ -224,7 +224,7 @@ into a hibernate <literal>LazyInitializationException</literal>. But the current activity name can still be verified: </para> - <programlisting>assertEquals("evaluate", execution.getNodeName());</programlisting> + <programlisting>assertEquals("evaluate", execution.getActivityName());</programlisting> <para>Also very important is the generated id that can be obtained. The default <literal>id-generator</literal> will use the process definition id and the given key to make a unique id for the process execution like this:</para> @@ -301,7 +301,7 @@ } public String getState() { - return <emphasis role="bold">execution.getNodeName()</emphasis>; + return <emphasis role="bold">execution.getActivityName()</emphasis>; } ...getters... Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch04-ImplementingBasicActivities.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch04-ImplementingBasicActivities.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch04-ImplementingBasicActivities.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -177,7 +177,7 @@ <literal>processDefinition.startProcessInstance()</literal> returns, the execution will still be positioned in activity a. </para> - <programlisting>assertEquals("a", execution.getNodeName());</programlisting> + <programlisting>assertEquals("a", execution.getActivityName());</programlisting> <para>Then we provide the external trigger by calling the <literal>signal</literal> method. </para> @@ -195,7 +195,7 @@ and this time the <literal>signal</literal> method will return, leaving the execution positioned in activity <literal>b</literal>. </para> - <programlisting>assertEquals("b", execution.getNodeName());</programlisting> + <programlisting>assertEquals("b", execution.getActivityName());</programlisting> </section> <!-- ### BASIC PROCESS EXECUTION ######################################## --> @@ -320,7 +320,7 @@ </listitem> <listitem><literal><emphasis role="bold">Event.NODE_BEGIN</emphasis> = "activity-begin"</literal> : fired on the activity when execution enters that activity. This happens when execution takes a transition - to that activity, when a child activity is being executed with <literal>execution.execute(Node)</literal> + to that activity, when a child activity is being executed with <literal>execution.execute(Activity)</literal> or when a transition is taken from a activity outside that activity to a contained activity. The latter refers to super states in state machines. </listitem> @@ -349,7 +349,7 @@ <para>A list of <literal>EventListeners</literal> can be associated to an event. But event listeners can not influence the control flow of the execution since they are merely listeners to an execution which is already in progress. This is different from - activities that serve as the behaviour for activities. Node behaviour activities are responsible + activities that serve as the behaviour for activities. Activity behaviour activities are responsible for propagating the execution. </para> <para>We'll create a <literal>PrintLn</literal> event listener which is @@ -429,17 +429,7 @@ <title>A process with an invisible event listener on a activity-end event on a composite activity.</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.propagate.png"/></imageobject></mediaobject> </figure> - <programlisting>ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - <emphasis role="bold">.compositeNode("composite") - .event(Event.NODE_END) - .listener(new DisplaySource())</emphasis> - .activity("a").initial().behaviour(new WaitState()) - .transition().to("b") - .activity("b").behaviour(new WaitState()) - .transition().to("c") - .compositeEnd() - .activity("c").behaviour(new WaitState()) -.done();</programlisting> + <programlisting>TODO update code snippet</programlisting> <para>Next we'll start an execution.</para> <programlisting>ClientExecution execution = processDefinition.startProcessInstance();</programlisting> <para>After starting a new execution, the execution will be in activity <literal>a</literal> as @@ -491,18 +481,7 @@ </figure> <para>Building the process with the process factory: </para> - <programlisting>ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .compositeNode("composite") - .event(Event.NODE_END) - .listener(new DisplaySource()) - <emphasis role="bold">.propagationDisabled()</emphasis> - .activity("a").initial().behaviour(new WaitState()) - .transition().to("b") - .activity("b").behaviour(new WaitState()) - .transition().to("c") - .compositeEnd() - .activity("c").behaviour(new WaitState()) -.done();</programlisting> + <programlisting>TODO update code snippet</programlisting> <para>So when the first signal is given for this process, again the <literal>activity-end</literal> event will be fired on activity <literal>a</literal>, but now the event listener on the composite activity will not be executed cause Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch05-ProcessAnatomy.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch05-ProcessAnatomy.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch05-ProcessAnatomy.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -2,7 +2,7 @@ <title>Process anatomy</title> <para>Above we already touched briefly on the two main process constructs: - Nodes, transitions and activity composition. This chapter explores in full + Activities, transitions and activity composition. This chapter explores in full all the possibilities of the process definition structures. </para> Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch06-ImplementingAdvancedActivities.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch06-ImplementingAdvancedActivities.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch06-ImplementingAdvancedActivities.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -28,7 +28,7 @@ <listitem><literal>waitForSignal()</literal></listitem> <listitem><literal>take(Transition)</literal></listitem> <listitem><literal>end(*)</literal></listitem> - <listitem><literal>execute(Node)</literal></listitem> + <listitem><literal>execute(Activity)</literal></listitem> <listitem><literal>createExecution(*)</literal></listitem> </itemizedlist> <para>When <literal>Activity</literal> implementations used for activity behviour Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -184,7 +184,7 @@ assertNotNull(processDefinition); Execution execution = processDefinition.startExecution("first"); - assertEquals("one", execution.getNode().getName()); + assertEquals("one", execution.getActivity().getName()); pvmDbSession.save(execution); } finally { @@ -202,13 +202,13 @@ Execution execution = pvmDbSession.findExecution("persisted process", "first"); assertNotNull(execution); - assertEquals("one", execution.getNode().getName()); + assertEquals("one", execution.getActivity().getName()); // external trigger that will cause the execution to execute until // it reaches the next wait state execution.signal(); - assertEquals("two", execution.getNode().getName()); + assertEquals("two", execution.getActivity().getName()); pvmDbSession.save(execution); Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/WaitState.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -45,7 +45,7 @@ execution.setVariables(parameters); } - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); execution.fire(signalName, activity); Transition transition = activity.findOutgoingTransition(signalName); 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-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -39,12 +39,12 @@ Execution processInstance = executionService.startExecutionByKey("ConcurrencyGraphBased"); String pid = processInstance.getId(); - Set<String> expectedNodeNames = new HashSet<String>(); - expectedNodeNames.add("send invoice"); - expectedNodeNames.add("load truck"); - expectedNodeNames.add("print shipping documents"); + Set<String> expectedActivityNames = new HashSet<String>(); + expectedActivityNames.add("send invoice"); + expectedActivityNames.add("load truck"); + expectedActivityNames.add("print shipping documents"); - assertEquals(expectedNodeNames, getNodeNames(pid)); + assertEquals(expectedActivityNames, getActivityNames(pid)); assertTrue(findExecution(pid, "send invoice").isActive()); assertTrue(findExecution(pid, "load truck").isActive()); @@ -53,9 +53,9 @@ String sendInvoiceExecutionId = findExecution(pid, "send invoice").getId(); executionService.signalExecutionById(sendInvoiceExecutionId); - expectedNodeNames.remove("send invoice"); - expectedNodeNames.add("final join"); - assertEquals(expectedNodeNames, getNodeNames(pid)); + expectedActivityNames.remove("send invoice"); + expectedActivityNames.add("final join"); + assertEquals(expectedActivityNames, getActivityNames(pid)); assertTrue(findExecution(pid, "load truck").isActive()); assertTrue(findExecution(pid, "print shipping documents").isActive()); @@ -64,9 +64,9 @@ String loadTruckExecutionId = findExecution(pid, "load truck").getId(); executionService.signalExecutionById(loadTruckExecutionId); - expectedNodeNames.remove("load truck"); - expectedNodeNames.add("shipping join"); - assertEquals(expectedNodeNames, getNodeNames(pid)); + expectedActivityNames.remove("load truck"); + expectedActivityNames.add("shipping join"); + assertEquals(expectedActivityNames, getActivityNames(pid)); assertTrue(findExecution(pid, "print shipping documents").isActive()); assertFalse(findExecution(pid, "final join").isActive()); @@ -74,10 +74,10 @@ String printShippingDocumentsId = findExecution(pid, "print shipping documents").getId(); executionService.signalExecutionById(printShippingDocumentsId); - expectedNodeNames.remove("print shipping documents"); - expectedNodeNames.remove("shipping join"); - expectedNodeNames.add("drive truck to destination"); - assertEquals(expectedNodeNames, getNodeNames(pid)); + expectedActivityNames.remove("print shipping documents"); + expectedActivityNames.remove("shipping join"); + expectedActivityNames.add("drive truck to destination"); + assertEquals(expectedActivityNames, getActivityNames(pid)); assertTrue(findExecution(pid, "drive truck to destination").isActive()); assertFalse(findExecution(pid, "final join").isActive()); 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-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -39,11 +39,11 @@ Execution execution = executionService.startExecutionByKey("Sql"); String executionId = execution.getId(); - List<String> expectedNodeNames = new ArrayList<String>(); - expectedNodeNames.add("get process names"); - expectedNodeNames.add("count activities"); + List<String> expectedActivityNames = new ArrayList<String>(); + expectedActivityNames.add("get process names"); + expectedActivityNames.add("count activities"); Object activityNames = executionService.getVariable(executionId, "activities with o"); - assertEquals(expectedNodeNames, activityNames); + assertEquals(expectedActivityNames, activityNames); Object activities = executionService.getVariable(executionId, "activities"); assertEquals("4", activities.toString()); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -40,13 +40,13 @@ public void execute(ActivityExecution execution) { Transition transition = findTransition(execution); if (transition==null) { - throw new JpdlException("no outgoing transition condition evaluated to true for exclusive "+execution.getNode()); + throw new JpdlException("no outgoing transition condition evaluated to true for exclusive "+execution.getActivity()); } execution.take(transition); } private Transition findTransition(ActivityExecution execution) { - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); List<Transition> outgoingTransitions = activity.getOutgoingTransitions(); for (Transition transition : outgoingTransitions) { Condition condition = transition.getCondition(); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -39,7 +39,7 @@ protected String lang; public void execute(ActivityExecution execution) throws Exception { - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); String transitionName = null; ScriptManager scriptManager = EnvironmentHelper.get(ScriptManager.class); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -42,7 +42,7 @@ protected Descriptor exclusiveHandlerDescriptor; public void execute(ActivityExecution execution) throws Exception { - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); String transitionName = null; Object object = null; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ForkActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ForkActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ForkActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -40,7 +40,7 @@ public void execute(ActivityExecution execution) throws Exception { OpenExecution processInstance = execution.getProcessInstance(); - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); List<Transition> outgoingTransitions = activity.getOutgoingTransitions(); // for each outgoing transition @@ -54,7 +54,7 @@ // if this was the first fork if (execution.isProcessInstance()) { - execution.setNode(null); + execution.setActivity(null); } } } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JoinActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JoinActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JoinActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -45,7 +45,7 @@ execution.setState(Execution.STATE_INACTIVE); execution.waitForSignal(); - Activity join = execution.getNode(); + Activity join = execution.getActivity(); List<OpenExecution> joinedExecutions = findJoinedExecutions(execution, join); if (isComplete(joinedExecutions, join)) { @@ -62,7 +62,7 @@ outgoingExecution = execution.createExecution(processInstance); } - execution.setNode(join, outgoingExecution); + execution.setActivity(join, outgoingExecution); Transition transition = join.getDefaultTransition(); execution.take(transition, outgoingExecution); } @@ -76,7 +76,7 @@ void scanRecursive(OpenExecution execution, Activity join, List<OpenExecution> joinedExecutions) { // if the execution is positioned in the join - if (join.equals(execution.getNode())) { + if (join.equals(execution.getActivity())) { joinedExecutions.add(execution); } Collection<OpenExecution> childExecutions = execution.getExecutions(); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartBinding.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartBinding.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -21,7 +21,7 @@ */ package org.jbpm.jpdl.activity; -import org.jbpm.jpdl.xml.StartNodes; +import org.jbpm.jpdl.xml.StartActivities; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; @@ -38,9 +38,9 @@ } public Object parse(Element element, Parse parse, Parser parser) { - ActivityImpl startNode = parse.findObject(ActivityImpl.class); - StartNodes startNodes = parse.findObject(StartNodes.class); - startNodes.add(startNode); + ActivityImpl startActivity = parse.findObject(ActivityImpl.class); + StartActivities startActivities = parse.findObject(StartActivities.class); + startActivities.add(startActivity); return new StartActivity(); } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -39,7 +39,7 @@ } public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); if (parameters!=null) { execution.setVariables(parameters); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -95,8 +95,8 @@ processDefinition = new JpdlProcessDefinition(); } - StartNodes startNodes = new StartNodes(); - parse.pushObject(startNodes); + StartActivities startActivities = new StartActivities(); + parse.pushObject(startActivities); try { String name = XmlUtil.attribute(documentElement, "name", true, parse); processDefinition.setName(name); @@ -127,7 +127,7 @@ for (Element element: elements) { JpdlActivityBinding activityBinding = (JpdlActivityBinding) getBinding(element, "activity"); if (activityBinding!=null) { - ActivityImpl activity = (ActivityImpl) processDefinition.createNode(); + ActivityImpl activity = (ActivityImpl) processDefinition.createActivity(); parse.pushObject(activity); try { activityBinding.parseName(element, activity, parse); @@ -147,11 +147,11 @@ } // TODO remove the initial attribute parsing - String initialNodeName = XmlUtil.attribute(documentElement, "initial", false, parse); - if (initialNodeName!=null) { - ActivityImpl initial = processDefinition.getActivity(initialNodeName); + String initialActivityName = XmlUtil.attribute(documentElement, "initial", false, parse); + if (initialActivityName!=null) { + ActivityImpl initial = processDefinition.getActivity(initialActivityName); if (initial==null) { - parse.addProblem("initial activity '"+initialNodeName+"' was not found"); + parse.addProblem("initial activity '"+initialActivityName+"' was not found"); } else { processDefinition.setInitial(initial); } @@ -162,13 +162,13 @@ } - if (startNodes.size()==0) { + if (startActivities.size()==0) { parse.addProblem("no start activity in process"); - } else if (startNodes.size()>1) { + } else if (startActivities.size()>1) { parse.addProblem("multiple start events not yet supported"); // TODO verify that all start events have conditions } else { - ActivityImpl uniqueStartEvent = startNodes.get(0); + ActivityImpl uniqueStartEvent = startActivities.get(0); processDefinition.setInitial(uniqueStartEvent); } Copied: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartActivities.java (from rev 3682, jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartNodes.java) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartActivities.java (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartActivities.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.jpdl.xml; + +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.pvm.internal.model.ActivityImpl; + + +/** + * @author Tom Baeyens + */ +public class StartActivities { + + List<ActivityImpl> startEvents = new ArrayList<ActivityImpl>(); + + + public void add(ActivityImpl startEventActivity) { + startEvents.add(startEventActivity); + } + + public int size() { + return startEvents.size(); + } + + public ActivityImpl get(int i) { + return startEvents.get(i); + } + +} Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartActivities.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartNodes.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartNodes.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartNodes.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.jpdl.xml; - -import java.util.ArrayList; -import java.util.List; - -import org.jbpm.pvm.internal.model.ActivityImpl; - - -/** - * @author Tom Baeyens - */ -public class StartNodes { - - List<ActivityImpl> startEvents = new ArrayList<ActivityImpl>(); - - - public void add(ActivityImpl startEventNode) { - startEvents.add(startEventNode); - } - - public int size() { - return startEvents.size(); - } - - public ActivityImpl get(int i) { - return startEvents.get(i); - } - -} Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionExpressionTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -50,12 +50,12 @@ ClientExecution execution = processDefinition.startProcessInstance(); execution.setVariable("theWayToGo", "left"); execution.signal(); - assertEquals("c", execution.getNode().getName()); + assertEquals("c", execution.getActivity().getName()); execution = processDefinition.startProcessInstance(); execution.setVariable("theWayToGo", "right"); execution.signal(); - assertEquals("d", execution.getNode().getName()); + assertEquals("d", execution.getActivity().getName()); execution = processDefinition.startProcessInstance(); execution.setVariable("theWayToGo", null); @@ -94,6 +94,6 @@ ClientExecution execution = processDefinition.startProcessInstance(); execution.setVariable("theWayToGo", null); execution.signal(); - assertEquals("d", execution.getNode().getName()); + assertEquals("d", execution.getActivity().getName()); } } Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -63,7 +63,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); execution.setVariable("theWayToGo", "left"); execution.signal(); - assertEquals("c", execution.getNode().getName()); + assertEquals("c", execution.getActivity().getName()); } /* @@ -71,7 +71,7 @@ execution = processDefinition.beginProcessInstance(); execution.setVariable("theWayToGo", "right"); execution.signal(); - assertEquals("d", execution.getNode().getName()); + assertEquals("d", execution.getActivity().getName()); execution = processDefinition.beginProcessInstance(); execution.setVariable("theWayToGo", null); @@ -110,7 +110,7 @@ ClientExecution execution = processDefinition.beginProcessInstance(); execution.setVariable("theWayToGo", null); execution.signal(); - assertEquals("d", execution.getNode().getName()); + assertEquals("d", execution.getActivity().getName()); } */ Copied: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java (from rev 3682, jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java) =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java (rev 0) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.jpdl.parsing; + +import java.util.List; + +import org.jbpm.Problem; + + +/** + * @author Tom Baeyens + */ +public class ActivityParsingTest extends JpdlParseTestCase { + + public void testInvalidActivityeName() { + List<Problem> problems = parseProblems( + "<process name='p'>" + + " <state name='invalid / activityname' />" + + "</process>" + ); + assertTextPresent("attribute <state name=\"invalid / activityname\" contains slash (/)", problems.get(0).getMsg()); + } + + public void testEmptyActivityName() { + List<Problem> problems = parseProblems( + "<process name='p'>" + + " <state name='' />" + + "</process>" + ); + assertTextPresent("attribute <state name=\"\" is empty", problems.get(0).getMsg()); + } +} Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.jpdl.parsing; - -import java.util.List; - -import org.jbpm.Problem; - - -/** - * @author Tom Baeyens - */ -public class NodeParsingTest extends JpdlParseTestCase { - - public void testInvalidNodeName() { - List<Problem> problems = parseProblems( - "<process name='p'>" + - " <state name='invalid / activityname' />" + - "</process>" - ); - assertTextPresent("attribute <state name=\"invalid / activityname\" contains slash (/)", problems.get(0).getMsg()); - } - - public void testEmptyNodeName() { - List<Problem> problems = parseProblems( - "<process name='p'>" + - " <state name='' />" + - "</process>" - ); - assertTextPresent("attribute <state name=\"\" is empty", problems.get(0).getMsg()); - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -43,7 +43,7 @@ protected abstract void setProcessDefinitionInitial(ActivityImpl initial); protected ActivityImpl createActivity() { - return compositeElement.createNode(); + return compositeElement.createActivity(); } public EventImpl createEvent(String eventName) { @@ -134,7 +134,7 @@ } public CompositeBuilder endActivity() { - throw new JbpmException("calling endNode on a processBuilder is invalid"); + throw new JbpmException("calling endActivity on a processBuilder is invalid"); } public FlowBuilder startFlow(String to) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -113,7 +113,7 @@ } protected void errorUnexistingFlowDestination(UnresolvedFlow unresolvedFlow) { - String sourceNodeName = unresolvedFlow.transition.getSource().getName(); - log.error("unexisting flow destination: "+sourceNodeName+"-->"+unresolvedFlow.destinationName); + String sourceActivityName = unresolvedFlow.transition.getSource().getName(); + log.error("unexisting flow destination: "+sourceActivityName+"-->"+unresolvedFlow.destinationName); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionsCmd.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -67,8 +67,8 @@ executions.add(execution); // initialize activity relation. this is necessary for the method - // Execution.getNodeName() - Activity activity = execution.getNode(); + // Execution.getActivityName() + Activity activity = execution.getActivity(); if (activity!=null) { activity.getName(); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ExecutionType.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -70,7 +70,7 @@ public void nullSafeSet(PreparedStatement st, Object owner, int index) throws HibernateException, SQLException { if (owner!=null) { ExecutionImpl execution = (ExecutionImpl) owner; - String activityName = execution.getNode().getName(); + String activityName = execution.getActivity().getName(); log.trace("binding 'execution-state{"+activityName+"}' to parameter: "+index); st.setString(index, activityName); } @@ -86,7 +86,7 @@ ExecutionImpl original = (ExecutionImpl) object; ActivityImpl activity = new ActivityImpl(); - activity.setName(original.getNode().getName()); + activity.setName(original.getActivity().getName()); ExecutionImpl copy = new ExecutionImpl(); copy.setActivity(activity); @@ -100,8 +100,8 @@ ExecutionImpl execution0 = (ExecutionImpl) arg0; ExecutionImpl execution1 = (ExecutionImpl) arg1; - String activityName0 = execution0.getNode().getName(); - String activityName1 = execution1.getNode().getName(); + String activityName0 = execution0.getActivity().getName(); + String activityName1 = execution1.getActivity().getName(); return activityName0.equals(activityName1); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -105,7 +105,7 @@ } if (eventName!=null) { - ObservableElement eventSource = execution.getNode(); + ObservableElement eventSource = execution.getActivity(); if (log.isDebugEnabled()) log.debug("firing event "+signalName+" into "+eventSource); execution.fire(eventName, eventSource); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ActivityImpl.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -43,7 +43,7 @@ protected List<TransitionImpl> outgoingTransitions; protected List<TransitionImpl> incomingTransitions; protected TransitionImpl defaultTransition; - protected ActivityImpl parentNode; + protected ActivityImpl parentActivity; protected boolean isLocalScope; protected boolean isExecutionAsync; @@ -54,7 +54,7 @@ transient protected Map<String, TransitionImpl> outgoingTransitionsMap; /** - * Use {@link ProcessDefinitionImpl#createNode()} or {@link ActivityImpl#createNode()} instead. + * Use {@link ProcessDefinitionImpl#createActivity()} or {@link ActivityImpl#createActivity()} instead. */ public ActivityImpl() { super(); @@ -62,9 +62,9 @@ // specialized activity containment methods ///////////////////////////////////// - public ActivityImpl addNode(ActivityImpl activity) { - activity.setParentNode(this); - super.addNode(activity); + public ActivityImpl addActivity(ActivityImpl activity) { + activity.setParentActivity(this); + super.addActivity(activity); return activity; } @@ -196,8 +196,8 @@ if (transition!=null) { return transition; } - if (parentNode!=null) { - return parentNode.findOutgoingTransition(transitionName); + if (parentActivity!=null) { + return parentActivity.findOutgoingTransition(transitionName); } return null; } @@ -208,8 +208,8 @@ if (defaultTransition!=null) { return defaultTransition; } - if (parentNode!=null) { - return parentNode.findDefaultTransition(); + if (parentActivity!=null) { + return parentActivity.findDefaultTransition(); } return null; } @@ -395,7 +395,7 @@ return map; } - static Map<String, ActivityImpl> getNodesMap(List<ActivityImpl> activities) { + static Map<String, ActivityImpl> getActivitiesMap(List<ActivityImpl> activities) { Map<String, ActivityImpl> map = null; if (activities!=null) { map = new HashMap<String, ActivityImpl>(); @@ -432,7 +432,7 @@ // getters and setters ////////////////////////////////////////////////////// public ObservableElementImpl getParent() { - return (parentNode!=null ? parentNode : processDefinition); + return (parentActivity!=null ? parentActivity : processDefinition); } public String getName() { @@ -447,11 +447,11 @@ public void setDefaultTransition(TransitionImpl defaultTransition) { this.defaultTransition = defaultTransition; } - public ActivityImpl getParentNode() { - return parentNode; + public ActivityImpl getParentActivity() { + return parentActivity; } - public void setParentNode(ActivityImpl parentNode) { - this.parentNode = parentNode; + public void setParentActivity(ActivityImpl parentActivity) { + this.parentActivity = parentActivity; } public boolean isExecutionAsync() { return isExecutionAsync; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/CompositeElementImpl.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -44,8 +44,8 @@ * creates a nested activity. Also the nested activity's parent pointer will be set * appropriatly. */ - public ActivityImpl createNode() { - return createNode(null); + public ActivityImpl createActivity() { + return createActivity(null); } /** @@ -53,14 +53,14 @@ * appropriatly. * @param activityName may be null. */ - public ActivityImpl createNode(String activityName) { + public ActivityImpl createActivity(String activityName) { ActivityImpl activity = new ActivityImpl(); activity.setName(activityName); - addNode(activity); + addActivity(activity); return activity; } - public Activity addNode(ActivityImpl activity) { + public Activity addActivity(ActivityImpl activity) { activity.setProcessDefinition(processDefinition); if (activities==null) { activities = new ArrayList<ActivityImpl>(); @@ -83,13 +83,13 @@ * name, that activity (the first) will be put in the * activitiesMap as a replacement for the removed activity. */ - public boolean removeNode(ActivityImpl activity) { + public boolean removeActivity(ActivityImpl activity) { if ( (activity!=null) && (activities!=null) ) { boolean isRemoved = activities.remove(activity); if (isRemoved) { - activity.setParentNode(null); + activity.setParentActivity(null); if (activities.isEmpty()) { activities = null; } @@ -140,7 +140,7 @@ */ public Map<String, Activity> getActivitiesMap() { if(activitiesMap == null){ - this.activitiesMap = ActivityImpl.getNodesMap(activities); + this.activitiesMap = ActivityImpl.getActivitiesMap(activities); } return (Map) activitiesMap; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -33,7 +33,7 @@ import org.jbpm.listener.EventListener; import org.jbpm.log.Log; import org.jbpm.model.OpenProcessDefinition; -import org.jbpm.pvm.internal.model.op.MoveToChildNode; +import org.jbpm.pvm.internal.model.op.MoveToChildActivity; import org.jbpm.pvm.internal.wire.Descriptor; /** @@ -162,7 +162,7 @@ } if (transitionName!=null) { - ActivityImpl activity = execution.getNode(); + ActivityImpl activity = execution.getActivity(); if (activity==null) { // If the execution is not positioned in a activity, it must be // positioned in a transition. In that case we check if the @@ -206,11 +206,11 @@ } else if (activityName!=null) { // execute child activity - ActivityImpl activity = execution.getNode(); - ActivityImpl childNode = ( activity!=null ? activity.getActivity(activityName) : null ); - if (childNode!=null) { + ActivityImpl activity = execution.getActivity(); + ActivityImpl childActivity = ( activity!=null ? activity.getActivity(activityName) : null ); + if (childActivity!=null) { log.trace(toString()+" takes transition "+transitionName); - execution.performAtomicOperationSync(new MoveToChildNode(childNode)); + execution.performAtomicOperationSync(new MoveToChildActivity(childActivity)); } else { log.info("WARNING: "+toString()+" couldn't find child activity "+activityName); } @@ -253,10 +253,10 @@ public void setTransitionName(String transitionName) { this.transitionName = transitionName; } - public String getNodeName() { + public String getActivityName() { return activityName; } - public void setNodeName(String activityName) { + public void setActivityName(String activityName) { this.activityName = activityName; } public boolean isRethrowMasked() { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -58,9 +58,9 @@ import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.model.op.AtomicOperation; -import org.jbpm.pvm.internal.model.op.ExecuteNode; -import org.jbpm.pvm.internal.model.op.MoveToChildNode; -import org.jbpm.pvm.internal.model.op.MoveToParentNode; +import org.jbpm.pvm.internal.model.op.ExecuteActivity; +import org.jbpm.pvm.internal.model.op.MoveToChildActivity; +import org.jbpm.pvm.internal.model.op.MoveToParentActivity; import org.jbpm.pvm.internal.model.op.ProceedToDestination; import org.jbpm.pvm.internal.model.op.Signal; import org.jbpm.pvm.internal.model.op.TakeTransition; @@ -91,10 +91,10 @@ private static final Log log = Log.getLog(Execution.class.getName()); // atomic operations - public static final AtomicOperation EXECUTE_NODE = new ExecuteNode(); + public static final AtomicOperation EXECUTE_ACTIVITY = new ExecuteActivity(); public static final AtomicOperation PROCEED_TO_DESTINATION = new ProceedToDestination(); public static final AtomicOperation TAKE_TRANSITION = new TakeTransition(); - public static final AtomicOperation PROPAGATE_TO_PARENT = new MoveToParentNode(); + public static final AtomicOperation PROPAGATE_TO_PARENT = new MoveToParentActivity(); /** an optional name for this execution. can be used to * differentiate concurrent paths of execution like e.g. @@ -169,7 +169,7 @@ } protected Propagation propagation = null; - protected Activity previousNode; + protected Activity previousActivity; protected Transition previousTransition; protected Exception exception; @@ -205,22 +205,22 @@ ExecutionImpl scopedExecution = initializeScopes(); fire(Event.PROCESS_BEGIN, processDefinition); if (activity!=null) { - scopedExecution.performAtomicOperation(EXECUTE_NODE); + scopedExecution.performAtomicOperation(EXECUTE_ACTIVITY); } } protected ExecutionImpl initializeScopes() { - LinkedList<ActivityImpl> enteredNodes = new LinkedList<ActivityImpl>(); + LinkedList<ActivityImpl> enteredActivities = new LinkedList<ActivityImpl>(); ActivityImpl initial = processDefinition.getInitial(); ExecutionImpl scopedExecution = null; if (initial!=null) { - enteredNodes.add(initial); - ActivityImpl parentNode = initial.getParentNode(); - while (parentNode!=null) { - enteredNodes.addFirst(parentNode); - parentNode = parentNode.getParentNode(); + enteredActivities.add(initial); + ActivityImpl parentActivity = initial.getParentActivity(); + while (parentActivity!=null) { + enteredActivities.addFirst(parentActivity); + parentActivity = parentActivity.getParentActivity(); } scopedExecution = this; @@ -228,10 +228,10 @@ initializeVariables(processDefinition, this); initializeTimers(processDefinition); - for (ActivityImpl enteredNode: enteredNodes) { - if (enteredNode.isLocalScope()) { - scopedExecution.setActivity(enteredNode); - scopedExecution = scopedExecution.createScope(enteredNode); + for (ActivityImpl enteredActivity: enteredActivities) { + if (enteredActivity.isLocalScope()) { + scopedExecution.setActivity(enteredActivity); + scopedExecution = scopedExecution.createScope(enteredActivity); } } @@ -244,12 +244,12 @@ ExecutionImpl child = createExecution(scope.getName()); // copy the current state from the child execution to the parent execution - child.setActivity(getNode()); + child.setActivity(getActivity()); child.setTransition(getTransition()); child.setPropagation(getPropagation()); child.setTransitionOrigin(getTransitionOrigin()); child.setPreviousTransition(getPreviousTransition()); - child.setPreviousNode(getPreviousNode()); + child.setPreviousActivity(getPreviousActivity()); child.initializeVariables(scope, this); child.initializeTimers(scope); @@ -262,12 +262,12 @@ destroyVariables(scope, parent); // copy the current state from the child execution to the parent execution - getParent().setActivity(getNode()); + getParent().setActivity(getActivity()); getParent().setTransition(getTransition()); getParent().setPropagation(getPropagation()); getParent().setTransitionOrigin(getTransitionOrigin()); getParent().setPreviousTransition(getPreviousTransition()); - getParent().setPreviousNode(getPreviousNode()); + getParent().setPreviousActivity(getPreviousActivity()); end(); @@ -445,7 +445,7 @@ setTransition((TransitionImpl) transition); // copy the current activity as the transition origin. the origin can be different from // the transition source in case a transition is taken from an enclosing activity - setTransitionOrigin(getNode()); + setTransitionOrigin(getActivity()); setPreviousTransition(null); performAtomicOperation(TAKE_TRANSITION); @@ -462,11 +462,11 @@ if (activity==null) { throw new JbpmException("activity is null"); } - Activity nestedNode = activity.getActivity(activityName); - if (nestedNode==null) { + Activity nestedActivity = activity.getActivity(activityName); + if (nestedActivity==null) { throw new JbpmException("activity "+activityName+" doesn't exist in "+activity); } - execute(nestedNode); + execute(nestedActivity); } /** @see Execution#execute(Activity) */ @@ -477,7 +477,7 @@ checkLock(); this.propagation = Propagation.EXPLICIT; - performAtomicOperation(new MoveToChildNode((ActivityImpl) activity)); + performAtomicOperation(new MoveToChildActivity((ActivityImpl) activity)); } // execution method : waitForSignal ///////////////////////////////////////// @@ -501,10 +501,10 @@ // there is no default transition and that there is a // parent activity of the current activity } else { - ActivityImpl parentNode = activity.getParentNode(); + ActivityImpl parentActivity = activity.getParentActivity(); // if there is a parent activity - if (parentNode!=null) { + if (parentActivity!=null) { // propagate to the parent performAtomicOperation(PROPAGATE_TO_PARENT); @@ -518,11 +518,11 @@ } } - public void setNode(Activity destination, Execution execution) { - ((ExecutionImpl)execution).setNode(destination); + public void setActivity(Activity destination, Execution execution) { + ((ExecutionImpl)execution).setActivity(destination); } - public void setNode(Activity destination) { + public void setActivity(Activity destination) { setActivity((ActivityImpl) destination); } @@ -531,10 +531,10 @@ public void moveTo(ActivityImpl destination) { // if the parent activity needs to know the previous activity if (destination.isPreviousNeeded()) { - setPreviousNode(getNode()); + setPreviousActivity(getActivity()); setPreviousTransition(getTransition()); } else { - this.previousNode = null; + this.previousActivity = null; this.previousTransition = null; } @@ -544,7 +544,7 @@ transitionOrigin = null; } - public ExecutionImpl beginNode(ActivityImpl activity) { + public ExecutionImpl startActivity(ActivityImpl activity) { ExecutionImpl propagatingExecution = this; if (activity.isLocalScope()) { propagatingExecution = createScope(activity); @@ -553,7 +553,7 @@ return propagatingExecution; } - public ExecutionImpl endNode(ActivityImpl activity) { + public ExecutionImpl endActivity(ActivityImpl activity) { ExecutionImpl propagatingExecution = this; fire(Event.NODE_END, activity); if (activity.isLocalScope()) { @@ -1036,8 +1036,8 @@ public void setTransition(TransitionImpl transition) { this.transition = transition; } - public Activity getPreviousNode() { - return previousNode; + public Activity getPreviousActivity() { + return previousActivity; } public Transition getPreviousTransition() { return previousTransition; @@ -1090,8 +1090,8 @@ public void setParent(ExecutionImpl parent) { this.parent = parent; } - public void setPreviousNode(Activity previousNode) { - this.previousNode = previousNode; + public void setPreviousActivity(Activity previousActivity) { + this.previousActivity = previousActivity; } public void setPreviousTransition(Transition previousTransition) { this.previousTransition = previousTransition; @@ -1111,7 +1111,7 @@ public void setSubProcessInstance(ExecutionImpl subProcessExecution) { this.subProcessInstance = subProcessExecution; } - public ActivityImpl getNode() { + public ActivityImpl getActivity() { return activity; } public void setActivity(ActivityImpl activity) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessModificationsImpl.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -58,8 +58,8 @@ protected List<EventListenerReference> removedActions; protected List<AddedTransition> addedTransitions; protected List<TransitionImpl> removedTransitions; - protected List<AddedNode> addedNodes; - protected List<ActivityImpl> removedNodes; + protected List<AddedActivity> addedActivities; + protected List<ActivityImpl> removedActivities; // TODO : convert to top level types @@ -73,7 +73,7 @@ } - public static class AddedNode extends ActivityImpl { + public static class AddedActivity extends ActivityImpl { private static final long serialVersionUID = 1L; } Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java (from rev 3682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.model.op; + +import org.jbpm.activity.ActivityBehaviour; +import org.jbpm.log.Log; +import org.jbpm.pvm.internal.job.MessageImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl.Propagation; + +public class ExecuteActivity implements AtomicOperation { + + private static Log log = Log.getLog(ExecuteActivity.class.getName()); + + public boolean isAsync(ExecutionImpl execution) { + return execution.getActivity().isExecutionAsync(); + } + + public void perform(ExecutionImpl execution) { + ActivityImpl activity = execution.getActivity(); + + if (log.isTraceEnabled()) { + if (execution.getName()!=null) { + log.trace(execution.toString()+" executes "+activity); + } else { + log.trace("executing "+activity); + } + } + + ActivityBehaviour activityBehaviour = activity.getBehaviour(); + + try { + execution.setPropagation(Propagation.UNSPECIFIED); + + activityBehaviour.execute(execution); + + } catch (Exception e) { + execution.handleException(activity, null, null, e, execution.toString()+" couldn't execute "+activityBehaviour+" for activity "+activity); + } + + if (execution.getPropagation()==Propagation.UNSPECIFIED) { + execution.proceed(); + } + } + + public String toString() { + return "execute(activity)"; + } + + public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { + return new ExecuteActivityMessage(execution); + } +} \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java (from rev 3682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.model.op; + +import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.job.MessageImpl; +import org.jbpm.pvm.internal.jobexecutor.JobDbSession; +import org.jbpm.pvm.internal.model.ExecutionImpl; + +/** + * @author Tom Baeyens + */ +public class ExecuteActivityMessage extends MessageImpl<Object> { + + private static final long serialVersionUID = 1L; + + public ExecuteActivityMessage() { + } + + public ExecuteActivityMessage(ExecutionImpl execution) { + super(execution); + } + + public Object execute(Environment environment) throws Exception { + unlockExecution(); + execution.performAtomicOperationSync(ExecutionImpl.EXECUTE_ACTIVITY); + + JobDbSession jobDbSession = environment.get(JobDbSession.class); + jobDbSession.delete(this); + + return null; + } + + public String toString() { + return "execute-activity-message["+dbid+"]"; + } + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivityMessage.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNode.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.model.op; - -import org.jbpm.activity.ActivityBehaviour; -import org.jbpm.log.Log; -import org.jbpm.pvm.internal.job.MessageImpl; -import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.internal.model.ActivityImpl; -import org.jbpm.pvm.internal.model.ExecutionImpl.Propagation; - -public class ExecuteNode implements AtomicOperation { - - private static Log log = Log.getLog(ExecuteNode.class.getName()); - - public boolean isAsync(ExecutionImpl execution) { - return execution.getNode().isExecutionAsync(); - } - - public void perform(ExecutionImpl execution) { - ActivityImpl activity = execution.getNode(); - - if (log.isTraceEnabled()) { - if (execution.getName()!=null) { - log.trace(execution.toString()+" executes "+activity); - } else { - log.trace("executing "+activity); - } - } - - ActivityBehaviour activityBehaviour = activity.getBehaviour(); - - try { - execution.setPropagation(Propagation.UNSPECIFIED); - - activityBehaviour.execute(execution); - - } catch (Exception e) { - execution.handleException(activity, null, null, e, execution.toString()+" couldn't execute "+activityBehaviour+" for activity "+activity); - } - - if (execution.getPropagation()==Propagation.UNSPECIFIED) { - execution.proceed(); - } - } - - public String toString() { - return "execute(activity)"; - } - - public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { - return new ExecuteNodeMessage(execution); - } -} \ No newline at end of file Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteNodeMessage.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.model.op; - -import org.jbpm.env.Environment; -import org.jbpm.pvm.internal.job.MessageImpl; -import org.jbpm.pvm.internal.jobexecutor.JobDbSession; -import org.jbpm.pvm.internal.model.ExecutionImpl; - -/** - * @author Tom Baeyens - */ -public class ExecuteNodeMessage extends MessageImpl<Object> { - - private static final long serialVersionUID = 1L; - - public ExecuteNodeMessage() { - } - - public ExecuteNodeMessage(ExecutionImpl execution) { - super(execution); - } - - public Object execute(Environment environment) throws Exception { - unlockExecution(); - execution.performAtomicOperationSync(ExecutionImpl.EXECUTE_NODE); - - JobDbSession jobDbSession = environment.get(JobDbSession.class); - jobDbSession.delete(this); - - return null; - } - - public String toString() { - return "execute-activity-message["+dbid+"]"; - } - -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java (from rev 3682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildNode.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.model.op; + +import org.jbpm.pvm.internal.job.MessageImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ActivityImpl; + + +/** + * @author Tom Baeyens + */ +public class MoveToChildActivity implements AtomicOperation { + + ActivityImpl activity; + + public MoveToChildActivity(ActivityImpl activity) { + this.activity = activity; + } + + public void perform(ExecutionImpl execution) { + execution.moveTo(activity); + ExecutionImpl propagatingExecution = execution.startActivity(activity); + propagatingExecution.performAtomicOperation(ExecutionImpl.EXECUTE_ACTIVITY); + } + + public boolean isAsync(ExecutionImpl execution) { + return false; + } + + public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { + return null; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildNode.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildNode.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildNode.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.model.op; - -import org.jbpm.pvm.internal.job.MessageImpl; -import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.internal.model.ActivityImpl; - - -/** - * @author Tom Baeyens - */ -public class MoveToChildNode implements AtomicOperation { - - ActivityImpl activity; - - public MoveToChildNode(ActivityImpl activity) { - this.activity = activity; - } - - public void perform(ExecutionImpl execution) { - execution.moveTo(activity); - ExecutionImpl propagatingExecution = execution.beginNode(activity); - propagatingExecution.performAtomicOperation(ExecutionImpl.EXECUTE_NODE); - } - - public boolean isAsync(ExecutionImpl execution) { - return false; - } - - public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { - return null; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java (from rev 3682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentNode.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.model.op; + +import org.jbpm.pvm.internal.job.MessageImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ActivityImpl; + +/** + * @author Tom Baeyens + */ +public class MoveToParentActivity implements AtomicOperation { + + public void perform(ExecutionImpl execution) { + ActivityImpl activity = execution.getActivity(); + ActivityImpl parentActivity = activity.getParentActivity(); + ExecutionImpl propagatingExecution = execution.endActivity(activity); + + // Restore original source activity + // (so that the call to moveTo updates the previous activity) + propagatingExecution.setActivity(activity); + propagatingExecution.moveTo(parentActivity); + propagatingExecution.performAtomicOperation(new Signal(null, null, parentActivity)); + } + + public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { + return null; + } + + public boolean isAsync(ExecutionImpl execution) { + return false; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentNode.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentNode.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentNode.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.model.op; - -import org.jbpm.pvm.internal.job.MessageImpl; -import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.internal.model.ActivityImpl; - -/** - * @author Tom Baeyens - */ -public class MoveToParentNode implements AtomicOperation { - - public void perform(ExecutionImpl execution) { - ActivityImpl activity = execution.getNode(); - ActivityImpl parentNode = activity.getParentNode(); - ExecutionImpl propagatingExecution = execution.endNode(activity); - - // Restore original source activity - // (so that the call to moveTo updates the previous activity) - propagatingExecution.setActivity(activity); - propagatingExecution.moveTo(parentNode); - propagatingExecution.performAtomicOperation(new Signal(null, null, parentNode)); - } - - public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { - return null; - } - - public boolean isAsync(ExecutionImpl execution) { - return false; - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestination.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestination.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ProceedToDestination.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -41,11 +41,11 @@ public void perform(ExecutionImpl execution) { ActivityImpl destination = execution.getTransition().getDestination(); execution.setActivity(destination); - List<ActivityImpl> enteredNodes = getNodesEntered(execution.getTransitionOrigin(), destination); + List<ActivityImpl> enteredActivities = getActivitiesEntered(execution.getTransitionOrigin(), destination); ExecutionImpl propagatingExecution = execution; - for (ActivityImpl enteredNode : enteredNodes) { - propagatingExecution = propagatingExecution.beginNode(enteredNode); + for (ActivityImpl enteredActivity : enteredActivities) { + propagatingExecution = propagatingExecution.startActivity(enteredActivity); } // Restore original transition source activity @@ -53,10 +53,10 @@ propagatingExecution.setActivity(execution.getTransitionOrigin()); propagatingExecution.moveTo(destination); - propagatingExecution.performAtomicOperation(ExecutionImpl.EXECUTE_NODE); + propagatingExecution.performAtomicOperation(ExecutionImpl.EXECUTE_ACTIVITY); } - public List<ActivityImpl> getNodesEntered(ActivityImpl origin, ActivityImpl destination) { + public List<ActivityImpl> getActivitiesEntered(ActivityImpl origin, ActivityImpl destination) { LinkedList<ActivityImpl> activitiesEntered = new LinkedList<ActivityImpl>(); if (origin.equals(destination)) { @@ -66,12 +66,12 @@ List<ObservableElementImpl> sourceChain = origin.getParentChain(); if (!sourceChain.contains(destination)) { - ActivityImpl destinationNode = destination; - while ( (destinationNode!=null) - && (!sourceChain.contains(destinationNode)) + ActivityImpl destinationActivity = destination; + while ( (destinationActivity!=null) + && (!sourceChain.contains(destinationActivity)) ) { - activitiesEntered.addFirst(destinationNode); - destinationNode = destinationNode.getParentNode(); + activitiesEntered.addFirst(destinationActivity); + destinationActivity = destinationActivity.getParentActivity(); } } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -49,7 +49,7 @@ } public boolean isAsync(ExecutionImpl execution) { - return execution.getNode().isSignalAsync(); + return execution.getActivity().isSignalAsync(); } public void perform(ExecutionImpl execution) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -38,7 +38,7 @@ private static Log log = Log.getLog(TakeTransition.class.getName()); public boolean isAsync(ExecutionImpl execution) { - return execution.getNode().isLeaveAsync() + return execution.getActivity().isLeaveAsync() || execution.getTransition().isTakeAsync(); } @@ -51,10 +51,10 @@ log.debug("taking "+transition); } - List<ActivityImpl> leftNodes = getNodesLeft(execution.getNode(), transition.getDestination()); + List<ActivityImpl> leftActivities = getActivitiesLeft(execution.getActivity(), transition.getDestination()); ExecutionImpl propagatingExecution = execution; - for (ActivityImpl leftNode : leftNodes) { - propagatingExecution = propagatingExecution.endNode(leftNode); + for (ActivityImpl leftActivity : leftActivities) { + propagatingExecution = propagatingExecution.endActivity(leftActivity); } propagatingExecution.setActivity(null); @@ -72,7 +72,7 @@ } } - List<ActivityImpl> getNodesLeft(ActivityImpl source, ActivityImpl destination) { + List<ActivityImpl> getActivitiesLeft(ActivityImpl source, ActivityImpl destination) { List<ActivityImpl> activitiesLeft = new ArrayList<ActivityImpl>(); if (source.equals(destination)) { @@ -81,12 +81,12 @@ List<ObservableElementImpl> destinationChain = destination.getParentChain(); if (!destinationChain.contains(source)) { - ActivityImpl sourceNode = source; - while ( (sourceNode!=null) - && (!destinationChain.contains(sourceNode)) + ActivityImpl sourceActivity = source; + while ( (sourceActivity!=null) + && (!destinationChain.contains(sourceActivity)) ) { - activitiesLeft.add(sourceNode); - sourceNode = sourceNode.getParentNode(); + activitiesLeft.add(sourceActivity); + sourceActivity = sourceActivity.getParentActivity(); } } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/package.html =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/package.html 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/package.html 2009-01-20 12:47:48 UTC (rev 3685) @@ -5,7 +5,7 @@ <h3>Bidirectional relations</h3> <p>In this process model thoughout the pvm codebase, there are several bidirectional relations. By convention, the bidirectional relations are maintained on the many side. -This means that when you call for example {@link org.jbpm.pvm.internal.model.ProcessDefinitionImpl#addNode(org.jbpm.pvm.internal.model.ActivityImpl)}, that +This means that when you call for example {@link org.jbpm.pvm.internal.model.ProcessDefinitionImpl#addActivity(org.jbpm.pvm.internal.model.ActivityImpl)}, that method will also update the inverse pointer by invoking the {@link org.jbpm.pvm.internal.model.ActivityImpl#setProcessDefinition(org.jbpm.pvm.internal.model.ProcessDefinitionImpl)} setter. Setter methods will be plain setter methods and they will NOT update the inverse reference. (that would cause @@ -14,7 +14,7 @@ <p>In the same spirit, there is the convention that the many side of bidirection relations provide factory methods for the related objects. Those factory methods -will also establish the bidirectional relation. E.g. {@link org.jbpm.pvm.internal.model.ProcessDefinitionImpl#createNode(String)}. +will also establish the bidirectional relation. E.g. {@link org.jbpm.pvm.internal.model.ProcessDefinitionImpl#createActivity(String)}. </p> </body> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -75,7 +75,7 @@ fetch="select" /> </class> - <!-- ### Node ############################################################## --> + <!-- ### Activity ############################################################## --> <class name="ActivityImpl" table="JBPM_ACTIVITY"> <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <id name="dbid" column="DBID_"> @@ -140,7 +140,7 @@ <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> <property name="isPreviousNeeded" column="PREV_NEEDED_" /> - <many-to-one name="parentNode" + <many-to-one name="parentActivity" column="PARENT_" class="ActivityImpl" cascade="all" Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml 2009-01-20 12:47:48 UTC (rev 3685) @@ -42,7 +42,7 @@ index="IDX_JOB_CMDDESCR"/> <subclass name="MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteNodeMessage" discriminator-value="ExeNodeMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> <property name="signalName" column="SIGNAL_" /> <many-to-one name="activity" Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -50,7 +50,7 @@ assertEquals("the description", processDefinition.getDescription()); } - public void testBuilderInitialNode() { + public void testBuilderInitialActivity() { ClientProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess("p") .startActivity("start") @@ -73,11 +73,11 @@ .endActivity() .endProcess(); - ActivityImpl decisionNode = (ActivityImpl) processDefinition.getActivity("start"); - assertNotNull(decisionNode); - assertEquals("start", decisionNode.getName()); + ActivityImpl decisionActivity = (ActivityImpl) processDefinition.getActivity("start"); + assertNotNull(decisionActivity); + assertEquals("start", decisionActivity.getName()); - TestActivity testActivity = (TestActivity) decisionNode.getBehaviour(); + TestActivity testActivity = (TestActivity) decisionActivity.getBehaviour(); assertEquals("some cfg value", testActivity.getTestActivityProperty()); } @@ -101,10 +101,10 @@ .endActivity() .endProcess(); - ActivityImpl decisionNode = (ActivityImpl) processDefinition.getActivity("x"); - assertNotNull(decisionNode); + ActivityImpl decisionActivity = (ActivityImpl) processDefinition.getActivity("x"); + assertNotNull(decisionActivity); - List<Transition> outgoingTransitions = decisionNode.getOutgoingTransitions(); + List<Transition> outgoingTransitions = decisionActivity.getOutgoingTransitions(); assertNotNull(outgoingTransitions); assertEquals("expected 4 transitions: "+outgoingTransitions, 4, outgoingTransitions.size()); Transition toA = outgoingTransitions.get(0); @@ -123,7 +123,7 @@ assertNull(toX.getName()); assertEquals("x", toX.getDestination().getName()); - Map<String, Transition> outgoingTransitionsMap = decisionNode.getOutgoingTransitionsMap(); + Map<String, Transition> outgoingTransitionsMap = decisionActivity.getOutgoingTransitionsMap(); assertSame(toA, outgoingTransitionsMap.get(null)); assertSame(toB, outgoingTransitionsMap.get("to b")); assertSame(toC, outgoingTransitionsMap.get("to c")); @@ -136,7 +136,7 @@ assertEquals(2, incomingTransitions.size()); } - public void testBuilderCompositeNodes() { + public void testBuilderCompositeActivities() { ClientProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess() .startActivity("1") Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -36,7 +36,7 @@ /** * Defines a simple process: only activities. persists it. */ - public void testCacheProcessDefinitionNodes() { + public void testCacheProcessDefinitionActivities() { OpenProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess() .startActivity("a") @@ -110,7 +110,7 @@ /** * Defines a simple process: only activities. persists it. */ - public void testCacheProcessDefinitionNodeOrder() { + public void testCacheProcessDefinitionActivityOrder() { OpenProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess() .startActivity("a") @@ -223,9 +223,9 @@ /** * Test processDefinition initial activity */ - public void testCacheProcessDefinitionInitialNode() { + public void testCacheProcessDefinitionInitialActivity() { ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); - ActivityImpl activity = (ActivityImpl) processDefinition.createNode(); + ActivityImpl activity = (ActivityImpl) processDefinition.createActivity(); activity.setName("initial activity"); activity.setDescription("very important activity"); @@ -263,7 +263,7 @@ * Defines a simple process: only nested activities. persists it, reloads it and * tries to access the nested activities */ - public void testCacheProcessDefinitionNestedNodes() { + public void testCacheProcessDefinitionNestedActivities() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); @@ -318,7 +318,7 @@ * Defines a process with nested activities with nested activities. persists it, reloads * it and tries to access the nested activities */ - public void testCacheProcessDefinitionNestedNestedNodes() { + public void testCacheProcessDefinitionNestedNestedActivities() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -51,7 +51,7 @@ assertEquals(deploymentTime, processDefinition.getDeploymentTime()); } - public void testProcessDefinitionNodes() { + public void testProcessDefinitionActivities() { OpenProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess() .startActivity("a") @@ -84,7 +84,7 @@ assertEquals(3, activities.size()); } - public void testInitialNode() { + public void testInitialActivity() { OpenProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess() .startActivity("a") @@ -107,7 +107,7 @@ assertEquals(3, processDefinition.getActivities().size()); } - public void testProcessDefinitionNestedNodes() { + public void testProcessDefinitionNestedActivities() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); @@ -274,7 +274,7 @@ assertEquals("four", listenerReferences.get(1).getExpression()); } - public void testEventsOnNode() { + public void testEventsOnActivity() { ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder .startProcess() .startActivity("a") @@ -356,7 +356,7 @@ assertEquals("four", exceptionHandler.getEventListenerReferences().get(1).getExpression()); } - public void testExceptionHandlersOnNode() { + public void testExceptionHandlersOnActivity() { ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder .startProcess() .startActivity("a") @@ -403,7 +403,7 @@ assertEquals("val2", processDefinition.getProperty("key2")); } - public void testNodeDynamicProperties() { + public void testActivityDynamicProperties() { ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder .startProcess() .startActivity() Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AutomaticActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AutomaticActivity.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AutomaticActivity.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -37,6 +37,6 @@ } public void execute(ActivityExecution execution) throws Exception { - ContinuationTest.recorder.record(execution.getDbid(), "execute("+execution.getNode().getName()+")"); + ContinuationTest.recorder.record(execution.getDbid(), "execute("+execution.getActivity().getName()+")"); } } \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/WaitState.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/WaitState.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/WaitState.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -37,7 +37,7 @@ } public void execute(ActivityExecution execution) throws Exception { - ContinuationTest.recorder.record(execution.getDbid(), "execute("+execution.getNode().getName()+")"); + ContinuationTest.recorder.record(execution.getDbid(), "execute("+execution.getActivity().getName()+")"); } public void signal(ActivityExecution execution, String signal, Map<String, Object> parameters) throws Exception { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -78,15 +78,15 @@ Execution execution = processService.startExecution("basic", "one"); - assertEquals("a", execution.getNode().getName()); + assertEquals("a", execution.getActivity().getName()); execution = processService.signalExecution("basic", "one"); - assertEquals("b", execution.getNode().getName()); + assertEquals("b", execution.getActivity().getName()); execution = processService.signalExecution("basic", "one"); - assertEquals("e", execution.getNode().getName()); + assertEquals("e", execution.getActivity().getName()); */ } Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycle.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -48,7 +48,7 @@ ClientProcessInstance lifeCycleExecution = lifeCycle.createProcessInstance(); lifeCycleExecution.setVariables(lifeCycleVariables); lifeCycleExecution.start(); - return lifeCycleExecution.getNode().getName(); + return lifeCycleExecution.getActivity().getName(); } public static ProcessDefinitionImpl getLifeCycle(TaskImpl task) { @@ -83,7 +83,7 @@ Activity activity = lifeCycleProcess.getActivity(state); lifeCycleExecution.setActivity((ActivityImpl) activity); lifeCycleExecution.signal(eventName); - task.state = lifeCycleExecution.getNode().getName(); + task.state = lifeCycleExecution.getActivity().getName(); } public IdGenerator getIdGenerator() { Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/internal/model/LifeCycleParser.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -99,7 +99,7 @@ return; } String stateName = element.getAttribute("name"); - ActivityImpl state = lifeCycleProcess.createNode(stateName); + ActivityImpl state = lifeCycleProcess.createActivity(stateName); state.setBehaviour(new LifeCycleState()); } } Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -150,7 +150,7 @@ taskIds.add(task.getId()); } - public HashSet<String> getNodeNames(String processInstanceId) { + public HashSet<String> getActivityNames(String processInstanceId) { HashSet<String> activityNames = new HashSet<String>(); List<Execution> executions = executionService.findExecutions(processInstanceId); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/svc/ExecutionServiceTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/svc/ExecutionServiceTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/svc/ExecutionServiceTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -238,7 +238,7 @@ executionService.startExecutionByName("p", "one"); Execution execution = executionService.signalExecution("p/one"); - assertEquals("a", execution.getNodeName()); + assertEquals("a", execution.getActivityName()); } public void testStartExecutionById() @@ -264,7 +264,7 @@ assertNotNull(execution); // checking the state - assertEquals("initial", execution.getNodeName()); + assertEquals("initial", execution.getActivityName()); // checking the generated id assertNull(execution.getName()); @@ -293,7 +293,7 @@ assertNotNull(execution); // checking the state - assertEquals("initial", execution.getNodeName()); + assertEquals("initial", execution.getActivityName()); // checking the generated id assertNull(execution.getName()); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -89,7 +89,7 @@ execution.setVariable("creditRate", 7); execution.start(); - assertEquals("priority delivery", execution.getNode().getName()); + assertEquals("priority delivery", execution.getActivity().getName()); } public void testAverageRating() { @@ -99,7 +99,7 @@ execution.setVariable("creditRate", 2); execution.start(); - assertEquals("bulk delivery", execution.getNode().getName()); + assertEquals("bulk delivery", execution.getActivity().getName()); } public void testBadRating() { @@ -109,6 +109,6 @@ execution.setVariable("creditRate", -7); execution.start(); - assertEquals("payment upfront", execution.getNode().getName()); + assertEquals("payment upfront", execution.getActivity().getName()); } } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -59,7 +59,7 @@ execution.waitForSignal(); } public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { - execution.fire(signalName, execution.getNode()); + execution.fire(signalName, execution.getActivity()); } } @@ -78,7 +78,7 @@ } } - public void testListenToNodeLeaveOnProcessForProcessNodes(){ + public void testListenToActivityLeaveOnProcessForProcessActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -101,7 +101,7 @@ assertEquals(1, recorder.events.size()); } - public void testListenToNodeEnterOnProcessForProcessNodes(){ + public void testListenToActivityEnterOnProcessForProcessActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -124,7 +124,7 @@ assertEquals(1, recorder.events.size()); } - public void testListenToTransitionOnProcessForTransitionBetweenProcessNodes(){ + public void testListenToTransitionOnProcessForTransitionBetweenProcessActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -152,7 +152,7 @@ public static class Sequence implements ExternalActivityBehaviour { private static final long serialVersionUID = 1L; public void execute(ActivityExecution execution) { - List<Activity> activities = execution.getNode().getActivities(); + List<Activity> activities = execution.getActivity().getActivities(); if ( (activities!=null) && (!activities.isEmpty()) ) { @@ -160,8 +160,8 @@ } } public void signal(ActivityExecution execution, String signal, Map<String, Object> parameters) { - Activity previous = execution.getPreviousNode(); - List<Activity> activities = execution.getNode().getActivities(); + Activity previous = execution.getPreviousActivity(); + List<Activity> activities = execution.getActivity().getActivities(); int index = activities.indexOf(previous); index++; if (index < activities.size()) { @@ -172,7 +172,7 @@ } - public void testListenToNodeLeaveOnProcessForSequenceChildNodes(){ + public void testListenToActivityLeaveOnProcessForSequenceChildActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -207,7 +207,7 @@ assertEquals(3, recorder.events.size()); } - public void testListenToNodeLeaveOnProcessForTransitionBetweenSequenceChildNodes(){ + public void testListenToActivityLeaveOnProcessForTransitionBetweenSequenceChildActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -239,7 +239,7 @@ } - public void testListenToNodeEnterOnProcessForSequenceChildNodes(){ + public void testListenToActivityEnterOnProcessForSequenceChildActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -272,7 +272,7 @@ assertEquals(3, recorder.events.size()); } - public void testListenToTransitionTakeOnProcessForTransitionBetweenSequenceChildNodes(){ + public void testListenToTransitionTakeOnProcessForTransitionBetweenSequenceChildActivities(){ Recorder recorder = new Recorder(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -71,20 +71,20 @@ // activity leave action //////////////////////////////////////////////////////// - public static class NodeLeaveAction implements EventListener { + public static class ActivityEndAction implements EventListener { private static final long serialVersionUID = 1L; public void notify(EventListenerExecution execution) { execution.setVariable("msg", "Kilroy was here"); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals("initial", execution.getEventSource().getName()); assertEquals("leave activity action test", execution.getProcessDefinition().getName()); assertEquals("end", execution.getTransition().getDestination().getName()); } } - public void testEventListenerOnNodeEnd() { - NodeLeaveAction activityLeaveAction = new NodeLeaveAction(); + public void testEventListenerOnActivityEnd() { + ActivityEndAction activityEndAction = new ActivityEndAction(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess("leave activity action test") @@ -92,7 +92,7 @@ .initial() .flow("end") .startEvent(Event.NODE_END) - .listener(activityLeaveAction) + .listener(activityEndAction) .endEvent() .endActivity() .startActivity("end", new WaitState()) @@ -101,7 +101,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); execution.signal(); assertEquals("Kilroy was here", execution.getVariable("msg")); } @@ -113,7 +113,7 @@ public void notify(EventListenerExecution execution) throws Exception { execution.setVariable("msg", "Kilroy was here"); - assertNull(execution.getNode()); + assertNull(execution.getActivity()); assertEquals("t", execution.getEventSource().getName()); assertEquals("transition action test", execution.getProcessDefinition().getName()); assertEquals("end", execution.getTransition().getDestination().getName()); @@ -138,27 +138,27 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); execution.signal("t"); assertEquals("Kilroy was here", execution.getVariable("msg")); } // activity enter action //////////////////////////////////////////////////////// - public static class NodeBeginAction implements EventListener { + public static class ActivityStartAction implements EventListener { private static final long serialVersionUID = 1L; public void notify(EventListenerExecution execution) throws Exception { execution.setVariable("msg", "Kilroy was here"); - assertEquals("end", execution.getNode().getName()); + assertEquals("end", execution.getActivity().getName()); assertEquals("end", execution.getEventSource().getName()); assertEquals("enter activity action test", execution.getProcessDefinition().getName()); assertEquals("end", execution.getTransition().getDestination().getName()); } } - public void testEventListenerOnNodeBegin() { - NodeBeginAction activityBeginAction = new NodeBeginAction(); + public void testEventListenerOnActivityStart() { + ActivityStartAction activityBeginAction = new ActivityStartAction(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess("enter activity action test") @@ -175,7 +175,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); execution.signal(); assertEquals("Kilroy was here", execution.getVariable("msg")); } @@ -188,7 +188,7 @@ execution.waitForSignal(); } public void signal(ActivityExecution execution, String signal, Map<String, Object> parameters) throws Exception { - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); if ( (signal!=null) && (activity!=null) && (activity.hasEvent(signal)) @@ -204,14 +204,14 @@ public void notify(EventListenerExecution execution) throws Exception { execution.setVariable("msg", "Kilroy was here"); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals("initial", execution.getEventSource().getName()); assertEquals("custom activity action test", execution.getProcessDefinition().getName()); assertNull(execution.getTransition()); } } - public void testCustomEventInNode() { + public void testCustomEventInActivity() { CheckRivetsAction checkRivetsAction = new CheckRivetsAction(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder @@ -229,17 +229,17 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertNull(execution.getVariable("msg")); execution.signal("end of riveter shift"); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals("Kilroy was here", execution.getVariable("msg")); execution.signal(); - assertEquals("end", execution.getNode().getName()); + assertEquals("end", execution.getActivity().getName()); } public static class EndState implements ActivityBehaviour { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -83,11 +83,11 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals(0, catcher.timesInvoked); execution.signal(); assertEquals(1, catcher.timesInvoked); - assertEquals("end", execution.getNode().getName()); + assertEquals("end", execution.getActivity().getName()); } public void testExceptionHandlerOnEvent() { @@ -110,11 +110,11 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals(0, catcher.timesInvoked); execution.signal(); assertEquals(1, catcher.timesInvoked); - assertEquals("end", execution.getNode().getName()); + assertEquals("end", execution.getActivity().getName()); } public void testExceptionHandlerOnAction() { @@ -137,14 +137,14 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals(0, catcher.timesInvoked); execution.signal(); assertEquals(1, catcher.timesInvoked); - assertEquals("end", execution.getNode().getName()); + assertEquals("end", execution.getActivity().getName()); } - public void testExceptionHandlerOnOtherNode() { + public void testExceptionHandlerOnOtherActivity() { Catcher catcher = new Catcher(); ClientProcessDefinition processDefinition = ProcessDefinitionBuilder .startProcess() @@ -164,7 +164,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); assertEquals(0, catcher.timesInvoked); try { execution.signal(); @@ -195,7 +195,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); try { execution.signal(); fail("expected exception"); @@ -230,7 +230,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("initial", execution.getNode().getName()); + assertEquals("initial", execution.getActivity().getName()); try { execution.signal(); fail("expected exception"); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -81,7 +81,7 @@ execution.signal("good"); - assertEquals("priority delivery", execution.getNode().getName()); + assertEquals("priority delivery", execution.getActivity().getName()); } public void testAverageRating() { @@ -90,7 +90,7 @@ execution.signal("average"); - assertEquals("bulk delivery", execution.getNode().getName()); + assertEquals("bulk delivery", execution.getActivity().getName()); } public void testBadRating() { @@ -99,6 +99,6 @@ execution.signal("bad"); - assertEquals("payment upfront", execution.getNode().getName()); + assertEquals("payment upfront", execution.getActivity().getName()); } } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -69,7 +69,7 @@ } } - public void testFunctionalActivityAsNodeBehaviourWithTransitions() { + public void testFunctionalActivityAsActivityBehaviourWithTransitions() { List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); @@ -138,14 +138,14 @@ public static class Composite implements ExternalActivityBehaviour { private static final long serialVersionUID = 1L; public void execute(ActivityExecution execution) { - Activity nestedNode = execution.getNode().getActivities().get(0); - execution.execute(nestedNode); + Activity nestedActivity = execution.getActivity().getActivities().get(0); + execution.execute(nestedActivity); } public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { } } - public void testFunctionalActivityAsNestedNode() { + public void testFunctionalActivityAsNestedActivity() { List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -104,6 +104,6 @@ for (int i=0; i<loops; i++) expectedIndexes.add(i); assertEquals(expectedIndexes, recordedIndexes); - assertEquals("end", execution.getNode().getName()); + assertEquals("end", execution.getActivity().getName()); } } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -53,7 +53,7 @@ public static class Composite implements ExternalActivityBehaviour { private static final long serialVersionUID = 1L; public void execute(ActivityExecution execution) { - Activity child = execution.getNode().getActivities().get(0); + Activity child = execution.getActivity().getActivities().get(0); execution.execute(child); } public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { 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-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -102,17 +102,17 @@ .endProcess(); ClientExecution superProcesInstance = superProcess.startProcessInstance(); - assertEquals("super2", superProcesInstance.getNode().getName()); + assertEquals("super2", superProcesInstance.getActivity().getName()); ClientExecution subProcessInstance = (ClientExecution) superProcesInstance.getSubProcessInstance(); assertNotNull(subProcessInstance); - assertEquals("sub2", subProcessInstance.getNode().getName()); + assertEquals("sub2", subProcessInstance.getActivity().getName()); subProcessInstance.signal(); - assertEquals("sub3", subProcessInstance.getNode().getName()); + assertEquals("sub3", subProcessInstance.getActivity().getName()); assertTrue(subProcessInstance.isEnded()); - assertEquals("super3", superProcesInstance.getNode().getName()); + assertEquals("super3", superProcesInstance.getActivity().getName()); } } 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-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -30,7 +30,7 @@ public void execute(ActivityExecution execution) { OpenExecution processInstance = execution.getProcessInstance(); - Activity activity = execution.getNode(); + Activity activity = execution.getActivity(); List<Transition> outgoingTransitions = activity.getOutgoingTransitions(); // for each outgoing transition @@ -44,7 +44,7 @@ // if this was the first fork if (execution.isProcessInstance()) { - execution.setNode(null); + execution.setActivity(null); } } } @@ -57,7 +57,7 @@ execution.setState(Execution.STATE_INACTIVE); execution.waitForSignal(); - Activity join = execution.getNode(); + Activity join = execution.getActivity(); List<OpenExecution> joinedExecutions = findJoinedExecutions(execution, join); if (isComplete(joinedExecutions, join)) { @@ -74,7 +74,7 @@ outgoingExecution = execution.createExecution(processInstance); } - execution.setNode(join, outgoingExecution); + execution.setActivity(join, outgoingExecution); Transition transition = join.getDefaultTransition(); execution.take(transition, outgoingExecution); } @@ -88,7 +88,7 @@ void scanRecursive(OpenExecution execution, Activity join, List<OpenExecution> joinedExecutions) { // if the execution is positioned in the join - if (join.equals(execution.getNode())) { + if (join.equals(execution.getActivity())) { joinedExecutions.add(execution); } Collection<OpenExecution> childExecutions = execution.getExecutions(); @@ -145,7 +145,7 @@ ClientExecution main = processDefinition.startProcessInstance(); - assertNull("fork", main.getNode()); + assertNull("fork", main.getActivity()); assertEquals(Execution.STATE_INACTIVE, main.getState()); Execution billing = main.getExecution("billing"); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-20 10:22:54 UTC (rev 3684) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-20 12:47:48 UTC (rev 3685) @@ -129,7 +129,7 @@ assertEquals(0, compositeListener.events.size()); assertEquals(0, insideListener.events.size()); - assertEquals("inside", execution.getNode().getName()); + assertEquals("inside", execution.getActivity().getName()); execution.signal(); @@ -298,7 +298,7 @@ assertEquals(0, compositeListener.events.size()); assertEquals(0, insideListener.events.size()); - assertEquals("inside", execution.getNode().getName()); + assertEquals("inside", execution.getActivity().getName()); execution.signal(); @@ -388,7 +388,7 @@ assertEquals(0, compositeListener.events.size()); assertEquals(0, insideListener.events.size()); - assertEquals("inside", execution.getNode().getName()); + assertEquals("inside", execution.getActivity().getName()); execution.signal(); @@ -502,7 +502,7 @@ ClientExecution execution = processDefinition.startProcessInstance(); - assertEquals("source inside", execution.getNode().getName()); + assertEquals("source inside", execution.getActivity().getName()); execution.signal();