cpee 1.3.125 → 1.3.126

data/cockpit/js/details.js

@@ -32,6 +32,7 @@ $(document).ready(function() {
   }); //}}}
 
   $('#dat_details input.pair_name, #dat_details input.prop_value, #dat_details textarea.prop_value, #dat_details select.prop_value, #dat_details input.pair_value').live('keyup',function(e){ mark_main_save($(e.target).parents('div.tabbed')); });
+  $('#dat_details select.prop_value').live('change',function(e){ mark_main_save($(e.target).parents('div.tabbed')); });
 });
 
 function mark_main_save(top) { //{{{
@@ -120,6 +121,7 @@ function serialize_details(parent) { //{{{
       xml.attr($('select.pname_mode').val(),$('input.pname_condition').val());
       break;
     case 'choose':
+      xml.attr('mode',$('select.pname_mode').val());
       break;
     case 'alternative':
       xml.attr('condition',$('input.pname_condition').val());

data/cockpit/js/instance.js

@@ -1,6 +1,5 @@
 var ws;
 var running = false;
-var load;
 var graphrealization;
 var subscription;
 var subscription_state = 'less';
@@ -44,8 +43,8 @@ var sub_less = 'topic'  + '=' + 'running' + '&' +// {{{
 
 $(document).ready(function() {// {{{
   $("input[name=base-url]").val(location.protocol + "//" + location.host + ":9298/");
-  $("button[name=base]").click(create_instance);
-  $("button[name=instance]").click(monitor_instance);
+  $("button[name=base]").click(function(){ create_instance(null); });
+  $("button[name=instance]").click(function(){ ui_tab_click("#tabinstance"); monitor_instance(false); });
   $("button[name=loadtestset]").click(load_testset);
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
@@ -53,6 +52,7 @@ $(document).ready(function() {// {{{
   $("button[name=savesvg]").click(function(){ save_svg(); });
   $("input[name=votecontinue]").click(check_subscription);
 
+
   $.ajax({ 
     url: "testsets/index.xml", 
     dataType: 'xml',
@@ -63,20 +63,24 @@ $(document).ready(function() {// {{{
           $("<option></option>").attr("value",ts).text(ts)
         );
       });
+      var q = $.parseQuery();
+      if (q.monitor && q.load) {
+        $("input[name=instance-url]").val(q.monitor);
+        $("select[name=testset-names]").val(q.load)
+        ui_tab_click("#tabexecution");
+        monitor_instance(true);
+      } else if (q.load) {
+        $("select[name=testset-names]").val(q.load)
+        ui_tab_click("#tabexecution");
+        create_instance(q.load);
+      } else if (q.monitor) {
+        $("input[name=instance-url]").val(q.monitor);
+        ui_tab_click("#tabexecution");
+        // ui_toggle_vis_tab($("#instance td.switch"));
+        monitor_instance(false);
+      }  
     }
   });
-  
-  var q = $.parseQuery();
-  if (q.monitor) {
-    $("input[name=instance-url]").val(q.monitor);
-    ui_toggle_vis_tab($("#instance td.switch"));
-    monitor_instance();
-  }
-  if (q.load) {
-    load = q.load;
-    ui_toggle_vis_tab($("#instance td.switch"));
-    create_instance();
-  }
 });// }}}
 
 function check_subscription() { // {{{
@@ -110,8 +114,8 @@ function check_subscription() { // {{{
   }  
 }// }}}
 
-function create_instance() {// {{{
-  var info = load ? load : prompt("Instance info?", "Enter info here");
+function create_instance(ask) {// {{{
+  var info = ask ? ask: prompt("Instance info?", "Enter info here");
   if (info != null) {
     if (info.match(/\S/)) {
       var base = $("input[name=base-url]").val();
@@ -122,7 +126,7 @@ function create_instance() {// {{{
         data: "info=" + info, 
         success: function(res){
           $("input[name=instance-url]").val((base + "//" + res + "/").replace(/\/+/g,"/").replace(/:\//,"://"));
-          if (load) monitor_instance();
+          if (ask) monitor_instance(true);
         },  
         error: function(a,b,c) {
           alert("No CPEE running.");
@@ -134,7 +138,7 @@ function create_instance() {// {{{
   }  
 }// }}}
   
-function monitor_instance() {// {{{
+function monitor_instance(load) {// {{{
   var url = $("input[name=instance-url]").val();
 
   $('.tabbehind button').hide();
@@ -153,8 +157,6 @@ function monitor_instance() {// {{{
       $("#current-instance").attr('href',url);
       history.replaceState({}, '', '?monitor='+url);
 
-      ui_tab_click($("#tabinstance")[0]);
-
       // Change url to return to current instance when reloading (because new subscription is made)
       $("input[name=votecontinue]").removeAttr('checked');
       subscription_state = 'less';
@@ -222,6 +224,7 @@ function monitor_instance() {// {{{
     },
     error: function(a,b,c) {
       alert("This ain't no CPEE instance");
+      ui_tab_click("#tabnew");
     }
   });      
 }// }}}
@@ -369,7 +372,6 @@ function monitor_instance_state_change(notification) { //{{{
     ctv.empty();
 
     if (notification == "stopped") {
-      format_visual_clear();
       monitor_instance_pos();
     }  
     if (notification == "running") {
@@ -651,7 +653,7 @@ function load_testset() {// {{{
   $('#main .tabbehind button').hide();
   $('#dat_details').empty();
 
-  var name = load ? load : $("select[name=testset-names]").val();
+  var name = $("select[name=testset-names]").val();
 
   $.ajax({ 
     cache: false,

data/cockpit/js/wfadaptor.cpee.js

@@ -162,6 +162,8 @@ function CPEE(adaptor) {
         tab.append(create_input_property('Condition','',$(node).attr(mode)));
         break;
       case 'choose':
+        var mode = ($(node).attr('mode') == 'inclusive' || $(node).attr('mode') == undefined ? 'inclusive' : 'exclusive')
+        tab.append(create_select_property('Mode','',mode,['exclusive','inclusive']));
         break;
       case 'alternative':
         tab.append(create_input_property('Condition','',$(node).attr('condition')));
@@ -351,19 +353,14 @@ function CPEE(adaptor) {
       'resolve_symbol' : function(node) { 
         if($(node).attr('endpoint') == 'instantiation') {
           return 'callinstantiation'; 
-          return illustrator.elements.callinstantiation.draw(node, pos, block);
         } else if($(node).attr('endpoint') == 'correlation') {
           return 'callcorrelation'; 
-          return illustrator.elements.callcorrelation.draw(node, pos, block);
         } else if($('parameters > service', node).length > 0) {
           return 'callinjection'; 
-          return illustrator.elements.callinjection.draw(node, pos, block);
         } else if($('manipulate', node).length > 0) {
           return 'callmanipulate'; 
-          return illustrator.elements.callmanipulate.draw(node, pos, block);
         } else {
-          return'call' 
-          return illustrator.draw.draw_symbol('call', $(node).attr('svg-id'), pos.row, pos.col);
+          return'call';
         }
       },
       'svg': function() {
@@ -425,6 +422,34 @@ function CPEE(adaptor) {
     'click': events.click,
    }//}}}
   }; /*}}}*/
+  this.elements.break = { /*{{{*/
+    'illustrator': {//{{{
+      'type' : 'primitive',
+      'endnodes' : 'this',
+      'svg': function() {
+        return $X('<svg class="clickable" xmlns="http://www.w3.org/2000/svg">' + 
+                    '<circle cx="15" cy="15" r="14" class="stand"/>' +
+                    '<circle cx="15" cy="15" r="11" class="stand"/>' +
+                    '<polygon points="10.5,20.5 15,8.5 20.5,20.5 15,15.5 10.5,20.5" class="black"/>' +
+                  '</svg>');
+      }
+    },//}}}
+    'description' : {//{{{
+      'create':  function(target) {
+        var node = $X('<break 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,
+   }//}}}
+  }; /*}}}*/
   this.elements.constraints = { /*{{{*/
     'illustrator': {//{{{
       'type' : 'primitive',
@@ -451,6 +476,128 @@ function CPEE(adaptor) {
   }; /*}}}*/
   
   // 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',
@@ -459,6 +606,13 @@ function CPEE(adaptor) {
       'expansion' : function(node) { 
         return 'horizontal';
       }, 
+      'resolve_symbol' : function(node) { 
+        if($(node).attr('mode') == 'exclusive') {
+          return 'choose_exclusive'; 
+        } else {
+          return 'choose_inclusive';
+        }
+      },
       'col_shift' : function(node) { 
         return false; 
       },
@@ -471,7 +625,7 @@ function CPEE(adaptor) {
     },//}}}
     'description' : {//{{{
       'create':  function(target) {
-        var node = $X('<choose xmlns="http://cpee.org/ns/description/1.0"><otherwise/></choose>');
+        var node = $X('<choose mode="exclusive" xmlns="http://cpee.org/ns/description/1.0"><otherwise/></choose>');
         return node;
       },
       'permissible_children': function(node) {

data/cockpit/lib/wfadaptor.js

@@ -323,10 +323,12 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     } // }}}
 
     $(root).children().each(function() { 
+      var tname = this.tagName;
+
       // Set SVG-ID {{{
       if($(this).attr('id') == undefined) {
-        if(id_counter[this.tagName] == undefined) id_counter[this.tagName] = -1;
-        $(this).attr('svg-id', this.tagName + '_' + (++id_counter[this.tagName]));
+        if(id_counter[tname] == undefined) id_counter[tname] = -1;
+        $(this).attr('svg-id', tname + '_' + (++id_counter[tname]));
         $(this).attr('svg-label', '');
       } else { 
         $(this).attr('svg-id',  $(this).attr('id'));
@@ -341,15 +343,15 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       else { collapsed = true; }
       if(root_expansion == 'vertical')  pos.row++;
       if(root_expansion == 'horizontal')  pos.col++;
-      if(illustrator.elements[this.tagName] != undefined && illustrator.elements[this.tagName].type == 'complex' && !collapsed) {
-        if(illustrator.elements[this.tagName] != undefined && !illustrator.elements[this.tagName].svg()) pos.row--;
-// TODO: Remaining problem is the order insode the svg. Thats why the connection is above the icon
+      if(illustrator.elements[tname] != undefined && illustrator.elements[tname].type == 'complex' && !collapsed) {
+        if(illustrator.elements[tname] != undefined && !illustrator.elements[tname].svg()) pos.row--;
+// TODO: Remaining problem is the order inside the svg. Thats why the connection is above the icon
         block = parse(this, jQuery.extend(true, {}, pos));
         group.append(block.svg);
         block.svg.attr('id', 'group-' + $(this).attr('svg-id')); 
-        if(illustrator.elements[this.tagName].endnodes == 'aggregate') endnodes = []; // resets endpoints e.g. potential preceding primitive 
+        if(illustrator.elements[tname].endnodes == 'aggregate') endnodes = []; // resets endpoints e.g. potential preceding primitive 
       } else {
-        if(illustrator.elements[this.tagName] != undefined && illustrator.elements[this.tagName].type == 'primitive'  && illustrator.elements[this.tagName].svg()) { // This enables "invisble" elements, by returning false in the SVG function (e.g. constraints)
+        if(illustrator.elements[tname] != undefined && illustrator.elements[tname].type == 'primitive'  && illustrator.elements[tname].svg()) { // This enables "invisble" elements, by returning false in the SVG function (e.g. constraints)
           block.max.row = pos.row;
           block.max.col = pos.col;
           block.endnodes = (!collapsed ? [pos] : [jQuery.extend(true, {}, pos)]);
@@ -359,27 +361,27 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       // }}}
       // Draw symbol {{{
       var sym_name = '';
-      if(!illustrator.elements[this.tagName])                                         {sym_name = 'unknown';}
-      else if(typeof illustrator.elements[this.tagName].resolve_symbol == 'function') {sym_name = illustrator.elements[this.tagName].resolve_symbol(this);}
-      else if(typeof illustrator.elements[this.tagName].resolve_symbol == 'string')   {sym_name = illustrator.elements[this.tagName].resolve_symbol;}
-      else                                                                            {sym_name = this.tagName;}
-      if((illustrator.elements[this.tagName] && illustrator.elements[this.tagName].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[this.tagName] ? illustrator.elements[this.tagName].type : 'primitive unknown');
-      } else { console.log("no icon "+ this.tagName);}
-      if(illustrator.elements[this.tagName] && illustrator.elements[this.tagName].border) illustrator.draw.draw_border($(this).attr('svg-id'), pos, block.max, block.svg);
-      if(illustrator.elements[this.tagName] && illustrator.elements[this.tagName].type == 'complex') illustrator.draw.draw_tile($(this).attr('svg-id'), pos, block.max, block.svg);
+      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;}
+      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');
+      } 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);
       // }}}
       // Calculate Connection {{{
-      if(illustrator.elements[this.tagName] != undefined && illustrator.elements[this.tagName].closeblock) { // Close Block if element e.g. loop 
+      if(illustrator.elements[tname] != undefined && illustrator.elements[tname].closeblock) { // Close Block if element e.g. loop 
         for(node in block.endnodes) illustrator.draw.draw_connection(group, block.endnodes[node], pos, block.max.row+1, block.endnodes.length, true);
       }
-      if(illustrator.elements[this.tagName] != undefined && illustrator.elements[this.tagName].endnodes != 'this')  { 
+      if(illustrator.elements[tname] != undefined && illustrator.elements[tname].endnodes != 'this')  { 
         for(i in block.endnodes) endnodes.push(block.endnodes[i]); // collects all endpoints from different childs e.g. alternatives from choose 
       } else { endnodes = [jQuery.extend(true, {}, pos)]; } // sets this element as only endpoint (aggreagte)
       if(prev[0].row == 0 || prev[0].col == 0) { // this enforces the connection from description to the first element
         illustrator.draw.draw_connection(group, { row: 1, col: 1 }, pos, null, null, true);
       } else {
-        if ($.inArray(this.tagName,noarrow) == -1)
+        if ($.inArray(tname,noarrow) == -1)
           for(node in prev) illustrator.draw.draw_connection(group, prev[node], pos, null, null, true);
         else  
           for(node in prev) illustrator.draw.draw_connection(group, prev[node], pos, null, null, false);

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.125"
+  s.version          = "1.3.126"
   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/lib/engine.xml

@@ -64,12 +64,14 @@
       <get in="*" out="instance-info"/>
       <delete in="*"/>
       <resource relative="callbacks">
+        <doc:documentation>xb</doc:documentation>
         <get in="*" out="callbacks"/>
         <resource>
           <put in="*"/>
         </resource>
       </resource>
       <resource relative="notifications">
+        <doc:documentation>xr</doc:documentation>
         <resource relative="subscriptions">
           <resource>
             <resource relative="debug">

data/server/handlerwrappers/default.rb

@@ -103,8 +103,6 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_syntax_error(err,code)# {{{
-    puts err.message
-    puts err.backtrace
     @controller.notify("properties/description/error", :instance => @controller.instance, :message => err.message)
   end# }}}
   def inform_manipulate_change(status,dataelements,endpoints) # {{{

data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/consumer-secret

@@ -0,0 +1 @@
+d206763d6042af84dad267ae316c2a00

data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/producer-secret

@@ -0,0 +1 @@
+63f8cb395dd00d19bf520b0ffa283007

data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/subscription.xml

@@ -0,0 +1,27 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
+  <topic id="running">
+    <event>activity_calling</event>
+    <event>activity_manipulating</event>
+    <event>activity_failed</event>
+    <event>activity_done</event>
+  </topic>
+  <topic id="properties/position">
+    <event>change</event>
+  </topic>
+  <topic id="properties/description">
+    <event>change</event>
+    <event>error</event>
+  </topic>
+  <topic id="properties/state">
+    <event>change</event>
+  </topic>
+  <topic id="properties/dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="properties/endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="properties/handlers">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/1/properties.xml

@@ -1,31 +1,64 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>Enter info here</info>
-  <state>finished</state>
+  <info>asd</info>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
     <x/>
   </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <back>http://gruppe.wst.univie.ac.at/~mangler/services/callback.php</back>
   </endpoints>
-  <dsl>call :a1, :back, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end 
-  data.x += "a1,"
+  <dsl>parallel do
+  parallel_branch do
+    call :a4, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
+  end
+  parallel_branch do
+    call :a5, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
+  end
+end
+call :a2, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; b } }, &lt;&lt;-end 
+data.x += "a2,"
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="back">
+      <!--{{{-->
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
+              <parameters>
+                <timeout>a</timeout>
+              </parameters>
+            </parameters>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a5" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
+              <parameters>
+                <timeout>a</timeout>
+              </parameters>
+            </parameters>
+          </call>
+        </parallel_branch>
+      </parallel>
+      <call id="a2" endpoint="timeout">
         <parameters>
-          <!--{{{-->
+          <label/>
           <method>post</method>
           <parameters>
-            <timeout>2</timeout>
+            <timeout>b</timeout>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
+        <manipulate>data.x += "a2,"</manipulate>
       </call>
     </description>
   </dslx>
@@ -35,16 +68,40 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="back">
+      <!--{{{-->
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
+              <parameters>
+                <timeout>a</timeout>
+              </parameters>
+            </parameters>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a5" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
+              <parameters>
+                <timeout>a</timeout>
+              </parameters>
+            </parameters>
+          </call>
+        </parallel_branch>
+      </parallel>
+      <call id="a2" endpoint="timeout">
         <parameters>
-          <!--{{{-->
+          <label/>
           <method>post</method>
           <parameters>
-            <timeout>2</timeout>
+            <timeout>b</timeout>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
+        <manipulate>data.x += "a2,"</manipulate>
       </call>
     </description>
   </description>

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

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

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

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

data/server/instances/2/notifications/cfe340bd438e36fa2eebbbbdb6f3a312/subscription.xml

@@ -0,0 +1,27 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
+  <topic id="running">
+    <event>activity_calling</event>
+    <event>activity_manipulating</event>
+    <event>activity_failed</event>
+    <event>activity_done</event>
+  </topic>
+  <topic id="properties/position">
+    <event>change</event>
+  </topic>
+  <topic id="properties/description">
+    <event>change</event>
+    <event>error</event>
+  </topic>
+  <topic id="properties/state">
+    <event>change</event>
+  </topic>
+  <topic id="properties/dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="properties/endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="properties/handlers">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/2/properties.xml

@@ -1,33 +1,68 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>asdasd</info>
+  <info>asdads</info>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions>
-    <a1>after</a1>
-  </positions>
-  <dataelements>
-    <x/>
-  </dataelements>
+  <positions/>
+  <dataelements/>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <back>http://gruppe.wst.univie.ac.at/~mangler/services/callback.php</back>
   </endpoints>
-  <dsl>call :a1, :back, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end 
-  data.x += "a1,"
+  <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'
+    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'
+    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">
-      <call id="a1" endpoint="back">
+      <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">
         <parameters>
-          <!--{{{-->
+          <label>A</label>
           <method>post</method>
+          <type>serviceTask</type>
+          <mid>sid-DCA5CEE9-2935-4876-AF02-8322B5DB31EE</mid>
           <parameters>
-            <timeout>2</timeout>
+            <timeout>1</timeout>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
       </call>
     </description>
   </dslx>
@@ -37,22 +72,52 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="back">
+      <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">
         <parameters>
-          <!--{{{-->
+          <label>A</label>
           <method>post</method>
+          <type>serviceTask</type>
+          <mid>sid-DCA5CEE9-2935-4876-AF02-8322B5DB31EE</mid>
           <parameters>
-            <timeout>2</timeout>
+            <timeout>1</timeout>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
       </call>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="rest"/>
-    <endpoints type="rest"/>
+    <dataelements type="xslt"/>
+    <endpoints type="xslt"/>
   </transformation>
 </properties>

data/server/resources/transformation_dslx.xsl

@@ -42,6 +42,10 @@
       </xsl:call-template>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
+    <xsl:if test="name()='break'">
+      <xsl:text>break</xsl:text>
+      <xsl:call-template name="print-newline"/>
+    </xsl:if>
     <xsl:if test="name()='parallel'">
       <xsl:text>parallel</xsl:text>
       <xsl:if test="@wait">
@@ -63,14 +67,32 @@
     <xsl:if test="name()='loop'">
       <xsl:text>loop </xsl:text>
       <xsl:if test="@pre_test">
-        <xsl:text>pre_test{</xsl:text>
-        <xsl:value-of select="@pre_test"/>
-        <xsl:text>} </xsl:text>
+        <xsl:choose>
+          <xsl:when test="not(@language) or @language='application/x-ruby'">
+            <xsl:text>pre_test{</xsl:text>
+            <xsl:value-of select="@pre_test"/>
+            <xsl:text>} </xsl:text>
+          </xsl:when>  
+          <xsl:otherwise>
+            <xsl:text>pre_test("</xsl:text>
+            <xsl:value-of select="@pre_test"/>
+            <xsl:text>") </xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:if>
       <xsl:if test="@post_test">
-        <xsl:text>post_test{</xsl:text>
-        <xsl:value-of select="@post_test"/>
-        <xsl:text>} </xsl:text>
+        <xsl:choose>
+          <xsl:when test="not(@language) or @language='application/x-ruby'">
+            <xsl:text>post_test{</xsl:text>
+            <xsl:value-of select="@post_test"/>
+            <xsl:text>} </xsl:text>
+          </xsl:when>  
+          <xsl:otherwise>
+            <xsl:text>post_test("</xsl:text>
+            <xsl:value-of select="@post_test"/>
+            <xsl:text>") </xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:if>
       <xsl:text>do</xsl:text>
       <xsl:call-template name="print-newline"/>
@@ -85,7 +107,16 @@
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='choose'">
-      <xsl:text>choose do</xsl:text>
+      <xsl:text>choose </xsl:text>
+        <xsl:choose>
+          <xsl:when test="@mode='exclusive'">
+            <xsl:text>:exclusive</xsl:text>
+          </xsl:when>  
+          <xsl:otherwise>
+            <xsl:text>:inclusive</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
       <xsl:apply-templates>
         <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
@@ -127,7 +158,18 @@
       <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
     </xsl:call-template>
     <xsl:text>alternative </xsl:text>
-    <xsl:value-of select="@condition"/>
+    <xsl:choose>
+      <xsl:when test="not(@language) or @language='application/x-ruby'">
+        <xsl:text>"</xsl:text>
+        <xsl:value-of select="@condition"/>
+        <xsl:text>"</xsl:text>
+      </xsl:when>  
+      <xsl:otherwise>
+        <xsl:text>"</xsl:text>
+        <xsl:value-of select="@condition"/>
+        <xsl:text>"</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text> do</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>

data/server/server.pid

@@ -0,0 +1 @@
+10417

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.125
+  version: 1.3.126
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -76,8 +76,15 @@ files:
 - server/resources/transformation_dslx.xsl
 - server/resources/properties.schema.inactive
 - server/resources/transformation.xml
+- server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/consumer-secret
+- 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/properties.xml
+- server/server.pid
 - server/handlerwrappers/soap.rb
 - server/handlerwrappers/default.rb
 - lib/engine.xml