cpee 1.3.185 → 1.3.187

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643fe6d4ecaecf140b12011dff2a411aa84816af
-  data.tar.gz: b4accb49ec73bf5d8952a640ee61d2107cb59a2b
+  metadata.gz: c54e4d196d652abc94c82dddaa76fe4358562c6e
+  data.tar.gz: d44189598cbc4a914fa6b33d70a7f0cdbbd9ffb7
 SHA512:
-  metadata.gz: 8e5080fe480156c17a1e22df10d0c3dc03ee25f18c515891f335617642e53342ab014b8aedfa49bf8c337a749083cefd1219f5894e2e24b1ac062f5c56809f48
-  data.tar.gz: 82df739a32027bde851027de8d972be80113f0fd1f46b2fb41b53801c52257b22a94a07db67f89cfa5f0d69aa4611fe2f8bed80a7228990856d9cd91ae36ec6d
+  metadata.gz: ad3d4d6c8df9ca4e8cf77a1d00561687e155f8e14a5d6fdd51649040e4978e560b4196b6189e36723a0661d5cb061ceac1e549d25cd6d32652de134a5197794a
+  data.tar.gz: e32c47e5f74aa049cb63bf2e05dfc1b38319b0a4f926ea5734e7909c6e9223f0038f31a77db6d3ced7308c47e447e2189df749aff5ade534085d1b8c11a97ead

data/cockpit/css/filters.svg

@@ -6,7 +6,7 @@
   			 0 0 0 0   0
   			 0 0 0 0   0
   			 0 0 0 1   0"/>
-      <feGaussianBlur stdDeviation="2.5" result="coloredBlur"/>
+      <feGaussianBlur stdDeviation="1.5" result="coloredBlur"/>
       <feMerge>
         <feMergeNode in="coloredBlur"/>
         <feMergeNode in="SourceGraphic"/>

data/cockpit/js/instance.js

@@ -5,6 +5,7 @@ var subscription_state = 'less';
 var save = {};
     save['state']= undefined;
     save['dsl'] = undefined;
+    save['graph'] = undefined;
     save['endpoints'] = undefined;
     save['dataelements'] = undefined;
     save['attributes'] = undefined;
@@ -228,7 +229,7 @@ function monitor_instance(load) {// {{{
                 case 'attributes':
                   monitor_instance_values("attributes");
                   monitor_instance_transformation();
-                  monitor_graph_change();
+                  monitor_graph_change(true);
                   break;
                 case 'state':
                   monitor_instance_state_change(JSON.parse($('event > notification',data).text()).state);
@@ -288,33 +289,37 @@ function adaptor_init(url,theme,dslx) {
     graphrealization.set_svg_container($('#graphcanvas'));
     graphrealization.set_description($(dslx), true);
     graphrealization.notify = function(svgid) {
+      var g = graphrealization.get_description();
+      save['graph'] = $X(g);
       $.ajax({
         type: "PUT",
         url: url + "/properties/values/description/",
-			 	data: ({'content': '<content>' + graphrealization.get_description() + '</content>'})
+			 	data: ({'content': '<content>' + g + '</content>'})
       });
-      manifestation.events.click(svgid,undefined);
+      manifestation.events.click(svgid);
     };
     monitor_instance_pos();
   });
 }
 
-function monitor_graph_change() {
+function monitor_graph_change(force) {
   var url = $("#current-instance").text();
   $.ajax({
     type: "GET",
     url: url + "/properties/values/dslx/",
     success: function(dslx){
-      $.ajax({
-        type: "GET",
-        url: url + "/properties/values/attributes/theme/",
-        success: function(res){
-          adaptor_init(url,$('value',res).text(),dslx);
-        },
-        error: function() {
-          adaptor_init(url,'default',dslx);
-        }
-      });
+      if (force || !save['graph'] || (save['graph'] && save['graph'].serializePrettyXML() != $(dslx).serializePrettyXML())) {
+        $.ajax({
+          type: "GET",
+          url: url + "/properties/values/attributes/theme/",
+          success: function(res){
+            adaptor_init(url,$('value',res).text(),dslx);
+          },
+          error: function() {
+            adaptor_init(url,'default',dslx);
+          }
+        });
+      }
     }
   });
 }
@@ -336,7 +341,7 @@ function monitor_instance_dsl() {// {{{
         res = res.replace(/activity\s+\[:([A-Za-z][a-zA-Z0-9_]+)([^\]]*\])/g,"<span class='activities' id=\"activity-$1\">activity [:$1$2</span>");
 
         ctv.append(res);
-        monitor_graph_change();
+        monitor_graph_change(false);
       }
     }
   });

data/cockpit/js/wfadaptor.js

@@ -39,8 +39,8 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
   // }}}
 
   // helper funtions
-  this.set_description = function(desc) { // public {{{
-    this.description.set_description(desc);
+  this.set_description = function(desc,auto_update) { // public {{{
+    this.description.set_description(desc,auto_update);
   } // }}}
   this.get_description = function() { // public {{{
     return description.get_description();
@@ -168,6 +168,12 @@ function WfIllustrator(wf_adaptor) { // View  {{{
     self.svg.container.attr({'height': (graph.max.row+0.3)*self.height, 'width':(graph.max.col+0.65)*self.width});
     self.svg.container.append(graph.svg);
   } // }}}
+  this.get_node_by_svg_id = function(svg_id) { // {{{
+    return $('[element-id = \'' + svg_id + '\'] g.activities', self.svg.container);
+  } // }}}
+  this.get_nodes = function() { // {{{
+    return $('g.activities', self.svg.container);
+  } // }}}
   // }}}
   // Helper Functions {{{
   var draw_symbol = this.draw.draw_symbol = function (tname, sym_name, id, title, row, col, group) { // {{{
@@ -275,7 +281,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
 
   // Generic Functions {{{
   this.set_description = function(desc, auto_update) { // public {{{
-    if(auto_update != undefined)  update_illustrator = auto_update;
+    if(auto_update != undefined) update_illustrator = auto_update;
     if(typeof desc == "string") {
       description = $($.parseXML(desc));
     } else if(desc instanceof jQuery) {

data/cockpit/themes/adventure/theme.js

@@ -30,7 +30,7 @@ function WFAdaptorManifestation(adaptor) {
         if(group.length > 0) menu['Insert after'] = group;
       }
 
-      if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete)
+      if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
         var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
         icon.children('.rfill').css({'fill':'#ff7f7f','fill-opacity':'1'});
         menu['Delete'] = [{
@@ -39,6 +39,7 @@ function WFAdaptorManifestation(adaptor) {
           'menu_icon': icon,
           'params': [null, xml_node]
         }];
+      }
       if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
         var icon =  self.elements.callmanipulate.illustrator.svg.clone();
         icon.children('.rfill:last').css({'fill':'#ff7f7f','fill-opacity':'1'});
@@ -53,12 +54,20 @@ function WFAdaptorManifestation(adaptor) {
     }
     return false;
   } // }}}
-  this.events.click = function(svgid, e) { // {{{
+  this.events.click = function(svgid) { // {{{
+    var visid = 'details';
+    var tab   = $('#dat_' + visid);
+        tab.empty();
+
     if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
       return;
     }
-    $('g.activities').removeClass('clicked');
-    $(e.target).parent('g.activities').addClass('clicked');
+    self.adaptor.illustrator.get_nodes().removeClass('clicked');
+
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      vtarget.addClass('clicked');
+    }
 
     if ($('#state').text() != 'finished')
       $('#main ui-behind button').show();
@@ -70,15 +79,13 @@ function WFAdaptorManifestation(adaptor) {
         return;
     }
 
-    var visid = 'details';
-    var tab   = $('#dat_' + visid);
     var node  = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
 
-    save[visid + '_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
-
-    tab.empty();
-    save[visid] = new RelaxNGui(self.adaptor.description.elements[$(node).attr('svg-type')],tab,self.adaptor.description.context_eval);
-    save[visid].content(node);
+    if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
+      save[visid + '_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
+      save[visid] = new RelaxNGui(self.adaptor.description.elements[$(node).attr('svg-type')],tab,self.adaptor.description.context_eval);
+      save[visid].content(node);
+    }
   } // }}}
   this.events.dblclick = function(svgid, e) { // {{{
   } // }}}

data/cockpit/themes/default/theme.js

@@ -30,7 +30,7 @@ function WFAdaptorManifestation(adaptor) {
         if(group.length > 0) menu['Insert after'] = group;
       }
 
-      if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete)
+      if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
         var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
         icon.children('.rfill').css({'fill':'#ff7f7f','fill-opacity':'1'});
         menu['Delete'] = [{
@@ -39,6 +39,7 @@ function WFAdaptorManifestation(adaptor) {
           'menu_icon': icon,
           'params': [null, xml_node]
         }];
+      }
       if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
         var icon =  self.elements.callmanipulate.illustrator.svg.clone();
         icon.children('.rfill:last').css({'fill':'#ff7f7f','fill-opacity':'1'});
@@ -53,12 +54,20 @@ function WFAdaptorManifestation(adaptor) {
     }
     return false;
   } // }}}
-  this.events.click = function(svgid, e) { // {{{
+  this.events.click = function(svgid) { // {{{
+    var visid = 'details';
+    var tab   = $('#dat_' + visid);
+        tab.empty();
+
     if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
       return;
     }
-    $('g.activities').removeClass('clicked');
-    $(e.target).parent('g.activities').addClass('clicked');
+    self.adaptor.illustrator.get_nodes().removeClass('clicked');
+
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      vtarget.addClass('clicked');
+    }
 
     if ($('#state').text() != 'finished')
       $('#main ui-behind button').show();
@@ -70,15 +79,13 @@ function WFAdaptorManifestation(adaptor) {
         return;
     }
 
-    var visid = 'details';
-    var tab   = $('#dat_' + visid);
     var node  = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
 
-    save[visid + '_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
-
-    tab.empty();
-    save[visid] = new RelaxNGui(self.adaptor.description.elements[$(node).attr('svg-type')],tab,self.adaptor.description.context_eval);
-    save[visid].content(node);
+    if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
+      save[visid + '_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
+      save[visid] = new RelaxNGui(self.adaptor.description.elements[$(node).attr('svg-type')],tab,self.adaptor.description.context_eval);
+      save[visid].content(node);
+    }
   } // }}}
   this.events.dblclick = function(svgid, e) { // {{{
   } // }}}

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.185"
+  s.version          = "1.3.187"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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"
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '>= 0.99.180'
-  s.add_runtime_dependency 'weel', '>= 1.99.39'
+  s.add_runtime_dependency 'riddl', '~> 0.99'
+  s.add_runtime_dependency 'weel', '~> 1.99'
   s.add_runtime_dependency 'savon', '~> 2'
   s.add_runtime_dependency 'highline', '~> 1.6'
 end

data/log/log.xml

@@ -1,13 +1,27 @@
 <declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <interface name="events">                                                                                                                                                                                 
+  <interface name="events">
     <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml"/>
   </interface>
+  <interface name="cpee" location="http://cpee.org:9298">
+    <xi:include href="http://cpee.org:9298/?riddl-description"/>
+  </interface>
+  <interface name="logoverlay">
+    <xi:include href="logoverlay.xml"/>
+  </interface>
 
   <facade>
+    <tile>
+      <layer name="cpee"/>
+    </tile>
     <tile>
       <layer name="events">
         <apply-to>/log</apply-to>
       </layer>
     </tile>
+    <tile>
+      <layer name="logoverlay">
+        <apply-to>/{}/log</apply-to>
+      </layer>
+    </tile>
   </facade>
 </declaration>

data/log/logoverlay.xml

@@ -0,0 +1,10 @@
+<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">                        
+  <message name="logresponse">
+    <parameter name="file" mimetype="text/xml"/>
+  </message>
+
+  <resource>
+    <get out="logresponse"/>
+  </resource>
+
+</description>

data/log/server.rb

@@ -15,7 +15,7 @@ class Logging < Riddl::Implementation #{{{
   def response
     topic = @p[1].value
     event = @p[2].value
-    if(topic == 'activity' && (event=='done' || event == 'calling')) 
+    if(topic == 'activity' && (event=='done' || event == 'calling'))
       log_dir = ::File.dirname(__FILE__) + "/logs"
       instancenr = @h['CPEE_INSTANCE'].split('/').last
       notification = JSON.parse(@p[3].value)
@@ -35,7 +35,6 @@ class Logging < Riddl::Implementation #{{{
         event = trace.add "event"
         event.add 'string', :key => "concept:name", :value => log_hash["label"]
         event.add 'string', :key => "lifecycle:transition", :value => event=='done'?"complete":"start"
-        pp log_hash
         if log_hash.has_key?("data_send")
           list = event.add 'list', :key => "data_send"
           log_hash["data_send"].each do |k,v|
@@ -57,27 +56,31 @@ class Logging < Riddl::Implementation #{{{
             log_hash["data_received"].each{|e| list.add 'string', :key => e.keys[0] , :value => e.values[0]}
           end
         end
-        event.add 'date', :key => "time:timestamp", :value => Time.now unless time_added                                                                                
+        event.add 'date', :key => "time:timestamp", :value => Time.now unless time_added
       end
     else
-      pp "Something wrong" 
+      pp "Something wrong"
     end
 
 
 
 
   end
-end  #}}} 
+end  #}}}
 
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/log.xml', :host => "solo.wst.univie.ac.at", :port => 9299) do #{{{
+Riddl::Server.new(::File.dirname(__FILE__) + '/log.xml', :host => "cpee.org", :port => 9299) do #{{{
   accessible_description true
   cross_site_xhr true
+  log_path = "/home/demo/Projects/cpee-helpers/log/logs"
 
-
-  interface 'events' do                                                                                                                                                                    
+  interface 'events' do
 	    run Logging if post 'event'
 	    #run CB if post 'vote'
   end
- 
+  interface 'logoverlay' do |r|
+    run Riddl::Utils::FileServe, log_path + r[:h]["RIDDL_DECLARATION_PATH"]+ ".xes","text/xml" if get
+  end
+
+
 end.loop! #}}}

data/server/instances/34/properties.xml

@@ -0,0 +1,149 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </dataelements>
+  <endpoints>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+  </endpoints>
+  <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :arguments =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, finalize: &lt;&lt;-END
+  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'
+END
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :method =&gt; :post, :arguments =&gt; {:to =&gt; data.to} }, finalize: &lt;&lt;-END
+        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, parameters: { :method =&gt; :post, :arguments =&gt; {:costs =&gt; data.costs} }
+  end
+end
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/35/properties.xml

@@ -0,0 +1,149 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Linear</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </dataelements>
+  <endpoints>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+  </endpoints>
+  <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :arguments =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, finalize: &lt;&lt;-END
+  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'
+END
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :method =&gt; :post, :arguments =&gt; {:to =&gt; data.to} }, finalize: &lt;&lt;-END
+        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, parameters: { :method =&gt; :post, :arguments =&gt; {:costs =&gt; data.costs} }
+  end
+end
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/36/properties.xml

@@ -0,0 +1,164 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </dataelements>
+  <endpoints>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+  </endpoints>
+  <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :arguments =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, finalize: &lt;&lt;-END
+  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'
+END
+call :a5, nil, parameters: {  }
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :method =&gt; :post, :arguments =&gt; {:to =&gt; data.to} }, finalize: &lt;&lt;-END
+        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, parameters: { :method =&gt; :post, :arguments =&gt; {:costs =&gt; data.costs} }
+  end
+end
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </call>
+      <call xmlns="" id="a5" endpoint="">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </call>
+      <call xmlns="" id="a5" endpoint="">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/37/properties.xml

@@ -0,0 +1,113 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Linear</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions>
+    <a1>after</a1>
+  </positions>
+  <dataelements>
+    <x/>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; {:timeout =&gt; 2} }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; {:timeout =&gt; 4} }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; {:timeout =&gt; 4} }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">  data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">  data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">  data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">  data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">  data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">  data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/38/notifications/b1c2a4fd87a36e2b663faf2c601499a3/consumer-secret

@@ -0,0 +1 @@
+deee158f0fe356a100a1b741621085b4

data/server/instances/38/notifications/b1c2a4fd87a36e2b663faf2c601499a3/producer-secret

@@ -0,0 +1 @@
+86e851fc3e212be9933792da7e9fc796

data/server/instances/38/notifications/b1c2a4fd87a36e2b663faf2c601499a3/subscription.xml

@@ -0,0 +1,37 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
+  <topic id="activity">
+    <event>calling</event>
+    <event>status</event>
+    <event>manipulating</event>
+    <event>failed</event>
+    <event>done</event>
+  </topic>
+  <topic id="position">
+    <event>change</event>
+  </topic>
+  <topic id="description">
+    <event>change</event>
+    <event>error</event>
+  </topic>
+  <topic id="state">
+    <event>change</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+  <topic id="transformation">
+    <event>change</event>
+  </topic>
+  <topic id="handlerwrapper">
+    <event>result</event>
+  </topic>
+  <topic id="handlers">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/38/properties.xml

@@ -0,0 +1,162 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </dataelements>
+  <endpoints>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+  </endpoints>
+  <dsl>manipulate :a5
+call :a1, :bookAir, parameters: { :label =&gt; nil, :method =&gt; :post, :arguments =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, finalize: &lt;&lt;-END, update: &lt;&lt;-END
+data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'
+END
+aaa
+END
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :label =&gt; nil, :method =&gt; :post, :arguments =&gt; {:to =&gt; data.to} }, finalize: &lt;&lt;-END, update: &lt;&lt;-END
+data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, parameters: { :method =&gt; :post, :arguments =&gt; {:costs =&gt; data.costs} }
+  end
+end
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <manipulate xmlns="" id="a5"/>
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+        <update output="result">aaa</update>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label/>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+              <update output="result"/>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <manipulate xmlns="" id="a5"/>
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+        <update output="result">aaa</update>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label/>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+              <update output="result"/>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/server.pid

@@ -1 +1 @@
-26421
+22667

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.185
+  version: 1.3.187
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,36 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.180
+        version: '0.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.180
+        version: '0.99'
 - !ruby/object:Gem::Dependency
   name: weel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.99.39
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.99.39
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +269,7 @@ files:
 - lib/engine/instance-info.rng
 - lib/engine/instances.rng
 - log/log.xml
+- log/logoverlay.xml
 - log/logs/1/test
 - log/server.rb
 - log/template.xes
@@ -309,6 +310,14 @@ files:
 - server/instances/31/properties.xml
 - server/instances/32/properties.xml
 - server/instances/33/properties.xml
+- server/instances/34/properties.xml
+- server/instances/35/properties.xml
+- server/instances/36/properties.xml
+- server/instances/37/properties.xml
+- server/instances/38/notifications/b1c2a4fd87a36e2b663faf2c601499a3/consumer-secret
+- server/instances/38/notifications/b1c2a4fd87a36e2b663faf2c601499a3/producer-secret
+- server/instances/38/notifications/b1c2a4fd87a36e2b663faf2c601499a3/subscription.xml
+- server/instances/38/properties.xml
 - server/instances/4/properties.xml
 - server/instances/5/properties.xml
 - server/instances/6/properties.xml