[jbpm-commits] JBoss JBPM SVN: r3950 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/concurrency/graphbased and 34 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Feb 19 09:10:55 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-02-19 09:10:55 -0500 (Thu, 19 Feb 2009)
New Revision: 3950
Modified:
jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ExclusiveBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.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/execution/PvmProcessExecutionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml
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/BasicExecutionFlowTest.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/ExecutionStateTest.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/ScopeStateTest.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/ScopeVariableTest.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
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml
Log:
JBPM-1967 rename flow to transition
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2009-02-19 14:10:55 UTC (rev 3950)
@@ -84,7 +84,7 @@
</documentation></annotation>
<complexType>
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</complexType>
@@ -156,7 +156,7 @@
</documentation></annotation>
<complexType>
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</complexType>
@@ -165,15 +165,15 @@
<!-- ~~~ EXCLUSIVE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<element name="exclusive">
<annotation><documentation>Exclusive gateway: selects one path out of many alternatives.
- When an execution comes in, exactly one outgoing flow is taken.
+ When an execution comes in, exactly one outgoing transition is taken.
</documentation></annotation>
<complexType>
<sequence>
<element name="handler" minOccurs="0" type="tns:wireObjectType" />
- <element name="flow" minOccurs="0" maxOccurs="unbounded">
+ <element name="transition" minOccurs="0" maxOccurs="unbounded">
<complexType>
<complexContent>
- <extension base="tns:flowType">
+ <extension base="tns:transitionType">
<sequence>
<element name="condition" minOccurs="0" maxOccurs="unbounded">
<complexType>
@@ -197,7 +197,7 @@
<attributeGroup ref="tns:activityAttributes" />
<attribute name="expr" type="string">
<annotation><documentation>The script that will be evaluated and resolve to
- the name of the outgoing flow.
+ the name of the outgoing transition.
</documentation></annotation>
</attribute>
<attribute name="lang" type="string">
@@ -213,7 +213,7 @@
</documentation></annotation>
<complexType>
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</complexType>
@@ -225,7 +225,7 @@
</documentation></annotation>
<complexType>
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</complexType>
@@ -238,7 +238,7 @@
<complexContent>
<extension base="tns:scriptType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</extension>
@@ -253,7 +253,7 @@
<complexContent>
<extension base="tns:qlType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</extension>
@@ -268,7 +268,7 @@
<complexContent>
<extension base="tns:qlType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</extension>
@@ -286,7 +286,7 @@
<complexContent>
<extension base="tns:javaType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</extension>
@@ -301,7 +301,7 @@
<complexContent>
<extension base="tns:esbType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
</extension>
@@ -314,7 +314,7 @@
</documentation></annotation>
<complexType>
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attributeGroup ref="tns:activityAttributes" />
<attribute name="assignee" type="string" use="required">
@@ -337,7 +337,7 @@
- - >
<complexType>
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
<element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
<annotation><documentation>Events on which listeners can be registered.</documentation></annotation>
</element>
@@ -353,7 +353,7 @@
<complexType>
<sequence>
<group ref="tns:activityGroup" minOccurs="0" maxOccurs="unbounded" />
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
<element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
<annotation><documentation>Events on which listeners can be registered.</documentation></annotation>
</element>
@@ -369,7 +369,7 @@
<complexType>
<sequence>
<group ref="tns:delegationGroup"/>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
<element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
<annotation><documentation>Events on which listeners can be registered.</documentation></annotation>
</element>
@@ -385,7 +385,7 @@
<complexContent>
<extension base="tns:emailType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
<element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
<annotation><documentation>Events on which listeners can be registered.</documentation></annotation>
</element>
@@ -403,7 +403,7 @@
<complexContent>
<extension base="tns:taskType">
<sequence>
- <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" />
+ <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" />
<element ref="tns:on" minOccurs="0" maxOccurs="unbounded">
<annotation><documentation>Events on which listeners can be registered.</documentation></annotation>
</element>
@@ -576,9 +576,9 @@
</attribute>
</attributeGroup>
- <complexType name="flowType">
- <annotation><documentation>The outgoing flows. The first in the list
- will be the default outgoing flow.
+ <complexType name="transitionType">
+ <annotation><documentation>The outgoing transitions. The first in the list
+ will be the default outgoing transition.
</documentation></annotation>
<!--
<sequence>
@@ -586,10 +586,10 @@
</sequence>
-->
<attribute name="name" type="string">
- <annotation><documentation>Name of this outgoing flow</documentation></annotation>
+ <annotation><documentation>Name of this outgoing transition</documentation></annotation>
</attribute>
<attribute name="to" type="string">
- <annotation><documentation>Name of the destination activity of this flow.
+ <annotation><documentation>Name of the destination activity of this transition.
</documentation></annotation>
</attribute>
<attribute name="g" type="string">
@@ -598,8 +598,8 @@
</attribute>
</complexType>
- <element name="flow" type="tns:flowType">
- <annotation><documentation>A flow from one activity to another.</documentation></annotation>
+ <element name="transition" type="tns:transitionType">
+ <annotation><documentation>A transition from one activity to another.</documentation></annotation>
</element>
<element name="on">
@@ -699,7 +699,7 @@
<element name="timer">
<annotation><documentation>A timer that will be bound to the most inner enclosing scope.
- Timers can give a signal to an activity instance. The signal will correspond to a flow
+ Timers can give a signal to an activity instance. The signal will correspond to a transition
or to an event being fired.
</documentation></annotation>
<complexType>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,37 +3,37 @@
<process name="ConcurrencyGraphBased" xmlns="http://jbpm.org/4/jpdl">
<start g="16,102,48,48">
- <flow to="fork"/>
+ <transition to="fork"/>
</start>
<fork name="fork" g="96,102,48,48">
- <flow to="send invoice" g="120,41"/>
- <flow to="load truck"/>
- <flow to="print shipping documents" g="120,213"/>
+ <transition to="send invoice" g="120,41"/>
+ <transition to="load truck"/>
+ <transition to="print shipping documents" g="120,213"/>
</fork>
<state name="send invoice" g="176,16,149,52">
- <flow to="final join" g="606,41"/>
+ <transition to="final join" g="606,41"/>
</state>
<state name="load truck" g="176,100,149,52">
- <flow to="shipping join" g="377,126"/>
+ <transition to="shipping join" g="377,126"/>
</state>
<state name="print shipping documents" g="176,184,149,58">
- <flow to="shipping join" g="378,213"/>
+ <transition to="shipping join" g="378,213"/>
</state>
<join name="shipping join" g="353,145,48,48">
- <flow to="drive truck to destination"/>
+ <transition to="drive truck to destination"/>
</join>
<state name="drive truck to destination" g="431,140,148,52">
- <flow to="final join" g="607,165"/>
+ <transition to="final join" g="607,165"/>
</state>
<join name="final join" g="583,73,48,48">
- <flow to="end"/>
+ <transition to="end"/>
</join>
<end name="end" g="666,74,48,48"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,13 +3,13 @@
<process name="EndMultiple" xmlns="http://jbpm.org/4/jpdl">
<start g="16,96,48,48">
- <flow to="get return code" />
+ <transition to="get return code" />
</start>
<state name="get return code" g="96,94,111,52">
- <flow name="200" to="ok" g="151,60" />
- <flow name="400" to="bad request" />
- <flow name="500" to="internal server error" g="151,183" />
+ <transition name="200" to="ok" g="151,60" />
+ <transition name="400" to="bad request" />
+ <transition name="500" to="internal server error" g="151,183" />
</state>
<end name="ok" g="238,37,48,48" />
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="EndProcessInstance" xmlns="http://jbpm.org/4/jpdl">
<start g="85,73,80,40">
- <flow to="end" />
+ <transition to="end" />
</start>
<end name="end" g="191,73,80,40"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,13 +3,13 @@
<process name="EndState" xmlns="http://jbpm.org/4/jpdl">
<start g="16,96,48,48">
- <flow to="get return code"/>
+ <transition to="get return code"/>
</start>
<state name="get return code" g="96,94,110,52">
- <flow name="200" to="ok" g="150,63"/>
- <flow name="400" to="bad request" />
- <flow name="500" to="internal server error" g="150,177"/>
+ <transition name="200" to="ok" g="150,63"/>
+ <transition name="400" to="bad request" />
+ <transition name="500" to="internal server error" g="150,177"/>
</state>
<end name="ok" state="completed" g="239,40,48,48"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/esb/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="Esb" xmlns="http://jbpm.org/4/jpdl">
<start g="32,22,80,40">
- <flow to="invoke esb service" />
+ <transition to="invoke esb service" />
</start>
<esb name="invoke esb service"
@@ -16,7 +16,7 @@
<string value="deliver asap" />
</part>
- <flow to="wait" />
+ <transition to="wait" />
</esb>
<state name="wait" g="280,16,94,56" />
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,17 +3,17 @@
<process name="ExclusiveConditions" xmlns="http://jbpm.org/4/jpdl">
<start g="16,102,48,48">
- <flow to="evaluate document" />
+ <transition to="evaluate document" />
</start>
<exclusive name="evaluate document" g="96,102,48,48">
- <flow to="submit document" g="120,60">
+ <transition to="submit document" g="120,60">
<condition expr="#{content=="good"}" />
- </flow>
- <flow to="try again">
+ </transition>
+ <transition to="try again">
<condition expr="#{content=="bad"}" />
- </flow>
- <flow to="give up" g="120,189" />
+ </transition>
+ <transition to="give up" g="120,189" />
</exclusive>
<state name="submit document" g="175,35,122,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,13 +3,13 @@
<process name="ExclusiveExpression" xmlns="http://jbpm.org/4/jpdl">
<start g="16,102,48,48">
- <flow to="evaluate document"/>
+ <transition to="evaluate document"/>
</start>
<exclusive name="evaluate document" expr="#{content}" g="96,102,48,48">
- <flow name="good" to="submit document" g="120,60"/>
- <flow name="bad" to="try again"/>
- <flow name="ugly" to="give up" g="120,189"/>
+ <transition name="good" to="submit document" g="120,60"/>
+ <transition name="bad" to="try again"/>
+ <transition name="ugly" to="give up" g="120,189"/>
</exclusive>
<state name="submit document" g="175,35,122,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,14 +3,14 @@
<process name="ExclusiveHandler" xmlns="http://jbpm.org/4/jpdl">
<start g="16,102,48,48">
- <flow to="evaluate document" />
+ <transition to="evaluate document" />
</start>
<exclusive name="evaluate document" g="96,102,48,48">
<handler class="org.jbpm.examples.exclusive.handler.ContentEvaluation" />
- <flow name="good" to="submit document" g="120,60" />
- <flow name="bad" to="try again" />
- <flow name="ugly" to="give up" g="120,189" />
+ <transition name="good" to="submit document" g="120,60" />
+ <transition name="bad" to="try again" />
+ <transition name="ugly" to="give up" g="120,189" />
</exclusive>
<state name="submit document" g="175,35,122,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="Hql" xmlns="http://jbpm.org/4/jpdl">
<start g="17,20,48,48">
- <flow to="get process names" />
+ <transition to="get process names" />
</start>
<hql name="get process names"
@@ -17,7 +17,7 @@
<parameters>
<string name="activityName" value="%o%" />
</parameters>
- <flow to="count activities" />
+ <transition to="count activities" />
</hql>
<hql name="count activities"
@@ -28,7 +28,7 @@
select count(*)
from org.jbpm.pvm.internal.model.ActivityImpl
</query>
- <flow to="wait" />
+ <transition to="wait" />
</hql>
<state name="wait" g="370,18,96,48"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="Java" xmlns="http://jbpm.org/4/jpdl">
<start g="20,20,48,48">
- <flow to="invoke java method" />
+ <transition to="invoke java method" />
</start>
<java name="invoke java method"
@@ -17,7 +17,7 @@
<arg><string value="Hi, how are you?"/></arg>
- <flow to="wait" />
+ <transition to="wait" />
</java>
<state name="wait" g="255,16,88,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="ScriptExpression" xmlns="http://jbpm.org/4/jpdl">
<start g="17,19,48,48">
- <flow to="invoke script" />
+ <transition to="invoke script" />
</start>
<script name="invoke script"
@@ -11,7 +11,7 @@
var="text"
g="96,16,104,52">
- <flow to="wait" />
+ <transition to="wait" />
</script>
<state name="wait" g="232,16,80,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="ScriptText" xmlns="http://jbpm.org/4/jpdl">
<start g="16,22,80,40">
- <flow to="invoke script" g="48,68,48,48"/>
+ <transition to="invoke script" g="48,68,48,48"/>
</start>
<script name="invoke script"
@@ -13,7 +13,7 @@
Send packet to #{person.address}
</text>
- <flow to="wait" />
+ <transition to="wait" />
</script>
<state name="wait" g="266,18,80,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,7 +3,7 @@
<process name="Sql" xmlns="http://jbpm.org/4/jpdl">
<start g="16,20,48,48">
- <flow to="get process names" />
+ <transition to="get process names" />
</start>
<sql name="get process names"
@@ -17,7 +17,7 @@
<parameters>
<string name="activityName" value="%o%" />
</parameters>
- <flow to="count activities" />
+ <transition to="count activities" />
</sql>
<sql name="count activities"
@@ -28,7 +28,7 @@
select count(*)
from JBPM_ACTIVITY
</query>
- <flow to="wait" />
+ <transition to="wait" />
</sql>
<state name="wait" g="378,18,94,48"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,12 +3,12 @@
<process name="StateChoice" xmlns="http://jbpm.org/4/jpdl">
<start g="16,60,48,48">
- <flow to="wait for response" />
+ <transition to="wait for response" />
</start>
<state name="wait for response" g="96,58,109,52">
- <flow name="accept" to="submit document" g="151,41"/>
- <flow name="reject" to="try again" g="151,125"/>
+ <transition name="accept" to="submit document" g="151,41"/>
+ <transition name="reject" to="try again" g="151,125"/>
</state>
<state name="submit document" g="237,16,114,52"/>
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,15 +3,15 @@
<process name="StateSequence" xmlns="http://jbpm.org/4/jpdl">
<start g="16,18,48,48">
- <flow to="a" />
+ <transition to="a" />
</start>
<state name="a" g="96,16,75,52">
- <flow to="b" />
+ <transition to="b" />
</state>
<state name="b" g="203,16,73,52">
- <flow to="c" />
+ <transition to="c" />
</state>
<state name="c" g="308,16,76,52" />
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,14 +3,14 @@
<process name="Task" xmlns="http://jbpm.org/4/jpdl">
<start g="20,20,48,48">
- <flow to="review" />
+ <transition to="review" />
</start>
<task name="review"
assignee="johndoe"
g="96,16,127,52">
- <flow to="wait" />
+ <transition to="wait" />
</task>
<state name="wait" g="255,16,88,52"/>
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ExclusiveBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ExclusiveBinding.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ExclusiveBinding.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -74,7 +74,7 @@
}
boolean hasConditions = false;
- List<Element> transitionElements = XmlUtil.elements(element, "flow");
+ List<Element> transitionElements = XmlUtil.elements(element, "transition");
ActivityImpl activity = parse.findObject(ActivityImpl.class);
List<TransitionImpl> transitions = (List) activity.getOutgoingTransitions();
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlActivityBinding.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -60,7 +60,7 @@
}
public void parseFlows(Element element, ActivityImpl activity, Parse parse) {
- List<Element> transitionElements = XmlUtil.elements(element, "flow");
+ List<Element> transitionElements = XmlUtil.elements(element, "transition");
UnresolvedTransitions unresolvedTransitions = parse.findObject(UnresolvedTransitions.class);
for (Element transitionElement: transitionElements) {
String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse);
Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -4,12 +4,12 @@
xmlns:ext="http://jbpm.org/customextensions">
<start>
- <flow to="a"/>
+ <transition to="a"/>
</start>
<customactivity name="a" customattrib="xxx">
<customconfigelement a="yyy" />
- <flow to="end"/>
+ <transition to="end"/>
</customactivity>
<end name="end" />
Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,15 +3,15 @@
<process name="StateSequence" xmlns="http://jbpm.org/4/jpdl">
<start g="16,18,48,48">
- <flow to="a" />
+ <transition to="a" />
</start>
<state name="a" g="96,16,75,52">
- <flow to="b" />
+ <transition to="b" />
</state>
<state name="b" g="203,16,73,52">
- <flow to="c" />
+ <transition to="c" />
</state>
<state name="c" g="308,16,76,52" />
Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,16 +3,16 @@
<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="a" />
+ <transition to="a" />
</start>
<state name="a">
- <flow name="Supplier ok" to="b" />
+ <transition name="Supplier ok" to="b" />
</state>
<state name="b">
- <flow name="nok" to="Error" />
- <flow name="ok" to="Completed" />
+ <transition name="nok" to="Error" />
+ <transition name="ok" to="Completed" />
</state >
<end name="Completed" />
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -86,12 +86,12 @@
return compositeBuilder.endProcess();
}
- public ActivityBuilder flow(String to) {
+ public ActivityBuilder transition(String to) {
startFlow(to);
return this;
}
- public ActivityBuilder flow(String to, String name) {
+ public ActivityBuilder transition(String to, String name) {
startFlow(to).name(name);
return this;
}
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -126,6 +126,6 @@
protected void errorUnexistingFlowDestination(UnresolvedFlow unresolvedFlow) {
String sourceActivityName = unresolvedFlow.transition.getSource().getName();
- log.error("unexisting flow destination: "+sourceActivityName+"-->"+unresolvedFlow.destinationName);
+ log.error("unexisting transition destination: "+sourceActivityName+"-->"+unresolvedFlow.destinationName);
}
}
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -85,15 +85,15 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
.startProcess("p")
.startActivity("x")
- .flow("a")
- .flow("b", "to b")
+ .transition("a")
+ .transition("b", "to b")
.startFlow("c")
.name("to c")
.endFlow()
- .flow("x")
+ .transition("x")
.endActivity()
.startActivity("a")
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b")
.endActivity()
@@ -141,14 +141,14 @@
.startProcess()
.startActivity("1")
.startActivity("1.1")
- .flow("1.2.1", "to onedottwodotone")
+ .transition("1.2.1", "to onedottwodotone")
.endActivity()
.startActivity("1.2")
.startActivity("1.2.1")
.endActivity()
.startActivity("1.2.2")
.initial()
- .flow("1", "to one")
+ .transition("1", "to one")
.endActivity()
.startActivity("1.2.3")
.endActivity()
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -56,10 +56,10 @@
.endEvent()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .flow("c")
+ .transition("c")
.endActivity()
.endActivity()
.startActivity("c", new WaitState())
@@ -92,10 +92,10 @@
.endEvent()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .flow("c")
+ .transition("c")
.endActivity()
.endActivity()
.startActivity("c", new WaitState())
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/Loan.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -39,17 +39,17 @@
.startProcess("loan")
.startActivity("submit loan request", new AutomaticActivity())
.initial()
- .flow("evaluate")
+ .transition("evaluate")
.endActivity()
.startActivity("evaluate", new WaitState())
- .flow("wire money", "approve")
- .flow("end", "reject")
+ .transition("wire money", "approve")
+ .transition("end", "reject")
.endActivity()
.startActivity("wire money", new AutomaticActivity())
- .flow("archive")
+ .transition("archive")
.endActivity()
.startActivity("archive", new WaitState())
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ObjectExecutionModeTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -37,17 +37,17 @@
.startProcess("loan")
.startActivity("submit loan request", new AutomaticActivity())
.initial()
- .flow("evaluate")
+ .transition("evaluate")
.endActivity()
.startActivity("evaluate", new WaitState())
- .flow("wire money", "approve")
- .flow("end", "reject")
+ .transition("wire money", "approve")
+ .transition("end", "reject")
.endActivity()
.startActivity("wire money", new AutomaticActivity())
- .flow("archive")
+ .transition("archive")
.endActivity()
.startActivity("archive", new WaitState())
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -438,13 +438,13 @@
.startProcess()
.startActivity()
.initial()
- .flow("a")
+ .transition("a")
.endActivity()
.startActivity("a")
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b")
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c")
.endActivity()
@@ -525,8 +525,8 @@
.startProcess()
.startActivity()
.initial()
- .flow("a")
- .flow("b")
+ .transition("a")
+ .transition("b")
.endActivity()
.startActivity("a")
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -176,17 +176,17 @@
.startProcess()
.startActivity("a")
.initial()
- .flow("a")
- .flow("b", "tob")
- .flow("c", "toc")
+ .transition("a")
+ .transition("b", "tob")
+ .transition("c", "toc")
.endActivity()
.startActivity("b")
- .flow("a", "toa")
- .flow("b")
- .flow("c", "toc")
+ .transition("a", "toa")
+ .transition("b")
+ .transition("c", "toc")
.endActivity()
.startActivity("c")
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("d")
.endActivity()
@@ -207,8 +207,8 @@
.startProcess()
.startActivity()
.initial()
- .flow("a")
- .flow("b")
+ .transition("a")
+ .transition("b")
.endActivity()
.startActivity("a")
.endActivity()
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/PvmProcessExecutionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -49,7 +49,7 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess("test")
.startActivity("start", WaitState.class)
.initial()
- .flow("end", "end")
+ .transition("end", "end")
.endActivity()
.startActivity("end", AutomaticActivity.class)
.endActivity()
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -75,19 +75,19 @@
.startActivity("start", AutomaticActivity.class)
.initial()
.asyncExecute()
- .flow("a")
+ .transition("a")
.endActivity()
.startActivity("a", AutomaticActivity.class)
.asyncExecute()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", AutomaticActivity.class)
.asyncExecute()
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", AutomaticActivity.class)
.asyncExecute()
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", AutomaticActivity.class)
.endActivity()
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -37,11 +37,11 @@
deployJpdlXmlString(
"<process name='Poolcar'>" +
" <start>" +
- " <flow to='How far?' />" +
+ " <transition to='How far?' />" +
" </start>" +
" <exclusive name='How far?' expr='#{distance}'>" +
- " <flow name='far' to='Big car' />" +
- " <flow name='nearby' to='Small car' />" +
+ " <transition name='far' to='Big car' />" +
+ " <transition name='nearby' to='Small car' />" +
" </exclusive>" +
" <state name='Big car' />" +
" <state name='Small car' />" +
@@ -62,16 +62,16 @@
deployJpdlXmlString(
"<process name='Poolcar'>" +
" <start>" +
- " <flow to='How far?' />" +
+ " <transition to='How far?' />" +
" </start>" +
" <exclusive name='How far?'>" +
- " <flow to='Big car'>" +
+ " <transition to='Big car'>" +
" <condition expr='#{distance > 10}' />" +
- " </flow>" +
- " <flow to='Small car'>" +
+ " </transition>" +
+ " <transition to='Small car'>" +
" <condition expr='#{distance >= 3}' />" +
- " </flow>" +
- " <flow to='No car' />" +
+ " </transition>" +
+ " <transition to='No car' />" +
" </exclusive>" +
" <state name='Big car' />" +
" <state name='Small car' />" +
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -34,13 +34,13 @@
deployJpdlXmlString(
"<process name='ThreeStates'>" +
" <start name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b'>" +
- " <flow to='c' />" +
+ " <transition to='c' />" +
" </state>" +
" <state name='c'>" +
- " <flow to='d' />" +
+ " <transition to='d' />" +
" </state>" +
" <end name='d' />" +
"</process>"
@@ -62,12 +62,12 @@
deployJpdlXmlString(
"<process name='p'>" +
" <start>" +
- " <flow to='ed' />" +
+ " <transition to='ed' />" +
" </start>" +
" <state name='ed'>" +
- " <flow name='left' to='b' />" +
- " <flow name='middle' to='c' />" +
- " <flow name='right' to='d' />" +
+ " <transition name='left' to='b' />" +
+ " <transition name='middle' to='c' />" +
+ " <transition name='right' to='d' />" +
" </state>" +
" <state name='b' />" +
" <state name='c' />" +
@@ -93,12 +93,12 @@
deployJpdlXmlString(
"<process name='p'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a'>" +
- " <flow name='left' to='b' />" +
- " <flow name='middle' to='c' />" +
- " <flow name='right' to='d' />" +
+ " <transition name='left' to='b' />" +
+ " <transition name='middle' to='c' />" +
+ " <transition name='right' to='d' />" +
" </state>" +
" <state name='b' />" +
" <state name='c' />" +
@@ -118,12 +118,12 @@
deployJpdlXmlString(
"<process name='p'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a'>" +
- " <flow name='left' to='b' />" +
- " <flow name='middle' to='c' />" +
- " <flow name='right' to='d' />" +
+ " <transition name='left' to='b' />" +
+ " <transition name='middle' to='c' />" +
+ " <transition name='right' to='d' />" +
" </state>" +
" <state name='b' />" +
" <state name='c' />" +
@@ -140,7 +140,7 @@
deployJpdlXmlString(
"<process name='p'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -33,7 +33,7 @@
deployJpdlXmlString(
"<process name='p'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -39,13 +39,13 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </state>" +
" <state name='b'>" +
- " <flow to='c' />" +
+ " <transition to='c' />" +
" </state>" +
" <state name='c' />" +
"</process>"
@@ -68,13 +68,13 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </state>" +
" <state name='b'>" +
- " <flow to='c' />" +
+ " <transition to='c' />" +
" </state>" +
" <state name='c' />" +
"</process>"
@@ -97,10 +97,10 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </state>" +
" <state name='b' />" +
"</process>"
@@ -133,7 +133,7 @@
deployJpdlXmlString(
"<process name='p'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -40,7 +40,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
@@ -56,7 +56,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
@@ -70,7 +70,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b' />" +
"</process>"
@@ -86,7 +86,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
@@ -95,7 +95,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b' />" +
"</process>"
@@ -123,7 +123,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
@@ -139,7 +139,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
@@ -169,7 +169,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
@@ -198,7 +198,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='a' />" +
+ " <transition to='a' />" +
" </start>" +
" <state name='a' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -39,16 +39,16 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='one' />" +
+ " <transition to='one' />" +
" </start>" +
" <state name='one'>" +
- " <flow to='two' />" +
+ " <transition to='two' />" +
" </state>" +
" <state name='two'>" +
- " <flow to='three' />" +
+ " <transition to='three' />" +
" </state>" +
" <state name='three'>" +
- " <flow to='end' />" +
+ " <transition to='end' />" +
" </state>" +
" <end name='end' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -37,12 +37,12 @@
deployJpdlXmlString(
"<process name='Transport Selection' key='TRS'>" +
" <start>" +
- " <flow to='How far?' />" +
+ " <transition to='How far?' />" +
" </start>" +
" <exclusive name='How far?' expr='#{distance}'>" +
- " <flow name='far' to='Big car' />" +
- " <flow name='nearby' to='Small car' />" +
- " <flow name='other country' to='Airoplane' />" +
+ " <transition name='far' to='Big car' />" +
+ " <transition name='nearby' to='Small car' />" +
+ " <transition name='other country' to='Airoplane' />" +
" </exclusive>" +
" <state name='Big car' />" +
" <state name='Small car' />" +
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -37,7 +37,7 @@
deployJpdlXmlString(
"<process name='Insurance claim' key='ICL'>" +
" <start>" +
- " <flow to='end' />" +
+ " <transition to='end' />" +
" </start>" +
" <end name='end' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -158,7 +158,7 @@
.addString("xmlstring.jpdl.xml",
"<process name='deleteme' version='33'>" +
" <start>" +
- " <flow to='w' />" +
+ " <transition to='w' />" +
" </start>" +
" <state name='w' />" +
"</process>")
@@ -181,7 +181,7 @@
deployJpdlXmlString(
"<process name='deleteme' version='33'>" +
" <start>" +
- " <flow to='w' />" +
+ " <transition to='w' />" +
" </start>" +
" <state name='w' />" +
"</process>"
@@ -328,7 +328,7 @@
deployJpdlXmlString(
"<process name='minimal'>" +
" <start>" +
- " <flow to='end' />" +
+ " <transition to='end' />" +
" </start>" +
" <end name='end' />" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -38,7 +38,7 @@
deployJpdlXmlString(
"<process name='var'>" +
" <start name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b'/>" +
"</process>"
@@ -54,7 +54,7 @@
deployJpdlXmlString(
"<process name='var'>" +
" <start name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b'/>" +
"</process>"
@@ -84,7 +84,7 @@
deployJpdlXmlString(
"<process name='var'>" +
" <start name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b'/>" +
"</process>"
@@ -101,7 +101,7 @@
deployJpdlXmlString(
"<process name='var'>" +
" <start name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b'/>" +
"</process>"
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -36,7 +36,7 @@
deployJpdlXmlString(
"<process name='var'>" +
" <start name='a'>" +
- " <flow to='b' />" +
+ " <transition to='b' />" +
" </start>" +
" <state name='b'/>" +
"</process>"
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -74,19 +74,19 @@
.startActivity("start", AutomaticActivity.class)
.initial()
.asyncExecute()
- .flow("a")
+ .transition("a")
.endActivity()
.startActivity("a", AutomaticActivity.class)
.asyncExecute()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", AutomaticActivity.class)
.asyncExecute()
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", AutomaticActivity.class)
.asyncExecute()
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", WaitState.class)
.endActivity()
Modified: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -3,35 +3,35 @@
<process name="Process" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="a" />
+ <transition to="a" />
</start>
<java name="a"
class="org.jbpm.test.load.executions.Automatic"
method="doNothing">
- <flow to="b" />
+ <transition to="b" />
</java>
<java name="b"
class="org.jbpm.test.load.executions.Automatic"
method="doNothing">
- <flow to="c" />
+ <transition to="c" />
</java>
<state name="c">
- <flow to="d" />
+ <transition to="d" />
</state>
<java name="d"
class="org.jbpm.test.load.executions.Automatic"
method="doNothing">
- <flow to="e" />
+ <transition to="e" />
</java>
<java name="e"
class="org.jbpm.test.load.executions.Automatic"
method="doNothing">
- <flow to="end" />
+ <transition to="end" />
</java>
<end name="end" />
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -69,9 +69,9 @@
return ProcessDefinitionBuilder.startProcess()
.startActivity("creditRate?", new AutomaticCreditRating())
.initial()
- .flow("priority delivery", "good")
- .flow("bulk delivery", "average")
- .flow("payment upfront", "bad")
+ .transition("priority delivery", "good")
+ .transition("bulk delivery", "average")
+ .transition("payment upfront", "bad")
.endActivity()
.startActivity("priority delivery", new WaitState())
.endActivity()
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -79,17 +79,17 @@
.startProcess("loan")
.startActivity("submit loan request", automaticActivity)
.initial()
- .flow("evaluate")
+ .transition("evaluate")
.endActivity()
.startActivity("evaluate", waitState)
- .flow("wire money", "approve")
- .flow("end", "reject")
+ .transition("wire money", "approve")
+ .transition("end", "reject")
.endActivity()
.startActivity("wire money", automaticActivity)
- .flow("archive")
+ .transition("archive")
.endActivity()
.startActivity("archive", waitState)
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", waitState)
.endActivity()
@@ -132,17 +132,17 @@
.startProcess("loan")
.startActivity("submit loan request", automaticActivity)
.initial()
- .flow("evaluate")
+ .transition("evaluate")
.endActivity()
.startActivity("evaluate", waitState)
- .flow("wire money", "approve")
- .flow("end", "reject")
+ .transition("wire money", "approve")
+ .transition("end", "reject")
.endActivity()
.startActivity("wire money", automaticActivity)
- .flow("archive")
+ .transition("archive")
.endActivity()
.startActivity("archive", waitState)
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", waitState)
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -71,7 +71,7 @@
.endEvent()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
@@ -94,7 +94,7 @@
.endEvent()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
@@ -118,7 +118,7 @@
.endEvent()
.startActivity("initial", new WaitState())
.initial()
- .flow("end", "go")
+ .transition("end", "go")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
@@ -203,7 +203,7 @@
.startActivity("sequence", new Sequence())
.initial()
.startActivity("one", new WaitState())
- .flow("two")
+ .transition("two")
.endActivity()
.startActivity("two", new WaitState())
.endActivity()
@@ -275,7 +275,7 @@
.startActivity("sequence", new Sequence())
.initial()
.startActivity("one", new WaitState())
- .flow("two", "increment")
+ .transition("two", "increment")
.endActivity()
.startActivity("two", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -73,7 +73,7 @@
.startProcess("leave activity action test")
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.listener(activityEndAction)
.endEvent()
@@ -147,7 +147,7 @@
.startProcess("enter activity action test")
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new WaitState())
.startEvent(Event.START)
@@ -201,7 +201,7 @@
.startProcess("custom activity action test")
.startActivity("initial", new WaitStateWithCustomEvent())
.initial()
- .flow("end")
+ .transition("end")
.startEvent("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here
.listener(checkRivetsAction)
.endEvent()
@@ -252,7 +252,7 @@
.startProcess("basic", new RecordingProcessDefinition())
.startActivity("initial", new AutomaticActivity())
.initial()
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new EndState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -72,7 +72,7 @@
.endExceptionHandler()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.listener(new Batter())
.endEvent()
@@ -96,7 +96,7 @@
.startProcess()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.startExceptionHandler(RuntimeException.class)
.listener(catcher)
@@ -123,7 +123,7 @@
.startProcess()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.listener(new Batter())
.startExceptionHandler(RuntimeException.class)
@@ -150,7 +150,7 @@
.startProcess()
.startActivity("initial",new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.listener(new Batter())
.endEvent()
@@ -179,7 +179,7 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent("other")
.startExceptionHandler(RuntimeException.class)
.listener(catcher)
@@ -216,7 +216,7 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.startExceptionHandler(NullPointerException.class)
.listener(catcher)
@@ -254,7 +254,7 @@
.startProcess()
.startActivity("initial", new WaitState())
.initial()
- .flow("end")
+ .transition("end")
.startEvent(Event.END)
.startExceptionHandler(RuntimeException.class)
.listener(rethrowingCatcher)
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -80,10 +80,10 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess()
.startActivity("a", new AutomaticActivity())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new AutomaticActivity())
.endActivity()
@@ -106,11 +106,11 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess()
.startActivity("a", new AutomaticActivity())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope()
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new AutomaticActivity())
.endActivity()
@@ -134,10 +134,10 @@
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess()
.startActivity("a", new AutomaticActivity())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new AutomaticActivity())
.endActivity()
@@ -163,10 +163,10 @@
.startProcess()
.startActivity("a", new AutomaticActivity())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new AutomaticActivity())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -62,9 +62,9 @@
.startProcess()
.startActivity("creditRate?", new ExternalDecision())
.initial()
- .flow("priority delivery", "good")
- .flow("bulk delivery", "average")
- .flow("payment upfront", "bad")
+ .transition("priority delivery", "good")
+ .transition("bulk delivery", "average")
+ .transition("payment upfront", "bad")
.endActivity()
.startActivity("priority delivery", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -39,7 +39,7 @@
/** shows how functional activities (activities that have a specific function
- * not related to control flow) can be implemented.
+ * not related to control transition) can be implemented.
*
* Examples of functional activities could be sending an email, doing a
* SQL update on a database, generating a file and so on.
@@ -77,10 +77,10 @@
.startProcess()
.startActivity("a", functionalActivity)
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", functionalActivity)
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", functionalActivity)
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -88,11 +88,11 @@
.startProcess()
.startActivity("for", new For(loops))
.initial()
- .flow("recorder", "loop")
- .flow("end", "done")
+ .transition("recorder", "loop")
+ .transition("end", "done")
.endActivity()
.startActivity("recorder", new Recorder())
- .flow("for")
+ .transition("for")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -62,11 +62,11 @@
.startProcess()
.startActivity("a", new AutomaticActivity())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope()
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -219,7 +219,7 @@
.startActivity("left-start", new WaitState())
.initial()
.scope()
- .flow("right-inner")
+ .transition("right-inner")
.startVariable("fuel")
.initialValue(new StringDescriptor("kerosine"))
.endVariable()
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -60,11 +60,11 @@
.startProcess()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope() // !!!!
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -90,11 +90,11 @@
.startProcess()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope() // !!!!
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -121,11 +121,11 @@
.startProcess()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope() // !!!!
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -152,11 +152,11 @@
.startProcess()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope() // !!!!
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
@@ -181,11 +181,11 @@
.startProcess()
.startActivity("a", new WaitState())
.initial()
- .flow("b")
+ .transition("b")
.endActivity()
.startActivity("b", new WaitState())
.scope() // !!!!
- .flow("c")
+ .transition("c")
.endActivity()
.startActivity("c", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -79,10 +79,10 @@
.startProcess("sub")
.startActivity("sub1", new AutomaticActivity())
.initial()
- .flow("sub2")
+ .transition("sub2")
.endActivity()
.startActivity("sub2", new WaitState())
- .flow("sub3")
+ .transition("sub3")
.endActivity()
.startActivity("sub3", new EndState())
.endActivity()
@@ -92,10 +92,10 @@
.startProcess("super")
.startActivity("super1", new AutomaticActivity())
.initial()
- .flow("super2")
+ .transition("super2")
.endActivity()
.startActivity("super2", new SubProcess(subProcess))
- .flow("super3")
+ .transition("super3")
.endActivity()
.startActivity("super3", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -127,17 +127,17 @@
.startProcess()
.startActivity("fork", new Fork())
.initial()
- .flow("bill", "billing")
- .flow("ship", "shipping")
+ .transition("bill", "billing")
+ .transition("ship", "shipping")
.endActivity()
.startActivity("bill", new WaitState())
- .flow("join")
+ .transition("join")
.endActivity()
.startActivity("ship", new WaitState())
- .flow("join")
+ .transition("join")
.endActivity()
.startActivity("join", new Join())
- .flow("end")
+ .transition("end")
.endActivity()
.startActivity("end", new WaitState())
.endActivity()
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-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-02-19 14:10:55 UTC (rev 3950)
@@ -84,7 +84,7 @@
.endEvent()
.startActivity("inside", new WaitState())
.initial()
- .flow("outside")
+ .transition("outside")
.startEvent(Event.END)
.listener(insideListener)
.endEvent()
@@ -163,7 +163,7 @@
.endEvent()
.startActivity("outside", new WaitState())
.initial()
- .flow("inside")
+ .transition("inside")
.startEvent(Event.END)
.listener(outsideListener)
.endEvent()
@@ -261,7 +261,7 @@
.endEvent()
.startActivity("inside", new WaitState())
.initial()
- .flow("inside")
+ .transition("inside")
.startEvent(Event.END)
.listener(insideListener)
.endEvent()
@@ -335,7 +335,7 @@
.endEvent()
.startActivity("inside", new WaitState())
.initial()
- .flow("inside")
+ .transition("inside")
.endActivity()
.endActivity()
.endProcess();
@@ -391,7 +391,7 @@
.listener(processListener)
.endEvent()
.startActivity("composite")
- .flow("outside")
+ .transition("outside")
.startEvent(Event.END)
.listener(compositeListener)
.endEvent()
@@ -495,7 +495,7 @@
.listener(sourceOutsideListener)
.endEvent()
.startActivity("source middle")
- .flow("destination inside")
+ .transition("destination inside")
.startEvent(Event.END)
.listener(sourceMiddleListener)
.endEvent()
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -12,17 +12,17 @@
<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="Verify supplier" />
+ <transition to="Verify supplier" />
</start>
<state name="Verify supplier">
- <flow name="Supplier ok" to="Check supplier data" />
- <flow name="Supplier not ok" to="Error" />
+ <transition name="Supplier ok" to="Check supplier data" />
+ <transition name="Supplier not ok" to="Error" />
</state>
<exclusive name="Check supplier data">
- <flow name="nok" to="Error" />
- <flow name="ok" to="Completed" />
+ <transition name="nok" to="Error" />
+ <transition name="ok" to="Completed" />
</exclusive>
<end name="Completed" />
@@ -118,7 +118,7 @@
<title><literal>start</literal></title>
<para>Indicates where an execution for this process starts. Typically there is
exactly one start activity in a process. A process has to have at least one start
- activity. A start activity must have exactly one outgoing flow and that flow
+ activity. A start activity must have exactly one outgoing transition and that transition
is taken when a process execution starts.
</para>
<table><title><literal>start</literal> attributes:</title>
@@ -139,7 +139,7 @@
<entry></entry>
<entry>optional</entry>
<entry>name of the activity. Since a start activity
- cannot have incoming flows, the name is optional.
+ cannot have incoming transitions, the name is optional.
</entry>
</row>
</tbody>
@@ -156,9 +156,9 @@
</thead>
<tbody>
<row>
- <entry><literal>flow</literal></entry>
+ <entry><literal>transition</literal></entry>
<entry>1</entry>
- <entry>the outgoing flow</entry>
+ <entry>the outgoing transition</entry>
</row>
</tbody>
</tgroup>
@@ -174,7 +174,7 @@
</para>
<section id="statesequence">
<title><literal>state</literal> sequence</title>
- <para>Let's look at an example which shows states connected with flows
+ <para>Let's look at an example which shows states connected with transitions
as a sequence</para>
<figure id="state.sequence">
<title>A sequence of states</title>
@@ -183,15 +183,15 @@
<programlisting><process name="StateSequence" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="a" />
+ <transition to="a" />
</start>
<state name="a">
- <flow to="b" />
+ <transition to="b" />
</state>
<state name="b">
- <flow to="c" />
+ <transition to="c" />
</state>
<state name="c" />
@@ -218,12 +218,12 @@
<programlisting><process name="StateChoice" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="wait for response" />
+ <transition to="wait for response" />
</start>
<state name="wait for response">
- <flow name="accept" to="submit document" />
- <flow name="reject" to="try again" />
+ <transition name="accept" to="submit document" />
+ <transition name="reject" to="try again" />
</state>
<state name="submit document" />
@@ -235,15 +235,15 @@
<programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting>
<para>Now, the execution is arrived in the <literal>wait for response</literal>.
The execution will wait there until an external trigger is given. In case
- a <literal>state</literal> has multiple outgoing flows, the signalName given
- in the external trigger will be matched against the name of the outgoing flow
+ a <literal>state</literal> has multiple outgoing transitions, the signalName given
+ in the external trigger will be matched against the name of the outgoing transition
to take. So when we provide signalName <literal>accept</literal> like this:
</para>
<programlisting>executionService.signalExecutionById(executionId, "accept");</programlisting>
- <para>Then the execution will continue over the outgoing flow named
+ <para>Then the execution will continue over the outgoing transition named
<literal>accept</literal>. Analogue, when signalName <literal>reject</literal>
is given in the signalExecutionXxx methods, the execution will continue over
- the outgoing flow named reject.
+ the outgoing transition named reject.
</para>
</section>
</section>
@@ -319,7 +319,7 @@
<programlisting><process name="Java" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="invoke java method" />
+ <transition to="invoke java method" />
</start>
<java name="invoke java method"
@@ -332,7 +332,7 @@
<arg><string value="Hi, how are you?"/></arg>
- <flow to="wait" />
+ <transition to="wait" />
</java>
<state name="wait">
@@ -431,14 +431,14 @@
<programlisting><process name="ScriptExpression" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="invoke script" />
+ <transition to="invoke script" />
</start>
<script name="invoke script"
expr="Send packet to #{person.address}"
var="text">
- <flow to="wait" />
+ <transition to="wait" />
</script>
<state name="wait"/>
@@ -465,19 +465,19 @@
<section id="exclusive">
<title><literal>exclusive</literal></title>
<para>Takes one path of many alternatives. Also known as a decision. An exclusive
- activity has multiple outgoing flows and when an execution arrives in an exclusive
- activity, an automatic evaluation will decide which outgoing flow is taken.
+ activity has multiple outgoing transitions and when an execution arrives in an exclusive
+ activity, an automatic evaluation will decide which outgoing transition is taken.
</para>
<para>An exclusive activity should be configured in one of the three following ways:
</para>
<section id="exclusiveconditions">
<title>Exclusive conditions</title>
- <para>An exclusive with conditions on the flows evaluates the condition in each flow.
- The first flow for which the nested condition expression resolves to true or which does
+ <para>An exclusive with conditions on the transitions evaluates the condition in each transition.
+ The first transition for which the nested condition expression resolves to true or which does
not have a condition is taken.
</para>
- <table><title><literal>exclusive.flow.condition</literal> attributes:</title>
+ <table><title><literal>exclusive.transition.condition</literal> attributes:</title>
<tgroup cols="5" rowsep="1" colsep="1">
<thead>
<row>
@@ -519,17 +519,17 @@
<programlisting><process name="ExclusiveConditions" >
<start>
- <flow to="evaluate document" />
+ <transition to="evaluate document" />
</start>
<exclusive name="evaluate document">
- <flow to="submit document">
+ <transition to="submit document">
<emphasis role="bold"><condition expr="#{content=="good"}" /></emphasis>
- </flow>
- <flow to="try again">
+ </transition>
+ <transition to="try again">
<emphasis role="bold"><condition expr="#{content=="not so good"}" /></emphasis>
- </flow>
- <flow to="give up" />
+ </transition>
+ <transition to="give up" />
</exclusive>
<state name="submit document" />
@@ -544,7 +544,7 @@
<section id="exclusiveexpression">
<title>Exclusive expression</title>
<para>An exclusive expression evaluates to a String representing the name of
- an outgoing flow.
+ an outgoing transition.
</para>
<table><title><literal>exclusive</literal> attributes:</title>
<tgroup cols="5" rowsep="1" colsep="1">
@@ -585,11 +585,11 @@
</para>
<programlisting><process name="Poolcar">
<start>
- <flow to="How far?" />
+ <transition to="How far?" />
</start>
<exclusive name="How far?" <emphasis role="bold">expr="#{distance}"</emphasis>>
- <flow name="far" to="Big car" />
- <flow name="nearby" to="Small car" />
+ <transition name="far" to="Big car" />
+ <transition name="nearby" to="Small car" />
</exclusive>
<state name="Big car" />
<state name="Small car" />
@@ -606,7 +606,7 @@
<title>Exclusive handler</title>
<para>An exclusive handler is a java class that implements the
<literal>ExclusiveHandler</literal> interface. The exclusive handler
- will be responsible for selecting the name of the outgoing flow.
+ will be responsible for selecting the name of the outgoing transition.
</para>
<programlisting>public interface ExclusiveHandler {
String select(OpenExecution execution);
@@ -641,14 +641,14 @@
<programlisting><process name="ExclusiveHandler">
<start>
- <flow to="evaluate document" />
+ <transition to="evaluate document" />
</start>
<exclusive name="evaluate document">
<handler class="org.jbpm.examples.exclusive.handler.ContentEvaluation" />
- <flow name="good" to="submit document" />
- <flow name="bad" to="try again" />
- <flow name="ugly" to="give up" />
+ <transition name="good" to="submit document" />
+ <transition name="bad" to="try again" />
+ <transition name="ugly" to="give up" />
</exclusive>
<state name="submit document" />
@@ -699,7 +699,7 @@
<programlisting><process name="EndProcessInstance" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="end" />
+ <transition to="end" />
</start>
<end name="end" />
@@ -751,13 +751,13 @@
<programlisting><process name="EndMultiple" xmlns="http://;jbpm.org/4/jpdl">
<start>
- <flow to="get return code" />
+ <transition to="get return code" />
<start>
<state name="get return code">
- <flow name="200" to="ok"/>
- <flow name="400" to="bad request"/>
- <flow name="500" to="internal server error"/>
+ <transition name="200" to="ok"/>
+ <transition name="400" to="bad request"/>
+ <transition name="500" to="internal server error"/>
</state>
<end name="ok"/>
@@ -817,13 +817,13 @@
<programlisting><process name="EndState" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="get return code"/>
+ <transition to="get return code"/>
</start>
<state name="get return code">
- <flow name="200" to="ok"/>
- <flow name="400" to="bad request" />
- <flow name="500" to="internal server error"/>
+ <transition name="200" to="ok"/>
+ <transition name="400" to="bad request" />
+ <transition name="500" to="internal server error"/>
</state>
<end name="ok" state="completed"/>
@@ -883,9 +883,9 @@
</thead>
<tbody>
<row>
- <entry><literal>flow</literal></entry>
+ <entry><literal>transition</literal></entry>
<entry>0..*</entry>
- <entry>the outgoing flows</entry>
+ <entry>the outgoing transitions</entry>
</row>
</tbody>
</tgroup>
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-02-19 13:55:13 UTC (rev 3949)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-02-19 14:10:55 UTC (rev 3950)
@@ -12,17 +12,17 @@
<process name="Purchase order" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="Verify supplier" />
+ <transition to="Verify supplier" />
</start>
<state name="Verify supplier">
- <flow name="Supplier ok" to="Check supplier data" />
- <flow name="Supplier not ok" to="Error" />
+ <transition name="Supplier ok" to="Check supplier data" />
+ <transition name="Supplier not ok" to="Error" />
</state>
<exclusive name="Check supplier data">
- <flow name="nok" to="Error" />
- <flow name="ok" to="Completed" />
+ <transition name="nok" to="Error" />
+ <transition name="ok" to="Completed" />
</exclusive>
<end name="Completed" />
@@ -118,7 +118,7 @@
<title><literal>start</literal></title>
<para>Indicates where an execution for this process starts. Typically there is
exactly one start activity in a process. A process has to have at least one start
- activity. A start activity must have exactly one outgoing flow and that flow
+ activity. A start activity must have exactly one outgoing transition and that transition
is taken when a process execution starts.
</para>
<para>Known limitation: for now, a process can not have more then
@@ -142,7 +142,7 @@
<entry></entry>
<entry>optional</entry>
<entry>name of the activity. Since a start activity
- cannot have incoming flows, the name is optional.
+ cannot have incoming transitions, the name is optional.
</entry>
</row>
</tbody>
@@ -159,9 +159,9 @@
</thead>
<tbody>
<row>
- <entry><literal>flow</literal></entry>
+ <entry><literal>transition</literal></entry>
<entry>1</entry>
- <entry>the outgoing flow</entry>
+ <entry>the outgoing transition</entry>
</row>
</tbody>
</tgroup>
@@ -177,7 +177,7 @@
</para>
<section id="statesequence">
<title><literal>state</literal> sequence</title>
- <para>Let's look at an example which shows states connected with flows
+ <para>Let's look at an example which shows states connected with transitions
as a sequence</para>
<figure id="process.state.sequence">
<title>A sequence of states</title>
@@ -186,15 +186,15 @@
<programlisting><process name="StateSequence" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="a" />
+ <transition to="a" />
</start>
<state name="a">
- <flow to="b" />
+ <transition to="b" />
</state>
<state name="b">
- <flow to="c" />
+ <transition to="c" />
</state>
<state name="c" />
@@ -221,12 +221,12 @@
<programlisting><process name="StateChoice" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="wait for response" />
+ <transition to="wait for response" />
</start>
<state name="wait for response">
- <flow name="accept" to="submit document" />
- <flow name="reject" to="try again" />
+ <transition name="accept" to="submit document" />
+ <transition name="reject" to="try again" />
</state>
<state name="submit document" />
@@ -238,15 +238,15 @@
<programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting>
<para>Now, the execution is arrived in the <literal>wait for response</literal>.
The execution will wait there until an external trigger is given. In case
- a <literal>state</literal> has multiple outgoing flows, the signalName given
- in the external trigger will be matched against the name of the outgoing flow
+ a <literal>state</literal> has multiple outgoing transitions, the signalName given
+ in the external trigger will be matched against the name of the outgoing transition
to take. So when we provide signalName <literal>accept</literal> like this:
</para>
<programlisting>executionService.signalExecutionById(executionId, "accept");</programlisting>
- <para>Then the execution will continue over the outgoing flow named
+ <para>Then the execution will continue over the outgoing transition named
<literal>accept</literal>. Analogue, when signalName <literal>reject</literal>
is given in the signalExecutionXxx methods, the execution will continue over
- the outgoing flow named reject.
+ the outgoing transition named reject.
</para>
</section>
</section>
@@ -254,19 +254,19 @@
<section id="exclusive">
<title><literal>exclusive</literal></title>
<para>Takes one path of many alternatives. Also known as a decision. An exclusive
- activity has multiple outgoing flows and when an execution arrives in an exclusive
- activity, an automatic evaluation will decide which outgoing flow is taken.
+ activity has multiple outgoing transitions and when an execution arrives in an exclusive
+ activity, an automatic evaluation will decide which outgoing transition is taken.
</para>
<para>An exclusive activity should be configured in one of the three following ways:
</para>
<section id="exclusiveconditions">
<title>Exclusive conditions</title>
- <para>An exclusive with conditions on the flows evaluates the condition in each flow.
- The first flow for which the nested condition expression resolves to true or which does
+ <para>An exclusive with conditions on the transitions evaluates the condition in each transition.
+ The first transition for which the nested condition expression resolves to true or which does
not have a condition is taken.
</para>
- <table><title><literal>exclusive.flow.condition</literal> attributes:</title>
+ <table><title><literal>exclusive.transition.condition</literal> attributes:</title>
<tgroup cols="5" rowsep="1" colsep="1">
<thead>
<row>
@@ -308,17 +308,17 @@
<programlisting><process name="ExclusiveConditions" >
<start>
- <flow to="evaluate document" />
+ <transition to="evaluate document" />
</start>
<exclusive name="evaluate document">
- <flow to="submit document">
+ <transition to="submit document">
<emphasis role="bold"><condition expr="#{content=="good"}" /></emphasis>
- </flow>
- <flow to="try again">
+ </transition>
+ <transition to="try again">
<emphasis role="bold"><condition expr="#{content=="not so good"}" /></emphasis>
- </flow>
- <flow to="give up" />
+ </transition>
+ <transition to="give up" />
</exclusive>
<state name="submit document" />
@@ -333,7 +333,7 @@
<section id="exclusiveexpression">
<title>Exclusive expression</title>
<para>An exclusive expression evaluates to a String representing the name of
- an outgoing flow.
+ an outgoing transition.
</para>
<table><title><literal>exclusive</literal> attributes:</title>
<tgroup cols="5" rowsep="1" colsep="1">
@@ -376,11 +376,11 @@
</figure>
<programlisting><process name="Poolcar">
<start>
- <flow to="How far?" />
+ <transition to="How far?" />
</start>
<exclusive name="How far?" <emphasis role="bold">expr="#{distance}"</emphasis>>
- <flow name="far" to="Big car" />
- <flow name="nearby" to="Small car" />
+ <transition name="far" to="Big car" />
+ <transition name="nearby" to="Small car" />
</exclusive>
<state name="Big car" />
<state name="Small car" />
@@ -397,7 +397,7 @@
<title>Exclusive handler</title>
<para>An exclusive handler is a java class that implements the
<literal>ExclusiveHandler</literal> interface. The exclusive handler
- will be responsible for selecting the name of the outgoing flow.
+ will be responsible for selecting the name of the outgoing transition.
</para>
<programlisting>public interface ExclusiveHandler {
String select(OpenExecution execution);
@@ -434,14 +434,14 @@
<programlisting><process name="ExclusiveHandler">
<start>
- <flow to="evaluate document" />
+ <transition to="evaluate document" />
</start>
<exclusive name="evaluate document">
<handler class="org.jbpm.examples.exclusive.handler.ContentEvaluation" />
- <flow name="good" to="submit document" />
- <flow name="bad" to="try again" />
- <flow name="ugly" to="give up" />
+ <transition name="good" to="submit document" />
+ <transition name="bad" to="try again" />
+ <transition name="ugly" to="give up" />
</exclusive>
<state name="submit document" />
@@ -488,37 +488,37 @@
<programlisting><process name="ConcurrencyGraphBased" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="fork"/>
+ <transition to="fork"/>
</start>
<emphasis role="bold"><fork name="fork">
- <flow to="send invoice" />
- <flow to="load truck"/>
- <flow to="print shipping documents" />
+ <transition to="send invoice" />
+ <transition to="load truck"/>
+ <transition to="print shipping documents" />
</fork></emphasis>
<state name="send invoice" >
- <flow to="final join" />
+ <transition to="final join" />
</state>
<state name="load truck" >
- <flow to="shipping join" />
+ <transition to="shipping join" />
</state>
<state name="print shipping documents">
- <flow to="shipping join" />
+ <transition to="shipping join" />
</state>
<emphasis role="bold"><join name="shipping join" >
- <flow to="drive truck to destination" />
+ <transition to="drive truck to destination" />
</join></emphasis>
<state name="drive truck to destination" >
- <flow to="final join" />
+ <transition to="final join" />
</state>
<emphasis role="bold"><join name="final join" >
- <flow to="end"/>
+ <transition to="end"/>
</join></emphasis>
<end name="end" />
@@ -552,7 +552,7 @@
<programlisting><process name="EndProcessInstance" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="end" />
+ <transition to="end" />
</start>
<end name="end" />
@@ -604,13 +604,13 @@
<programlisting><process name="EndMultiple" xmlns="http://;jbpm.org/4/jpdl">
<start>
- <flow to="get return code" />
+ <transition to="get return code" />
<start>
<state name="get return code">
- <flow name="200" to="ok"/>
- <flow name="400" to="bad request"/>
- <flow name="500" to="internal server error"/>
+ <transition name="200" to="ok"/>
+ <transition name="400" to="bad request"/>
+ <transition name="500" to="internal server error"/>
</state>
<end name="ok"/>
@@ -670,13 +670,13 @@
<programlisting><process name="EndState" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="get return code"/>
+ <transition to="get return code"/>
</start>
<state name="get return code">
- <flow name="200" to="ok"/>
- <flow name="400" to="bad request" />
- <flow name="500" to="internal server error"/>
+ <transition name="200" to="ok"/>
+ <transition name="400" to="bad request" />
+ <transition name="500" to="internal server error"/>
</state>
<end name="ok" state="completed"/>
@@ -771,7 +771,7 @@
<programlisting><process name="Java" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="invoke java method" />
+ <transition to="invoke java method" />
</start>
<java name="invoke java method"
@@ -784,7 +784,7 @@
<arg><string value="Hi, how are you?"/></arg>
- <flow to="wait" />
+ <transition to="wait" />
</java>
<state name="wait">
@@ -856,13 +856,13 @@
<programlisting><process name="Task" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="review" />
+ <transition to="review" />
</start>
<emphasis role="bold"><task name="review"
assignee="johndoe"></emphasis>
- <flow to="wait" />
+ <transition to="wait" />
<emphasis role="bold"></task></emphasis>
<state name="wait" />
@@ -940,14 +940,14 @@
<programlisting><process name="ScriptExpression" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="invoke script" />
+ <transition to="invoke script" />
</start>
<emphasis role="bold"><script name="invoke script"
expr="Send packet to #{person.address}"
var="text"></emphasis>
- <flow to="wait" />
+ <transition to="wait" />
<emphasis role="bold"></script></emphasis>
<state name="wait"/>
@@ -1045,7 +1045,7 @@
<programlisting><process name="ScriptText" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="invoke script" />
+ <transition to="invoke script" />
</start>
<emphasis role="bold"><script name="invoke script"
@@ -1053,7 +1053,7 @@
<text>
Send packet to #{person.address}
</text></emphasis>
- <flow to="wait" />
+ <transition to="wait" />
<emphasis role="bold"></script></emphasis>
<state name="wait"/>
@@ -1127,7 +1127,7 @@
<programlisting><process name="Esb" xmlns="http://jbpm.org/4/jpdl">
<start >
- <flow to="invoke esb service" />
+ <transition to="invoke esb service" />
</start>
<emphasis role="bold"><esb name="invoke esb service"
@@ -1139,7 +1139,7 @@
<string value="deliver asap" />
</part></emphasis>
- <flow to="wait" />
+ <transition to="wait" />
<emphasis role="bold"></esb></emphasis>
<state name="wait" />
@@ -1222,7 +1222,7 @@
<programlisting><process name="Hql" xmlns="http://jbpm.org/4/jpdl">
<start>
- <flow to="get process names" />
+ <transition to="get process names" />
</start>
<emphasis role="bold"><hql name="get process names"
@@ -1235,7 +1235,7 @@
<parameters>
<string name="activityName" value="%o%" />
</parameters></emphasis>
- <flow to="count activities" />
+ <transition to="count activities" />
<emphasis role="bold"></hql>
<hql name="count activities"
@@ -1245,7 +1245,7 @@
select count(*)
from org.jbpm.pvm.internal.model.ActivityImpl
</query></emphasis>
- <flow to="wait" />
+ <transition to="wait" />
<emphasis role="bold"></hql></emphasis>
<state name="wait"/>
@@ -1299,9 +1299,9 @@
</thead>
<tbody>
<row>
- <entry><literal>flow</literal></entry>
+ <entry><literal>transition</literal></entry>
<entry>0..*</entry>
- <entry>the outgoing flows</entry>
+ <entry>the outgoing transitions</entry>
</row>
</tbody>
</tgroup>
More information about the jbpm-commits
mailing list