cpee 2.1.93 → 2.1.95

data/cockpit/themes/packed/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/packed/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/packed/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/packed/rngs/manipulate.rng

@@ -20,4 +20,11 @@
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <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>
 </element>

data/cockpit/themes/preset/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/preset/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/preset/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/preset/rngs/manipulate.rng

@@ -20,4 +20,11 @@
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <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>
 </element>

data/cockpit/themes/presetaltid/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/presetaltid/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/presetaltid/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/presetaltid/rngs/manipulate.rng

@@ -20,4 +20,11 @@
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <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>
 </element>

data/cockpit/themes/presetaltid/theme.js

@@ -4,13 +4,13 @@ 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.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.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') + ')' } ];
     }; //}}}
   }
 }

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

@@ -20,4 +20,11 @@
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <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>
 </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

@@ -20,4 +20,11 @@
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <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>
 </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.95"
   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 # {{{
@@ -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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.93
+  version: 2.1.95
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -208,26 +208,27 @@ files:
 - cockpit/contrib/transformation1.xsl
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
+- cockpit/css/extended_columns-label.css
+- cockpit/css/extended_columns-svg.css
 - cockpit/css/graph.css
 - cockpit/css/llm.css
 - cockpit/css/model.css
-- cockpit/css/resources-label.css
-- cockpit/css/resources-svg.css
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
+- cockpit/david.html
 - cockpit/edit.html
 - cockpit/graph.html
 - cockpit/index.html
 - cockpit/js/details.js
 - cockpit/js/edit.js
+- cockpit/js/extended_columns.js
 - cockpit/js/instance.js
 - cockpit/js/llm.js
 - cockpit/js/llm_alternative.js
 - cockpit/js/model.js
 - cockpit/js/modifiers.js
 - cockpit/js/parameters.js
-- cockpit/js/resources.js
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
@@ -1052,6 +1053,12 @@ files:
 - server/routing/end.pid
 - server/routing/end.rb
 - server/routing/forward-events-00.pid
+- server/routing/forward-events-01.pid
+- server/routing/forward-events-02.pid
+- server/routing/forward-events-03.pid
+- server/routing/forward-events-04.pid
+- server/routing/forward-events-05.pid
+- server/routing/forward-events-06.pid
 - server/routing/forward-events.rb
 - server/routing/forward-votes.pid
 - server/routing/forward-votes.rb