Author: sb
Date: Wed Aug  1 07:53:17 2007
New Revision: 5780

Log:
- Add ezcWorkflowNodeLoop class to conveniently express loops.
- Enforce single incoming node for branch nodes.

Added:
    trunk/Workflow/src/nodes/control_flow/loop.php
      - copied, changed from r5777, 
trunk/Workflow/src/nodes/control_flow/exclusive_choice.php
Modified:
    trunk/Workflow/ChangeLog
    trunk/Workflow/design/class_diagram.png
    trunk/Workflow/src/interfaces/node_branch.php
    trunk/Workflow/src/nodes/control_flow/exclusive_choice.php
    trunk/Workflow/src/nodes/control_flow/multi_choice.php
    trunk/Workflow/src/workflow_autoload.php
    trunk/Workflow/tests/case.php
    trunk/Workflow/tests/data/DecrementingLoop.dot
    trunk/Workflow/tests/data/DecrementingLoop_1.xml
    trunk/Workflow/tests/data/IncrementingLoop.dot
    trunk/Workflow/tests/data/IncrementingLoop_1.xml
    trunk/Workflow/tests/data/NestedLoops.dot
    trunk/Workflow/tests/data/NestedLoops_1.xml
    trunk/WorkflowEventLogTiein/tests/data/DecrementingLoop.log
    trunk/WorkflowEventLogTiein/tests/data/IncrementingLoop.log
    trunk/WorkflowEventLogTiein/tests/data/NestedLoops.log

Modified: trunk/Workflow/ChangeLog
==============================================================================
--- trunk/Workflow/ChangeLog [iso-8859-1] (original)
+++ trunk/Workflow/ChangeLog [iso-8859-1] Wed Aug  1 07:53:17 2007
@@ -1,3 +1,5 @@
+- Added ezcWorkflowNodeLoop class to conveniently express loops.
+
 1.0.1 - Monday 30 July 2007
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

Modified: trunk/Workflow/design/class_diagram.png
==============================================================================
Binary files - no diff available.

Modified: trunk/Workflow/src/interfaces/node_branch.php
==============================================================================
--- trunk/Workflow/src/interfaces/node_branch.php [iso-8859-1] (original)
+++ trunk/Workflow/src/interfaces/node_branch.php [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -16,14 +16,6 @@
  */
 abstract class ezcWorkflowNodeBranch extends ezcWorkflowNode
 {
-    /**
-     * Constraint: The maximum number of incoming nodes this node has to have
-     * to be valid.
-     *
-     * @var integer
-     */
-    protected $maxInNodes = false;
-
     /**
      * Constraint: The minimum number of outgoing nodes this node has to have
      * to be valid.

Modified: trunk/Workflow/src/nodes/control_flow/exclusive_choice.php
==============================================================================
--- trunk/Workflow/src/nodes/control_flow/exclusive_choice.php [iso-8859-1] 
(original)
+++ trunk/Workflow/src/nodes/control_flow/exclusive_choice.php [iso-8859-1] Wed 
Aug  1 07:53:17 2007
@@ -15,7 +15,7 @@
  * for the workflow of which exactly one is chosen based on the conditions
  * set for the out nodes.
  *
- * Incoming nodes: 1..*
+ * Incoming nodes: 1
  * Outgoing nodes: 2..*
  *
  * This example displays how you can use an exclusive choice to select one of 
two

Copied: trunk/Workflow/src/nodes/control_flow/loop.php (from r5777, 
trunk/Workflow/src/nodes/control_flow/exclusive_choice.php)
==============================================================================
--- trunk/Workflow/src/nodes/control_flow/exclusive_choice.php [iso-8859-1] 
(original)
+++ trunk/Workflow/src/nodes/control_flow/loop.php [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the ezcWorkflowNodeExclusiveChoice class.
+ * File containing the ezcWorkflowNodeLoop class.
  *
  * @package Workflow
  * @version //autogen//
@@ -9,75 +9,46 @@
  */
 
 /**
- * This node implements the Exclusive Choice workflow pattern.
+ * 
  *
- * The Exclusive Choice workflow pattern defines multiple possible paths
- * for the workflow of which exactly one is chosen based on the conditions
- * set for the out nodes.
- *
- * Incoming nodes: 1..*
- * Outgoing nodes: 2..*
- *
- * This example displays how you can use an exclusive choice to select one of 
two
- * possible branches depending on the workflow variable 'value' which is read 
using
- * an input node.
- * <code>
- * $workflow = new ezcWorkflow( 'Test' );
- *
- * // wait for input into the workflow variable value.
- * $input = new ezcWorkflowNodeInput( array( 'value' => new 
ezcWorkflowConditionIsInt ) );
- * $workflow->startNode->addOutNode( $input );
- *
- * // create the exclusive choice branching node
- * $choice = new ezcWorkflowNodeExclusiveChoice;
- * $intput->addOutNode( $choice );
- *
- * $branch1 = ....; // create nodes for the first branch of execution here..
- * $branch2 = ....; // create nodes for the second branch of execution here..
- *
- * // add the outnodes and set the conditions on the exclusive choice
- * $choice->addConditionalOutNode( new ezcWorkflowConditionVariable( 'value',
- *                                                                  new 
ezcWorkflowConditionGreaterThan( 10 ) ),
- *                                $branch1 );
- * $choice->addConditionalOutNode( new ezcWorkflowConditionVariable( 'value',
- *                                                                  new 
ezcWorkflowConditionLessThan( 11 ) ),
- *                                $branch2 );
- *
- * // Merge the two branches together and continue execution.
- * $merge = new ezcWorkflowNodeSimpleMerge();
- * $merge->addInNode( $branch1 );
- * $merge->addInNode( $branch2 );
- * $merge->addOutNode( $workflow->endNode );
- * </code>
+ * Incoming nodes: 2
+ * Outgoing nodes: 2
  *
  * @package Workflow
  * @version //autogen//
  */
-class ezcWorkflowNodeExclusiveChoice extends ezcWorkflowNodeConditionalBranch
+class ezcWorkflowNodeLoop extends ezcWorkflowNodeConditionalBranch
 {
     /**
-     * Constraint: The minimum number of conditional outgoing nodes this node
-     * has to have. Set to false to disable this constraint.
+     * Constraint: The minimum number of incoming nodes this node has to have
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $minConditionalOutNodes = 2;
+    protected $minInNodes = 2;
 
     /**
-     * Constraint: The minimum number of conditional outgoing nodes this node
-     * has to activate. Set to false to disable this constraint.
+     * Constraint: The maximum number of incoming nodes this node has to have
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $minActivatedConditionalOutNodes = 1;
+    protected $maxInNodes = 2;
 
     /**
-     * Constraint: The maximum number of conditional outgoing nodes this node
-     * may activate. Set to false to disable this constraint.
+     * Constraint: The minimum number of outgoing nodes this node has to have
+     * to be valid. Set to false to disable this constraint.
      *
      * @var integer
      */
-    protected $maxActivatedConditionalOutNodes = 1;
+    protected $minOutNodes = 2;
 
+    /**
+     * Constraint: The maximum number of outgoing nodes this node has to have
+     * to be valid. Set to false to disable this constraint.
+     *
+     * @var integer
+     */
+    protected $maxOutNodes = 2;
 }
 ?>

Modified: trunk/Workflow/src/nodes/control_flow/multi_choice.php
==============================================================================
--- trunk/Workflow/src/nodes/control_flow/multi_choice.php [iso-8859-1] 
(original)
+++ trunk/Workflow/src/nodes/control_flow/multi_choice.php [iso-8859-1] Wed Aug 
 1 07:53:17 2007
@@ -15,7 +15,7 @@
  * which one or more are chosen. It is a generalization of the Parallel Split 
and
  * Exclusive Choice workflow patterns.
  *
- * Incoming nodes: 1..*
+ * Incoming nodes: 1
  * Outgoing nodes: 2..*
  *
  * This example displays how you can use ezcWorkflowNodeMultiChoice to 
activate one or more

Modified: trunk/Workflow/src/workflow_autoload.php
==============================================================================
--- trunk/Workflow/src/workflow_autoload.php [iso-8859-1] (original)
+++ trunk/Workflow/src/workflow_autoload.php [iso-8859-1] Wed Aug  1 07:53:17 
2007
@@ -58,6 +58,7 @@
     'ezcWorkflowNodeEnd'                       => 'Workflow/nodes/end.php',
     'ezcWorkflowNodeExclusiveChoice'           => 
'Workflow/nodes/control_flow/exclusive_choice.php',
     'ezcWorkflowNodeInput'                     => 
'Workflow/nodes/variables/input.php',
+    'ezcWorkflowNodeLoop'                      => 
'Workflow/nodes/control_flow/loop.php',
     'ezcWorkflowNodeMultiChoice'               => 
'Workflow/nodes/control_flow/multi_choice.php',
     'ezcWorkflowNodeParallelSplit'             => 
'Workflow/nodes/control_flow/parallel_split.php',
     'ezcWorkflowNodeSimpleMerge'               => 
'Workflow/nodes/control_flow/simple_merge.php',

Modified: trunk/Workflow/tests/case.php
==============================================================================
--- trunk/Workflow/tests/case.php [iso-8859-1] (original)
+++ trunk/Workflow/tests/case.php [iso-8859-1] Wed Aug  1 07:53:17 2007
@@ -136,7 +136,7 @@
 
         $this->startNode->addOutNode( $set );
 
-        $branch = new ezcWorkflowNodeExclusiveChoice;
+        $branch = new ezcWorkflowNodeLoop;
         $branch->addInNode( $set );
         $branch->addInNode( $step );
 
@@ -518,7 +518,7 @@
         $innerBreak    = new ezcWorkflowConditionVariable( 'j', new 
ezcWorkflowConditionIsEqual( 10 ) );
         $innerContinue = new ezcWorkflowConditionVariable( 'j', new 
ezcWorkflowConditionIsLessThan( 10 ) );
 
-        $innerBranch = new ezcWorkflowNodeExclusiveChoice;
+        $innerBranch = new ezcWorkflowNodeLoop;
         $innerBranch->addInNode( $innerSet )
                     ->addInNode( $innerStep );
 
@@ -529,7 +529,7 @@
 
         $this->startNode->addOutNode( $outerSet );
 
-        $outerBranch = new ezcWorkflowNodeExclusiveChoice;
+        $outerBranch = new ezcWorkflowNodeLoop;
         $outerBranch->addInNode( $outerSet )
                     ->addInNode( $outerStep );
 

Modified: trunk/Workflow/tests/data/DecrementingLoop.dot
==============================================================================
--- trunk/Workflow/tests/data/DecrementingLoop.dot [iso-8859-1] (original)
+++ trunk/Workflow/tests/data/DecrementingLoop.dot [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -1,7 +1,7 @@
 digraph DecrementingLoop {
 node1 [label="Start"]
 node2 [label="i = 10"]
-node3 [label="Exclusive Choice"]
+node3 [label="Loop"]
 node4 [label="i--"]
 node5 [label="End"]
 

Modified: trunk/Workflow/tests/data/DecrementingLoop_1.xml
==============================================================================
--- trunk/Workflow/tests/data/DecrementingLoop_1.xml [iso-8859-1] (original)
+++ trunk/Workflow/tests/data/DecrementingLoop_1.xml [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -9,15 +9,9 @@
     </variable>
     <outNode id="3"/>
   </node>
-  <node id="3" type="ExclusiveChoice">
-    <condition type="Variable" name="i">
-      <condition type="IsGreaterThan" value="1"/>
-      <outNode id="4"/>
-    </condition>
-    <condition type="Variable" name="i">
-      <condition type="IsEqual" value="1"/>
-      <outNode id="5"/>
-    </condition>
+  <node id="3" type="Loop">
+    <outNode id="4"/>
+    <outNode id="5"/>
   </node>
   <node id="4" type="VariableDecrement" variable="i">
     <outNode id="3"/>

Modified: trunk/Workflow/tests/data/IncrementingLoop.dot
==============================================================================
--- trunk/Workflow/tests/data/IncrementingLoop.dot [iso-8859-1] (original)
+++ trunk/Workflow/tests/data/IncrementingLoop.dot [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -1,7 +1,7 @@
 digraph IncrementingLoop {
 node1 [label="Start"]
 node2 [label="i = 1"]
-node3 [label="Exclusive Choice"]
+node3 [label="Loop"]
 node4 [label="i++"]
 node5 [label="End"]
 

Modified: trunk/Workflow/tests/data/IncrementingLoop_1.xml
==============================================================================
--- trunk/Workflow/tests/data/IncrementingLoop_1.xml [iso-8859-1] (original)
+++ trunk/Workflow/tests/data/IncrementingLoop_1.xml [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -9,15 +9,9 @@
     </variable>
     <outNode id="3"/>
   </node>
-  <node id="3" type="ExclusiveChoice">
-    <condition type="Variable" name="i">
-      <condition type="IsLessThan" value="10"/>
-      <outNode id="4"/>
-    </condition>
-    <condition type="Variable" name="i">
-      <condition type="IsEqual" value="10"/>
-      <outNode id="5"/>
-    </condition>
+  <node id="3" type="Loop">
+    <outNode id="4"/>
+    <outNode id="5"/>
   </node>
   <node id="4" type="VariableIncrement" variable="i">
     <outNode id="3"/>

Modified: trunk/Workflow/tests/data/NestedLoops.dot
==============================================================================
--- trunk/Workflow/tests/data/NestedLoops.dot [iso-8859-1] (original)
+++ trunk/Workflow/tests/data/NestedLoops.dot [iso-8859-1] Wed Aug  1 07:53:17 
2007
@@ -1,9 +1,9 @@
 digraph NestedLoops {
 node1 [label="Start"]
 node2 [label="i = 1"]
-node3 [label="Exclusive Choice"]
+node3 [label="Loop"]
 node4 [label="j = 1"]
-node5 [label="Exclusive Choice"]
+node5 [label="Loop"]
 node6 [label="j++"]
 node7 [label="i++"]
 node8 [label="End"]

Modified: trunk/Workflow/tests/data/NestedLoops_1.xml
==============================================================================
--- trunk/Workflow/tests/data/NestedLoops_1.xml [iso-8859-1] (original)
+++ trunk/Workflow/tests/data/NestedLoops_1.xml [iso-8859-1] Wed Aug  1 
07:53:17 2007
@@ -9,15 +9,9 @@
     </variable>
     <outNode id="3"/>
   </node>
-  <node id="3" type="ExclusiveChoice">
-    <condition type="Variable" name="i">
-      <condition type="IsLessThan" value="10"/>
-      <outNode id="4"/>
-    </condition>
-    <condition type="Variable" name="i">
-      <condition type="IsEqual" value="10"/>
-      <outNode id="8"/>
-    </condition>
+  <node id="3" type="Loop">
+    <outNode id="4"/>
+    <outNode id="8"/>
   </node>
   <node id="4" type="VariableSet">
     <variable name="j">
@@ -25,15 +19,9 @@
     </variable>
     <outNode id="5"/>
   </node>
-  <node id="5" type="ExclusiveChoice">
-    <condition type="Variable" name="j">
-      <condition type="IsLessThan" value="10"/>
-      <outNode id="6"/>
-    </condition>
-    <condition type="Variable" name="j">
-      <condition type="IsEqual" value="10"/>
-      <outNode id="7"/>
-    </condition>
+  <node id="5" type="Loop">
+    <outNode id="6"/>
+    <outNode id="7"/>
   </node>
   <node id="6" type="VariableIncrement" variable="j">
     <outNode id="5"/>

Modified: trunk/WorkflowEventLogTiein/tests/data/DecrementingLoop.log
==============================================================================
--- trunk/WorkflowEventLogTiein/tests/data/DecrementingLoop.log [iso-8859-1] 
(original)
+++ trunk/WorkflowEventLogTiein/tests/data/DecrementingLoop.log [iso-8859-1] 
Wed Aug  1 07:53:17 2007
@@ -4,65 +4,65 @@
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#2(ezcWorkflowNodeVariableSet) for instance #1 of workflow "DecrementingLoop" 
(version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#1(ezcWorkflowNodeStart) for instance #1 of workflow "DecrementingLoop" 
(version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "10" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#2(ezcWorkflowNodeVariableSet) for instance #1 of workflow "DecrementingLoop" 
(version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #1 (1 sibling(s)) 
for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "9" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #2 (parent: 1, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "8" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #3 (parent: 2, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "7" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #4 (parent: 3, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "6" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #5 (parent: 4, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "5" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #6 (parent: 5, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "4" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #7 (parent: 6, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "3" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #8 (parent: 7, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "2" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #9 (parent: 8, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "1" for 
execution #1 of workflow "DecrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableDecrement) for instance #1 of workflow 
"DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #10 (parent: 9, 1 
sibling(s)) for execution #1 of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#5(ezcWorkflowNodeEnd) for instance #1 of workflow "DecrementingLoop" (version 
1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"DecrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#5(ezcWorkflowNodeEnd) for instance #1 of workflow "DecrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Ended thread #10 for execution #1 
of workflow "DecrementingLoop" (version 1).
 MMM DD HH:MM:SS [Info] [default] [default] Ended execution #1 of workflow 
"DecrementingLoop" (version 1).

Modified: trunk/WorkflowEventLogTiein/tests/data/IncrementingLoop.log
==============================================================================
--- trunk/WorkflowEventLogTiein/tests/data/IncrementingLoop.log [iso-8859-1] 
(original)
+++ trunk/WorkflowEventLogTiein/tests/data/IncrementingLoop.log [iso-8859-1] 
Wed Aug  1 07:53:17 2007
@@ -4,65 +4,65 @@
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#2(ezcWorkflowNodeVariableSet) for instance #1 of workflow "IncrementingLoop" 
(version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#1(ezcWorkflowNodeStart) for instance #1 of workflow "IncrementingLoop" 
(version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "1" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#2(ezcWorkflowNodeVariableSet) for instance #1 of workflow "IncrementingLoop" 
(version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #1 (1 sibling(s)) 
for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "2" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #2 (parent: 1, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "3" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #3 (parent: 2, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "4" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #4 (parent: 3, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "5" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #5 (parent: 4, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "6" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #6 (parent: 5, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "7" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #7 (parent: 6, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "8" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #8 (parent: 7, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "9" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #9 (parent: 8, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Set variable "i" to "10" for 
execution #1 of workflow "IncrementingLoop" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#4(ezcWorkflowNodeVariableIncrement) for instance #1 of workflow 
"IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Started thread #10 (parent: 9, 1 
sibling(s)) for execution #1 of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Debug] [default] [default] Activated node 
#5(ezcWorkflowNodeEnd) for instance #1 of workflow "IncrementingLoop" (version 
1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeExclusiveChoice) for instance #1 of workflow 
"IncrementingLoop" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#3(ezcWorkflowNodeLoop) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Executed node 
#5(ezcWorkflowNodeEnd) for instance #1 of workflow "IncrementingLoop" (version 
1).
 MMM DD HH:MM:SS [Debug] [default] [default] Ended thread #10 for execution #1 
of workflow "IncrementingLoop" (version 1).
 MMM DD HH:MM:SS [Info] [default] [default] Ended execution #1 of workflow 
"IncrementingLoop" (version 1).


-- 
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components

Reply via email to