cpee 2.1.93 → 2.1.96

data/cockpit/themes/presetaltid/rngs/manipulate.rng

@@ -1,4 +1,4 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
@@ -19,5 +19,60 @@
       <value>#f57aa9</value>
     </choice>
   </attribute>
-  <text rngui:label="Script that is executed"/>
+  <element name="code" rngui:label="Script" rngui:header="Code">
+    <text rngui:label="Script that is executed"/>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data objects (written in this task and otherwise) can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
+            <element name="id" rngui:label="ID">
+              <data type="string" rngui:label="ID"/>
+            </element>
+            <element name="source" rngui:label="Source">
+              <data type="string" rngui:label="Where does the sensor value come from?"/>
+            </element>
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+    </element>
+  </element>
 </element>

data/cockpit/themes/presetaltid/theme.js

@@ -4,13 +4,37 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
     this.compact = true;
     this.rotated_labels = false;
     this.elements.call.illustrator.label = function(node) { //{{{
-      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt-id') + ')' } ];
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
+    }; //}}}
+    this.elements.call.illustrator.info = function(node) { //{{{
+      return { 'element-endpoint': $(node).attr('endpoint'), 'element-alt_id': $(node).attr('a:alt_id')  };
+    }; //}}}
+    this.elements.callmanipulate.illustrator.label = function(node) { //{{{
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
+    }; //}}}
+    this.elements.callmanipulate.illustrator.info = function(node) { //{{{
+      return { 'element-endpoint': $(node).attr('endpoint'), 'element-alt_id': $(node).attr('a:alt_id')  };
     }; //}}}
     this.elements.stop.illustrator.label = function(node) { //{{{
-      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt-id') + ')' } ];
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
+    }; //}}}
+    this.elements.stop.illustrator.info = function(node) { //{{{
+      return { 'element-alt_id': $(node).attr('a:alt_id')  };
     }; //}}}
     this.elements.wait_for_signal.illustrator.label = function(node) { //{{{
-      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt-id') + ')' } ];
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
+    }; //}}}
+    this.elements.wait_for_signal.illustrator.info = function(node) { //{{{
+      return { 'element-alt_id': $(node).attr('a:alt_id')  };
+    }; //}}}
+    this.elements.choose.illustrator.info = function(node) { //{{{
+      return { 'element-alt_id': $(node).attr('a:alt_id')  };
+    }; //}}}
+    this.elements.loop.illustrator.info = function(node) { //{{{
+      return { 'element-alt_id': $(node).attr('a:alt_id')  };
+    }; //}}}
+    this.elements.parallel.illustrator.info = function(node) { //{{{
+      return { 'element-alt_id': $(node).attr('a:alt_id')  };
     }; //}}}
   }
 }

data/cockpit/themes/presetid/rngs/call.rng

@@ -52,6 +52,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/presetid/rngs/callmanipulate.rng

@@ -44,7 +44,7 @@
     </element>
   </element>
   <element name="code" rngui:header="Data Handling">
-    <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
+    <element name="signal" rngui:label="Signal after finalize/update">
       <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
     </element>
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -78,6 +78,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/presetid/rngs/loop.rng

@@ -19,4 +19,11 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_iteration" rngui:label="Log per iteration">
+        <data type="boolean" rngui:label="Log per iteration"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/presetid/rngs/manipulate.rng

@@ -1,4 +1,4 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
@@ -19,5 +19,60 @@
       <value>#f57aa9</value>
     </choice>
   </attribute>
-  <text rngui:label="Script that is executed"/>
+  <element name="code" rngui:label="Script" rngui:header="Code">
+    <text rngui:label="Script that is executed"/>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data objects (written in this task and otherwise) can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
+            <element name="id" rngui:label="ID">
+              <data type="string" rngui:label="ID"/>
+            </element>
+            <element name="source" rngui:label="Source">
+              <data type="string" rngui:label="Where does the sensor value come from?"/>
+            </element>
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+    </element>
+  </element>
 </element>

data/cockpit/themes/reduced/rngs/call.rng

@@ -52,6 +52,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/reduced/rngs/callmanipulate.rng

@@ -44,7 +44,7 @@
     </element>
   </element>
   <element name="code" rngui:header="Data Handling">
-    <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
+    <element name="signal" rngui:label="Signal after finalize/update">
       <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
     </element>
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -78,6 +78,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/reduced/rngs/loop.rng

@@ -19,4 +19,11 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_iteration" rngui:label="Log per iteration">
+        <data type="boolean" rngui:label="Log per iteration"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/reduced/rngs/manipulate.rng

@@ -1,4 +1,4 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
@@ -19,5 +19,60 @@
       <value>#f57aa9</value>
     </choice>
   </attribute>
-  <text rngui:label="Script that is executed"/>
+  <element name="code" rngui:label="Script" rngui:header="Code">
+    <text rngui:label="Script that is executed"/>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data objects (written in this task and otherwise) can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
+            <element name="id" rngui:label="ID">
+              <data type="string" rngui:label="ID"/>
+            </element>
+            <element name="source" rngui:label="Source">
+              <data type="string" rngui:label="Where does the sensor value come from?"/>
+            </element>
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+    </element>
+  </element>
 </element>

data/cockpit/track.html

@@ -56,11 +56,11 @@
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/track.js"></script>
     <script type="text/javascript" src="js/modifiers.js"></script>
-    <script type="text/javascript" src="js/resources.js"></script>
+    <script type="text/javascript" src="js/extended_columns.js"></script>
     <script type="text/javascript" src="themes/base.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
-    <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
-    <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
+    <link rel="stylesheet" href="css/extended_columns-label.css" type="text/css"/>
+    <link rel="stylesheet" href="css/extended_columns-svg.css" type="text/css" data-include-export="true"/>
     <link rel="stylesheet" href="css/track.css" type="text/css"/>
   </head>
   <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.93"
+  s.version          = "2.1.96"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/lib/cpee/implementation.rb

@@ -117,7 +117,7 @@ module CPEE
       Dir[File.join(opts[:global_executionhandlers],'*','execution.rb')].each do |h|
         require h
       end unless opts[:global_executionhandlers].nil? || opts[:global_executionhandlers].strip == ''
-      Dir[File.join(opts[:executionhandlers],'*','execution.rb')].each do |h|
+      Dir[File.join(opts[:executionhandlers],'**','execution.rb')].each do |h|
         require h
       end unless opts[:executionhandlers].nil? || opts[:executionhandlers].strip == ''
       CPEE::Message::set_workers(opts[:workers])
@@ -316,34 +316,12 @@ module CPEE
 
       doc   = XML::Smart::string(@p[0].value.read)
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-      doc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+      doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
 
       name = doc.find('string(/*/p:attributes/p:info)')
 
-      id, uuid = NewInstance::create(opts,redis,name,doc)
-
-      subscriptions = []
-      (doc.find('/*/sub:subscriptions/sub:subscription') rescue []).each do |s|
-        sub = []
-        unless sub[0] = s.attributes['id']
-          sub[0] = Digest::MD5.hexdigest(Kernel::rand().to_s)
-        end
-
-        unless sub[1] = s.attributes['url']
-          raise "no url"
-        end
-
-        sub[2] = []
-        s.find('sub:topic').each do |t|
-          %w(event vote).each do |type|
-            t.find('sub:' + type).each do |e|
-              sub[2] << File.join(t.attributes['id'],type,e.text)
-            end
-          end
-        end
-
-        CPEE::Persistence::set_handler(id,opts,*sub)
-      end
+      subs = (doc.find('/*/np:subscriptions/np:subscription') rescue []).to_a
+      id, uuid = NewInstance::create(opts,redis,name,subs,doc)
 
       content = {
         :state => 'ready',
@@ -372,7 +350,19 @@ module CPEE
       File.join(*ret.reverse)
     end
 
-    def self::create(opts,redis,name,doc=nil)
+    def self::sub(multi,id,doc,key)
+      doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+      url = doc.find('string(/np:subscription/@url)')
+      multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers",key)
+      multi.set(CPEE::Persistence::obj + ":#{id}/handlers/#{key}/url",url)
+      doc.find('/np:subscription/np:topic/*').each do |e|
+        c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
+        multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{key}",c)
+        multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{c}",key)
+      end
+    end
+
+    def self::create(opts,redis,name,subs,doc=nil)
       doc = XML::Smart::open_unprotected(opts[:properties_init]) if doc.nil?
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
       id       = CPEE::Persistence::new_object(opts)
@@ -399,18 +389,15 @@ module CPEE
         end
         Dir[File.join(opts[:notifications_init],'*','subscription.xml')].each do |f|
           XML::Smart::open_unprotected(f) do |doc|
-            doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
-            key = File.basename(File.dirname(f))
-            url = doc.find('string(/np:subscription/@url)')
-            multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers",key)
-            multi.set(CPEE::Persistence::obj + ":#{id}/handlers/#{key}/url",url)
-            doc.find('/np:subscription/np:topic/*').each do |e|
-              c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
-              multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{key}",c)
-              multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{c}",key)
-            end
+            NewInstance::sub(multi,id,doc,File.basename(File.dirname(f)))
           end rescue nil # all the ones that are not ok, are ignored
         end
+        subs.each do |s|
+          begin
+            NewInstance::sub(multi,id,s.to_doc,s.attributes['id'] || Digest::MD5.hexdigest(Kernel::rand().to_s))
+          end
+        end
+
         multi.set(File.join(instance, 'attributes', 'uuid'), uuid)
         multi.zadd(File.join(instance, 'attributes'), -2, 'uuid')
         multi.set(File.join(instance, 'attributes', 'info'), name)
@@ -426,7 +413,7 @@ module CPEE
       redis = opts[:redis]
       name  = @p[0].value
 
-      id, uuid = NewInstance::create(opts,redis,name)
+      id, uuid = NewInstance::create(opts,redis,name,[])
       content = {
         :state => 'ready',
         :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h

data/server/executionhandlers/ruby/connection.rb

@@ -221,7 +221,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @label = parameters[:label]
     @anno = parameters.delete(:annotations) rescue nil
     @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
-    @controller.notify("activity/calling", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :annotations => @anno)
+    @controller.notify("activity/calling", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -231,6 +232,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
   def activity_manipulate_handle(parameters) #{{{
     @label = parameters[:label]
+    @anno = parameters.delete(:annotations) rescue nil
+    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
   def activity_result_value # {{{
@@ -269,7 +272,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
-      @controller.notify("status/change", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
+      @controller.notify("status/change", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :data => { :id => status.id, :message => status.message } )
     end
     unless changed_dataelements.nil? || changed_dataelements.empty?
       de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = CPEE::EvalRuby::Translation::detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue CPEE::EvalRuby::Translation::convert_to_base64(v))) }
@@ -295,7 +298,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       nil
     end
 
-    @controller.notify("activity/receiving", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
+    @controller.notify("activity/receiving", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
 
     @guard_files += result
     @guard_files += ret
@@ -430,6 +433,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     recv = 'false' unless recv
     recv = (recv == 'false' || recv == 'null' || recv == 'nil' || recv == false ? false : true)
     @controller.notify("gateway/decide", :ecid => Thread.current.__id__, :instance_uuid => @controller.uuid, :code => code, :condition => recv)
+    @controller.notify("gateway/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
     recv
   end #}}}
   def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil) #{{{

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -718,7 +718,7 @@
   </xsl:template>
   <xsl:template name="print-mcontent">
     <xsl:param name="myspace"/>
-    <xsl:if test="text()">
+    <xsl:if test="d:code/text()">
       <xsl:choose>
         <xsl:when test="@language='application/x-ruby'">
           <xsl:text> do </xsl:text>
@@ -732,7 +732,7 @@
           <xsl:text>, &lt;&lt;-END</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
+      <xsl:for-each select="str:tokenize(d:code/text(), '&#x0A;')">
         <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),str:replace(str:replace(str:replace(string(.),'\','\\'),'&quot;','\&quot;'),'#','\#')))" />
       </xsl:for-each>
       <xsl:call-template name="print-newline"/>

data/server/routing/end.pid

@@ -1 +1 @@
-91247
+2372948

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-91265
+2372966

data/server/routing/forward-events-01.pid

@@ -0,0 +1 @@
+2372972

data/server/routing/forward-events-02.pid

@@ -0,0 +1 @@
+2372978

data/server/routing/forward-events-03.pid

@@ -0,0 +1 @@
+2372984

data/server/routing/forward-events-04.pid

@@ -0,0 +1 @@
+2372990

data/server/routing/forward-events-05.pid

@@ -0,0 +1 @@
+2372996

data/server/routing/forward-events-06.pid

@@ -0,0 +1 @@
+2373002

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-91259
+2372960

data/server/routing/persist.pid

@@ -1 +1 @@
-91253
+2372954