cpee 2.1.106 → 2.1.108

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

@@ -1,5 +1,5 @@
 <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()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="label" rngui:label="Label">

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min in %">
       <data type="integer" rngui:label="Percent 0-100">
@@ -19,4 +22,4 @@
       </data>
     </element>
   </element>
-</element>
+</element>

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>

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

@@ -1,2 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel_branch" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
 </element>

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

@@ -1,5 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="stop" 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()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
-</element>
+</element>

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

@@ -1 +1,5 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="terminate" 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="terminate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+</element>

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

@@ -1,5 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="wait_for_signal" 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()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <element name="label" rngui:label="Label">

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <attribute name="condition" rngui:label="Condition">
     <data type="string" rngui:label="Condition"/>
   </attribute>
@@ -22,4 +25,4 @@
       </data>
     </element>
   </element>
-</element>
+</element>

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

@@ -1,5 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">

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

@@ -1,5 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="choose" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <attribute name="mode" rngui:label="Mode" rngui:default="exclusive">
     <choice>
       <value>exclusive</value>

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

@@ -1,5 +1,8 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="critical" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <attribute name="sid" rngui:label="SID" rngui:default="section" rngui:hint="Identical SID's shared by between differnt 'critical' elements define mutual exclusive areas.">
     <data type="string"/>
   </attribute>
-</element>
+</element>

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

@@ -1 +1,5 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="escape" 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="escape" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+</element>

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <attribute name="mode" rngui:label="Mode" rngui:default="pre_test">
     <choice>
       <value>pre_test</value>

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

@@ -1,5 +1,5 @@
 <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()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="label" rngui:label="Label">

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min in %">
       <data type="integer" rngui:label="Percent 0-100">
@@ -19,4 +22,4 @@
       </data>
     </element>
   </element>
-</element>
+</element>

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

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>

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

@@ -1,2 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel_branch" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
 </element>

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

@@ -1,5 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="stop" 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()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
-</element>
+</element>

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

@@ -1 +1,5 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="terminate" 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="terminate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+</element>

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

@@ -1,5 +1,5 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="wait_for_signal" 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()">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id('a','id')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <element name="label" rngui:label="Label">

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.106"
+  s.version          = "2.1.108"
   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."
@@ -22,9 +22,11 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.146'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.148'
   s.add_runtime_dependency 'highline', '~> 2.0'
-  s.add_runtime_dependency 'redis', '~> 5.0'
+  s.add_runtime_dependency 'redis', '~> 5.4'
+  s.add_runtime_dependency 'net-ssh', '~> 7.3'
+  s.add_runtime_dependency 'net-scp', '~> 4.1'
   s.add_runtime_dependency 'rubyzip', '~>2'
   s.add_runtime_dependency 'charlock_holmes', '~>0'
   s.add_runtime_dependency 'mimemagic', '~>0'

data/server/executionhandlers/eval/connection.rb

@@ -15,7 +15,6 @@
 require 'charlock_holmes'
 require 'mimemagic'
 require 'base64'
-require 'get_process_mem'
 require 'cpee-eval-ruby/translation'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
@@ -61,7 +60,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
   def self::inform_activity_minimal(arguments,what,uuid,label,position) # {{{
     controller = arguments[0]
-    controller.notify("activity/#{what}", :ecid => Thread.current.__id__, :'activity-uuid' => uuid, :label => label, :activity => position)
+    controller.notify("activity/#{what}", :'activity-uuid' => uuid, :label => label, :activity => position)
   end # }}}
 
   def initialize(arguments,position=nil,continue=nil) # {{{
@@ -202,10 +201,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         callback result, headers
       elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
         if headers['CPEE_INSTANTIATION']
-          @controller.notify("task/instantiation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
+          @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
         end
         if headers['CPEE_EVENT']
-          @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
+          @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
         end
         # do nothing, later on things will happend
       else
@@ -218,9 +217,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
     @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)
-    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
+    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("activity/annotation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -231,7 +229,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   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)
+    @controller.notify("activity/annotation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
   def activity_stop # {{{
@@ -252,18 +250,17 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
-    @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
+    @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
-    @controller.notify("activity/failed", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.backtrace[0].match(/(.*?):(\d+):\s(.*)/)[3], :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("activity/failed", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.backtrace[0].match(/(.*?):(\d+):\s(.*)/)[3], :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   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, :data => { :id => status.id, :message => status.message } )
+      @controller.notify("status/change", :'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))) }
@@ -283,18 +280,18 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   def callback(result=nil,options={}) #{{{
     recv = CPEE::EvalRuby::Translation::structurize_result(result)
-    @controller.notify("activity/receiving", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
 
     @guard_files += result
 
     if options['CPEE_INSTANTIATION']
-      @controller.notify("task/instantiation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(options['CPEE_INSTANTIATION']))
+      @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(options['CPEE_INSTANTIATION']))
     end
     if options['CPEE_EVENT']
-      @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
+      @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
     end
     if options['CPEE_STATUS']
-      @controller.notify("activity/status", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_STATUS'])
+      @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_STATUS'])
     end
 
     if options['CPEE_STATUS'] || options['CPEE_EVENT']
@@ -339,9 +336,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional)
     end
     @handler_endpoint = __exec_endpoints.is_a?(Array) ? __exec_endpoints.map{ |ep| __struct.endpoints[ep] }.compact : __struct.endpoints[__exec_endpoints]
-    if @controller.attributes['twin_engine']
+    if @controller.attributes['sim_engine']
       @handler_endpoint_orig = @handler_endpoint
-      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
+      @handler_endpoint = @controller.attributes['sim_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
     __params = __exec_parameters.dup
     __params[:arguments] = __params[:arguments].dup if __params[:arguments]
@@ -354,11 +351,11 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
     __params
   end #}}}
-  def test_condition(__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
+  def test_condition(__eid,__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
     __struct = WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional).instance_eval(__code,'Condition',1)
 
-    @controller.notify("gateway/decide", :ecid => Thread.current.__id__, :instance_uuid => @controller.uuid, :code => __code, :condition => (__struct ? "true" : "false"))
-    @controller.notify("gateway/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
+    @controller.notify("gateway/decide", :eid => __eid, :instance_uuid => @controller.uuid, :code => __code, :condition => (__struct ? "true" : "false"))
+    @controller.notify("gateway/annotation", :eid => __eid, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
     __struct
   end #}}}
   def manipulate(__readonly,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__where,__result=nil,__options=nil) #{{{
@@ -372,13 +369,13 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     __struct
   end #}}}
 
-  def split_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
-    payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
+  def split_branches(eid, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
+    payload = { :instance_uuid => @controller.uuid, :eid => eid.to_s }
     payload[:branches] = branches.length if branches.length > 0
     @controller.notify("gateway/split", payload )
   end #}}}
-  def join_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
-    payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
+  def join_branches(eid, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
+    payload = { :instance_uuid => @controller.uuid, :eid => eid.to_s }
     payload[:branches] = branches if branches.length > 0
     payload[:branches_length] = branches.length if branches.length > 0
     @controller.notify("gateway/join", payload )

data/server/executionhandlers/eval/dsl_to_dslx.xsl

@@ -110,6 +110,19 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>terminate</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='stop'">
@@ -145,6 +158,19 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>escape</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='parallel'">
@@ -155,8 +181,21 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>parallel</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:if test="@wait">
-        <xsl:text> :wait =&gt; </xsl:text>
+        <xsl:text>, :wait =&gt; </xsl:text>
         <xsl:value-of select="@wait"/>
         <xsl:if test="@cancel">
           <xsl:text>, :cancel =&gt; :</xsl:text>
@@ -186,16 +225,29 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>loop </xsl:text>
+      <xsl:text>loop</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:if test="@mode='pre_test'">
         <xsl:choose>
           <xsl:when test="@language='application/x-ruby'">
-            <xsl:text>pre_test{</xsl:text>
+            <xsl:text>, pre_test{</xsl:text>
             <xsl:value-of select="@condition"/>
             <xsl:text>} </xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>pre_test("</xsl:text>
+            <xsl:text>, pre_test("</xsl:text>
             <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:otherwise>
@@ -204,12 +256,12 @@
       <xsl:if test="@mode='post_test'">
         <xsl:choose>
           <xsl:when test="@language='application/x-ruby'">
-            <xsl:text>post_test{</xsl:text>
+            <xsl:text>, post_test{</xsl:text>
             <xsl:value-of select="@condition"/>
             <xsl:text>} </xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>post_test("</xsl:text>
+            <xsl:text>, post_test("</xsl:text>
             <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:otherwise>
@@ -306,13 +358,26 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>choose </xsl:text>
+      <xsl:text>choose</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:choose>
         <xsl:when test="@mode='exclusive'">
-          <xsl:text>:exclusive</xsl:text>
+          <xsl:text>, :exclusive</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>:inclusive</xsl:text>
+          <xsl:text>, :inclusive</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:text> do</xsl:text>
@@ -346,7 +411,21 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>critical :</xsl:text>
+      <xsl:text>critical</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:text>, :</xsl:text>
       <xsl:value-of select="@sid"/>
       <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
@@ -373,15 +452,28 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>alternative </xsl:text>
+    <xsl:text>alternative</xsl:text>
+    <xsl:choose>
+      <xsl:when test="@eid">
+        <xsl:text> :</xsl:text>
+        <xsl:value-of select="@eid"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> :e</xsl:text>
+        <xsl:for-each select="ancestor-or-self::*">
+          <xsl:text>_</xsl:text>
+          <xsl:value-of select="position()"/>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:choose>
       <xsl:when test="@language='application/x-ruby'">
-        <xsl:text>test{</xsl:text>
+        <xsl:text>, test{</xsl:text>
         <xsl:value-of select="@condition"/>
         <xsl:text>}</xsl:text>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>test("</xsl:text>
+        <xsl:text>, test("</xsl:text>
         <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
         <xsl:text>")</xsl:text>
       </xsl:otherwise>
@@ -418,7 +510,20 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>otherwise </xsl:text>
+      <xsl:text>otherwise</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:for-each select="@*[not(name()='language' or name()='condition' or name()='svg-label')]">
         <xsl:if test="position() &gt;1">, </xsl:if>
         <xsl:text>:</xsl:text>
@@ -452,7 +557,21 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch do |local|</xsl:text>
+    <xsl:text>parallel_branch</xsl:text>
+    <xsl:choose>
+      <xsl:when test="@eid">
+        <xsl:text> :</xsl:text>
+        <xsl:value-of select="@eid"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> :e</xsl:text>
+        <xsl:for-each select="ancestor-or-self::*">
+          <xsl:text>_</xsl:text>
+          <xsl:value-of select="position()"/>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text> do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
@@ -494,7 +613,6 @@
     <xsl:text>:</xsl:text>
     <xsl:value-of select="name()"/>
     <xsl:text> =&gt; </xsl:text>
-
     <xsl:choose>
       <xsl:when test="count(*) &gt; 0 and name()='arguments'">
         <xsl:text>[</xsl:text>