cpee 1.3.126 → 1.3.127

data/cockpit/js/wfadaptor.cpee.js

@@ -200,8 +200,8 @@ function CPEE(adaptor) {
   } // }}}
   this.events.dragstart = function (svgid, e) { //{{{
   } //}}}
-  
-  // Primitive Elements
+
+  // Abstract Elements (they only have an illustrator)
   this.elements.callinjection = { /*{{{*/
     'illustrator': {//{{{
       'type' : 'abstract', 
@@ -214,29 +214,6 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
-  'description' : {//{{{
-    'create':  function(target) {
-      var node = null;
-      node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
-      return node;
-    },
-    'permissible_children': function(node) {
-      if(node.children('manipulate').lenght < 1)
-        return [
-         {'label': 'Script Block', 
-          'function_call': adaptor.description.insert_last_into, 
-          'menu_icon': elements.callmanipulate.illustrator.svg, 
-          'params': [adaptor.description.elements.manipulate.create, node]}
-        ];
-      return [];
-    }
-  },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,true, true);
-    },
-    'click': events.click,
-   }//}}}
   }; /*}}}*/
   this.elements.callcorrelation = { /*{{{*/
     'illustrator': {//{{{
@@ -250,29 +227,6 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
-  'description' : {//{{{
-    'create':  function(target) {
-      var node = null;
-      node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="correlation" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
-      return node;
-    },
-    'permissible_children': function(node) {
-      if(node.children('manipulate').lenght < 1)
-        return [
-         {'label': 'Script Block', 
-          'function_call': adaptor.description.insert_last_into, 
-          'menu_icon': elements.callmanipulate.illustrator.svg, 
-          'params': [adaptor.description.elements.manipulate.create, node]}
-        ];
-      return [];
-    }
-  },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,true, true);
-    },
-    'click': events.click,
-   }//}}}
   }; /*}}}*/
   this.elements.callinstantiation = { /*{{{*/
     'illustrator': {//{{{
@@ -286,29 +240,6 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
-  'description' : {//{{{
-    'create':  function(target) {
-      var node = null;
-      node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="instantiate" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
-      return node;
-    },
-    'permissible_children': function(node) {
-      if(node.children('manipulate').lenght < 1)
-        return [
-         {'label': 'Script Block', 
-          'function_call': adaptor.description.insert_last_into, 
-          'menu_icon': elements.callmanipulate.illustrator.svg, 
-          'params': [adaptor.description.elements.manipulate.create, node]}
-        ];
-      return [];
-    }
-  },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,true, true);
-    },
-    'click': events.click,
-   }//}}}
   }; /*}}}*/
   this.elements.callmanipulate = { /*{{{*/
     'illustrator': {//{{{
@@ -322,30 +253,32 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
-  'description' : {//{{{
-    'create':  function(target) {
-      var node = null;
-      node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
-      return node;
-    },
-    'permissible_children': function(node) {
-      if(node.children('manipulate').lenght < 1)
-        return [
-         {'label': 'Script Block', 
-          'function_call': adaptor.description.insert_last_into, 
-          'menu_icon': elements.callmanipulate.illustrator.svg, 
-          'params': [adaptor.description.elements.manipulate.create, node]}
-        ];
-      return [];
-    }
-  },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,true, true);
-    },
-    'click': events.click,
-   }//}}}
   }; /*}}}*/
+  this.elements.choose_inclusive = { /*{{{*/
+    'illustrator': {//{{{
+      'type' : 'abstract',
+      'svg': function() {
+        return $X('<svg class="clickable" xmlns="http://www.w3.org/2000/svg">' + 
+                    '<rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>' +
+                    '<circle cx="15.5" cy="15.5" r="7" class="stand"/>' + 
+                  '</svg>');
+      }
+    },//}}}
+  };  /*}}}*/
+  this.elements.choose_exclusive = { /*{{{*/
+    'illustrator': {//{{{
+      'type' : 'abstract',
+      'svg': function() {
+        return $X('<svg class="clickable" xmlns="http://www.w3.org/2000/svg">' + 
+                    '<rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>' +
+                    '<line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>' +
+                    '<line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>' +
+                  '</svg>');
+      }
+    },//}}}
+  };  /*}}}*/
+
+  // Primitive Elements
   this.elements.call = { /*{{{*/
     'illustrator': {//{{{
       'type' : 'primitive', 
@@ -450,154 +383,8 @@ function CPEE(adaptor) {
     'click': events.click,
    }//}}}
   }; /*}}}*/
-  this.elements.constraints = { /*{{{*/
-    'illustrator': {//{{{
-      'type' : 'primitive',
-      'endnodes' : 'this',
-      'svg': function() {
-        return false;
-      }
-    },//}}}
-    'description' : {//{{{
-      'create':  function(target) {
-        var node = $X('<manipulate id="' + adaptor.description.get_free_id() + '" xmlns="http://cpee.org/ns/description/1.0"/>');
-        return node;
-      },
-      'permissible_children': function(node) {
-        return [];
-      }
-    },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,false, true);
-    },
-    'click': events.click,
-   }//}}}
-  }; /*}}}*/
   
   // Complex Elements
-  this.elements.choose_inclusive = { /*{{{*/
-    'illustrator': {//{{{
-      'type' : 'abstract',
-      'endnodes' : 'aggregate',
-      'closeblock': false,
-      'expansion' : function(node) { 
-        return 'horizontal';
-      }, 
-      'col_shift' : function(node) { 
-        return false; 
-      },
-      'svg': function() {
-        return $X('<svg class="clickable" xmlns="http://www.w3.org/2000/svg">' + 
-                    '<rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>' +
-                    '<circle cx="15.5" cy="15.5" r="7" class="stand"/>' + 
-                  '</svg>');
-      }
-    },//}}}
-    'description' : {//{{{
-      'create':  function(target) {
-        var node = $X('<choose mode="exclusive" xmlns="http://cpee.org/ns/description/1.0"><otherwise/></choose>');
-        return node;
-      },
-      'permissible_children': function(node) {
-        var func = null;
-        if(node.get(0).tagName == 'choose') { func = adaptor.description.insert_first_into }
-        else { func = adaptor.description.insert_after }
-        if(node.children('parallel_branch').length > 0) {
-          return [{'label': 'Parallel Branch', 
-           'function_call': func, 
-           'menu_icon': elements.parallel_branch.illustrator.svg, 
-           'params': [adaptor.description.elements.parallel_branch.create, node]}];
-        }
-        var childs = [{'label': 'Alternative', 
-         'function_call': func, 
-         'menu_icon': elements.alternative.illustrator.svg, 
-         'params': [adaptor.description.elements.alternative.create, node]}];
-        if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length) 
-          childs.push({'label': 'Otherwise', 
-           'function_call': func, 
-           'menu_icon': elements.otherwise.illustrator.svg, 
-           'params': [adaptor.description.elements.otherwise.create, node]});
-        if(node.parents('parallel').length > node.parents('parallel_branch').length) 
-          childs.push({'label': 'Parallel Branch', 
-           'function_call': func, 
-           'menu_icon': elements.parallel_branch.illustrator.svg, 
-           'params': [adaptor.description.elements.parallel_branch.create, node]});
-        return childs; 
-      }
-    },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,true, true);
-    },
-    'click': events.click,
-    'dblclick': events.dblclick,
-    'mouseover': events.mouseover,
-    'mouseout': events.mouseout,
-   }//}}}
-  };  /*}}}*/
-  this.elements.choose_exclusive = { /*{{{*/
-    'illustrator': {//{{{
-      'type' : 'abstract',
-      'endnodes' : 'aggregate',
-      'closeblock': false,
-      'expansion' : function(node) { 
-        return 'horizontal';
-      }, 
-      'col_shift' : function(node) { 
-        return false; 
-      },
-      'svg': function() {
-        return $X('<svg class="clickable" xmlns="http://www.w3.org/2000/svg">' + 
-                    '<rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>' +
-                    '<line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>' +
-                    '<line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>' +
-                  '</svg>');
-      }
-    },//}}}
-    'description' : {//{{{
-      'create':  function(target) {
-        var node = $X('<choose mode="exclusive" xmlns="http://cpee.org/ns/description/1.0"><otherwise/></choose>');
-        return node;
-      },
-      'permissible_children': function(node) {
-        var func = null;
-        if(node.get(0).tagName == 'choose') { func = adaptor.description.insert_first_into }
-        else { func = adaptor.description.insert_after }
-        if(node.children('parallel_branch').length > 0) {
-          return [{'label': 'Parallel Branch', 
-           'function_call': func, 
-           'menu_icon': elements.parallel_branch.illustrator.svg, 
-           'params': [adaptor.description.elements.parallel_branch.create, node]}];
-        }
-        var childs = [{'label': 'Alternative', 
-         'function_call': func, 
-         'menu_icon': elements.alternative.illustrator.svg, 
-         'params': [adaptor.description.elements.alternative.create, node]}];
-        if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length) 
-          childs.push({'label': 'Otherwise', 
-           'function_call': func, 
-           'menu_icon': elements.otherwise.illustrator.svg, 
-           'params': [adaptor.description.elements.otherwise.create, node]});
-        if(node.parents('parallel').length > node.parents('parallel_branch').length) 
-          childs.push({'label': 'Parallel Branch', 
-           'function_call': func, 
-           'menu_icon': elements.parallel_branch.illustrator.svg, 
-           'params': [adaptor.description.elements.parallel_branch.create, node]});
-        return childs; 
-      }
-    },//}}}
-  'adaptor' : {//{{{
-    'mousedown': function (node, e) {
-      events.mousedown(node,e,true, true);
-    },
-    'click': events.click,
-    'dblclick': events.dblclick,
-    'mouseover': events.mouseover,
-    'mouseout': events.mouseout,
-   }//}}}
-  };  /*}}}*/
-
   this.elements.choose = { /*{{{*/
     'illustrator': {//{{{
       'type' : 'complex',
@@ -1132,7 +919,7 @@ function CPEE(adaptor) {
     },//}}}
     'description' : {//{{{
       'create':  function(target) {
-        var node = $X('<critical sid="section" xmlns="http://cpee.org/ns/description/1.0"/>');
+        var node = $X('<group xmlns="http://cpee.org/ns/description/1.0"/>');
         return node;
       },
       'permissible_children': function(node) {

data/cockpit/lib/wfadaptor.js

@@ -106,7 +106,7 @@ function WfIllustrator(wf_adaptor) { // View  {{{
   } // }}}
   // }}}
   // Helper Functions {{{
-  var draw_symbol = this.draw.draw_symbol = function (sym_name, id, title, row, col, group) { // {{{
+  var draw_symbol = this.draw.draw_symbol = function (tname, sym_name, id, title, row, col, group) { // {{{
     if(elements[sym_name] == undefined || elements[sym_name].svg == undefined) sym_name = 'unknown';
     var g = $X('<g class="element" element-id="' + id  + '" transform="translate(' + String((col*width)-((width*0.39))) + ',' + String(row*height-((height*0.74))) + ')" xmlns="http://www.w3.org/2000/svg">' + 
                   '<text class="super" transform="translate(30,8.4)">' +
@@ -121,8 +121,8 @@ function WfIllustrator(wf_adaptor) { // View  {{{
     g.append(sym);
 
     // Binding events for symbol
-    for(event_name in adaptor.elements[sym_name]) {
-      sym.bind(event_name, {'function_call':adaptor.elements[sym_name][event_name]}, function(e) { e.data.function_call($(this).parents(':first').attr('element-id'),e)});
+    for(event_name in adaptor.elements[tname]) {
+      sym.bind(event_name, {'function_call':adaptor.elements[tname][event_name]}, function(e) { e.data.function_call($(this).parents(':first').attr('element-id'),e)});
       if(event_name == 'mousedown') sym.bind('contextmenu', false);
     }
     if(group) {group.append(g);}
@@ -319,7 +319,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       max.row++;
       $(root).attr('svg-id','description');
       group.attr('element-id','group-description');
-      illustrator.draw.draw_symbol('start', 'description', 'START', pos.row, pos.col, group);
+      illustrator.draw.draw_symbol('start', 'start', 'description', 'START', pos.row, pos.col, group);
     } // }}}
 
     $(root).children().each(function() { 
@@ -364,9 +364,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       if(!illustrator.elements[tname])                                         {sym_name = 'unknown';}
       else if(typeof illustrator.elements[tname].resolve_symbol == 'function') {sym_name = illustrator.elements[tname].resolve_symbol(this);}
       else if(typeof illustrator.elements[tname].resolve_symbol == 'string')   {sym_name = illustrator.elements[tname].resolve_symbol;}
-      else                                                                            {sym_name = tname;}
+      else                                                                     {sym_name = tname;}
       if((illustrator.elements[tname] && illustrator.elements[tname].svg()) || sym_name == 'unknown') { 
-        illustrator.draw.draw_symbol(sym_name, $(this).attr('svg-id'), $(this).attr('svg-label'), pos.row, pos.col, block.svg).addClass(illustrator.elements[tname] ? illustrator.elements[tname].type : 'primitive unknown');
+        illustrator.draw.draw_symbol(tname, sym_name, $(this).attr('svg-id'), $(this).attr('svg-label'), pos.row, pos.col, block.svg).addClass(illustrator.elements[tname] ? illustrator.elements[tname].type : 'primitive unknown');
       } else { console.log("no icon "+ tname);}
       if(illustrator.elements[tname] && illustrator.elements[tname].border) illustrator.draw.draw_border($(this).attr('svg-id'), pos, block.max, block.svg);
       if(illustrator.elements[tname] && illustrator.elements[tname].type == 'complex') illustrator.draw.draw_tile($(this).attr('svg-id'), pos, block.max, block.svg);

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.126"
+  s.version          = "1.3.127"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/server/instances/2/notifications/8f85ce7897598af370c5b350a811756b/consumer-secret

@@ -0,0 +1 @@
+a6020d5dd289ae782c866f128f70f25d

data/server/instances/2/notifications/8f85ce7897598af370c5b350a811756b/producer-secret

@@ -0,0 +1 @@
+afa11f78ee8fba13df2b78935c9cf014

data/server/instances/2/properties.xml

@@ -7,63 +7,121 @@
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>choose :exclusive do
-  alternative "data.a &lt; 3" do
-    call :a42, :timeout, { :label =&gt; "B", :method =&gt; "post", :type =&gt; "serviceTask", :mid =&gt; "sid-C4915A51-F57C-44E7-8BA7-AC5247998430", :parameters =&gt; { :timeout =&gt; 1 } }, &lt;&lt;-end 
-data.a = 'path 1'
+  <dsl>call :a58, :timeout, { :label =&gt; "A", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819", :parameters =&gt; { :timeout =&gt; 1 } }, &lt;&lt;-end 
+data.a += 1
+end
+call :a61, :timeout, { :label =&gt; "B", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E", :parameters =&gt; { :timeout =&gt; 1 } }
+loop pre_test{true} do
+  choose :exclusive do
+    alternative "data.a &gt;= 3 &amp;&amp; data.a &lt; 6" do
+      call :a62, :timeout, { :label =&gt; "D", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-0937F905-A975-4DB2-A8C9-CD523611AEF5", :parameters =&gt; { :timeout =&gt; 1 } }
+      call :a58, :timeout, { :label =&gt; "A", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819", :parameters =&gt; { :timeout =&gt; 1 } }, &lt;&lt;-end 
+data.a += 1
+      end
+      call :a61, :timeout, { :label =&gt; "B", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E", :parameters =&gt; { :timeout =&gt; 1 } }
     end
-  end
-  otherwise do
-    call :a44, :timeout, { :label =&gt; "C", :method =&gt; "post", :type =&gt; "serviceTask", :mid =&gt; "sid-4F7DC368-C233-43DF-862A-28FC41919D18", :parameters =&gt; { :timeout =&gt; 1 } }, &lt;&lt;-end 
-data.a = 'path 2'
+    alternative "data.a &lt; 3" do
+      call :a60, :timeout, { :label =&gt; "C", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-7E70A0D7-660E-4C1B-B377-64387F99BD87", :parameters =&gt; { :timeout =&gt; 1 } }
+      call :a61, :timeout, { :label =&gt; "B", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E", :parameters =&gt; { :timeout =&gt; 1 } }
+    end
+    otherwise do
+      break
     end
   end
 end
-call :a46, :timeout, { :label =&gt; "A", :method =&gt; "post", :type =&gt; "serviceTask", :mid =&gt; "sid-DCA5CEE9-2935-4876-AF02-8322B5DB31EE", :parameters =&gt; { :timeout =&gt; 1 } }
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <choose mode="exclusive">
-        <alternative condition="data.a &lt; 3" language="text/javascript">
-          <call id="a42" endpoint="timeout">
-            <parameters>
-              <label>B</label>
-              <method>post</method>
-              <type>serviceTask</type>
-              <mid>sid-C4915A51-F57C-44E7-8BA7-AC5247998430</mid>
-              <parameters>
-                <timeout>1</timeout>
-              </parameters>
-            </parameters>
-            <manipulate output="result" language="application/javascript">data.a = 'path 1'</manipulate>
-          </call>
-        </alternative>
-        <otherwise>
-          <call id="a44" endpoint="timeout">
-            <parameters>
-              <label>C</label>
-              <method>post</method>
-              <type>serviceTask</type>
-              <mid>sid-4F7DC368-C233-43DF-862A-28FC41919D18</mid>
-              <parameters>
-                <timeout>1</timeout>
-              </parameters>
-            </parameters>
-            <manipulate output="result" language="application/javascript">data.a = 'path 2'</manipulate>
-          </call>
-        </otherwise>
-      </choose>
-      <call id="a46" endpoint="timeout">
+      <call id="a58" endpoint="timeout">
         <parameters>
           <label>A</label>
-          <method>post</method>
+          <method/>
           <type>serviceTask</type>
-          <mid>sid-DCA5CEE9-2935-4876-AF02-8322B5DB31EE</mid>
+          <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
           <parameters>
             <timeout>1</timeout>
           </parameters>
         </parameters>
+        <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
       </call>
+      <call id="a61" endpoint="timeout">
+        <parameters>
+          <label>B</label>
+          <method/>
+          <type>serviceTask</type>
+          <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+          <parameters>
+            <timeout>1</timeout>
+          </parameters>
+        </parameters>
+      </call>
+      <loop pre_test="true">
+        <choose mode="exclusive">
+          <alternative condition="data.a &gt;= 3 &amp;&amp; data.a &lt; 6" language="text/javascript">
+            <call id="a62" endpoint="timeout">
+              <parameters>
+                <label>D</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-0937F905-A975-4DB2-A8C9-CD523611AEF5</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a58" endpoint="timeout">
+              <parameters>
+                <label>A</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+              <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <alternative condition="data.a &lt; 3" language="text/javascript">
+            <call id="a60" endpoint="timeout">
+              <parameters>
+                <label>C</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-7E70A0D7-660E-4C1B-B377-64387F99BD87</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <otherwise>
+            <break/>
+          </otherwise>
+        </choose>
+      </loop>
     </description>
   </dslx>
   <status>
@@ -72,47 +130,96 @@ call :a46, :timeout, { :label =&gt; "A", :method =&gt; "post", :type =&gt; "serv
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <choose mode="exclusive">
-        <alternative condition="data.a &lt; 3" language="text/javascript">
-          <call id="a42" endpoint="timeout">
-            <parameters>
-              <label>B</label>
-              <method>post</method>
-              <type>serviceTask</type>
-              <mid>sid-C4915A51-F57C-44E7-8BA7-AC5247998430</mid>
-              <parameters>
-                <timeout>1</timeout>
-              </parameters>
-            </parameters>
-            <manipulate output="result" language="application/javascript">data.a = 'path 1'</manipulate>
-          </call>
-        </alternative>
-        <otherwise>
-          <call id="a44" endpoint="timeout">
-            <parameters>
-              <label>C</label>
-              <method>post</method>
-              <type>serviceTask</type>
-              <mid>sid-4F7DC368-C233-43DF-862A-28FC41919D18</mid>
-              <parameters>
-                <timeout>1</timeout>
-              </parameters>
-            </parameters>
-            <manipulate output="result" language="application/javascript">data.a = 'path 2'</manipulate>
-          </call>
-        </otherwise>
-      </choose>
-      <call id="a46" endpoint="timeout">
+      <call id="a58" endpoint="timeout">
         <parameters>
           <label>A</label>
-          <method>post</method>
+          <method/>
+          <type>serviceTask</type>
+          <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+          <parameters>
+            <timeout>1</timeout>
+          </parameters>
+        </parameters>
+        <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
+      </call>
+      <call id="a61" endpoint="timeout">
+        <parameters>
+          <label>B</label>
+          <method/>
           <type>serviceTask</type>
-          <mid>sid-DCA5CEE9-2935-4876-AF02-8322B5DB31EE</mid>
+          <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
           <parameters>
             <timeout>1</timeout>
           </parameters>
         </parameters>
       </call>
+      <loop pre_test="true">
+        <choose mode="exclusive">
+          <alternative condition="data.a &gt;= 3 &amp;&amp; data.a &lt; 6" language="text/javascript">
+            <call id="a62" endpoint="timeout">
+              <parameters>
+                <label>D</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-0937F905-A975-4DB2-A8C9-CD523611AEF5</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a58" endpoint="timeout">
+              <parameters>
+                <label>A</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+              <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <alternative condition="data.a &lt; 3" language="text/javascript">
+            <call id="a60" endpoint="timeout">
+              <parameters>
+                <label>C</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-7E70A0D7-660E-4C1B-B377-64387F99BD87</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <otherwise>
+            <break/>
+          </otherwise>
+        </choose>
+      </loop>
     </description>
   </description>
   <transformation>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.126
+  version: 1.3.127
   prerelease: 
 platform: ruby
 authors:
@@ -80,9 +80,9 @@ files:
 - server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/producer-secret
 - server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/subscription.xml
 - server/instances/1/properties.xml
-- server/instances/2/notifications/cfe340bd438e36fa2eebbbbdb6f3a312/consumer-secret
-- server/instances/2/notifications/cfe340bd438e36fa2eebbbbdb6f3a312/producer-secret
-- server/instances/2/notifications/cfe340bd438e36fa2eebbbbdb6f3a312/subscription.xml
+- server/instances/2/notifications/8f85ce7897598af370c5b350a811756b/consumer-secret
+- server/instances/2/notifications/8f85ce7897598af370c5b350a811756b/producer-secret
+- server/instances/2/notifications/8f85ce7897598af370c5b350a811756b/subscription.xml
 - server/instances/2/properties.xml
 - server/server.pid
 - server/handlerwrappers/soap.rb

data/server/instances/2/notifications/cfe340bd438e36fa2eebbbbdb6f3a312/consumer-secret

@@ -1 +0,0 @@
-d3ab36954f0aabf981b64b5effe333fc

data/server/instances/2/notifications/cfe340bd438e36fa2eebbbbdb6f3a312/producer-secret

@@ -1 +0,0 @@
-a336cd8a4e88996166ece177e33cd2a9