cpee 2.1.97 → 2.1.99

data/cockpit/themes/reduced/symbols/complex.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
   <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
   <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
   <line x1="8.5" y1="15.5" x2="22.5" y2="15.5" class="stand"/>

data/cockpit/themes/reduced/symbols/critical.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
+  <path class="colorstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
   <path class="normal" style="fill:#000000;" d="m 16.5 11 l 0 8 l -2 0 l 0 -8 z"/>
   <path class="normal" style="fill:#000000;" d="m 16.5 21 l 0 2 l -2 0 l 0 -2 z"/>
 </svg>

data/cockpit/themes/reduced/symbols/escape.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand markstyle hoverstyle"/>
-  <circle cx="15" cy="15" r="11" class="stand markstyle colorstyle"/>
+  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="11" class="stand colorstyle"/>
   <polygon points="10.5,20.5 15,8.5 20.5,20.5 15,15.5 10.5,20.5" class="black"/>
 </svg>

data/cockpit/themes/reduced/symbols/event_end.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle execstyle hoverstyle markstyle standfat"/>
+  <circle cx="15" cy="15" r="14" class="colorstyle execstyle standfat"/>
 </svg>

data/cockpit/themes/reduced/symbols/loop.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
-    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
     <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
     <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
   </g>
   <g class="part-start">
-    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
     <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
     <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
   </g>

data/cockpit/themes/reduced/symbols/loop_end.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
-    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
     <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
     <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
   </g>
   <g class="part-start">
-    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
     <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
     <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
   </g>

data/cockpit/themes/reduced/symbols/manipulate.svg

@@ -1,19 +1,19 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
-    <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
+    <rect x="1" y="1" width="28" height="28" rx="4" class="execstyle colorstyle stand"/>
     <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-start" clip-path="url(#startclip)">
-    <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
+    <rect x="1" y="1" width="38" height="28" rx="4" class="execstyle colorstyle stand"/>
     <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-end" clip-path="url(#endclip)">
-    <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
+    <rect x="1" y="1" width="28" height="28" rx="4" class="execstyle colorstyle stand"/>
   </g>
   <g class="part-middle" transform="translate(27,0)">
     <rect x="0" y="1" width="220" height="28" class="standwithout colorstyle"/>
-    <line x1="0" y1="1" x2="220" y2="1" class="standline markstyle hoverstyle execstyle" />
-    <line x1="0" y1="29" x2="220" y2="29" class="standline markstyle hoverstyle execstyle" />
+    <line x1="0" y1="1" x2="220" y2="1" class="standline execstyle" />
+    <line x1="0" y1="29" x2="220" y2="29" class="standline execstyle" />
     <text transform="translate(0,20)" class="label"></text>
   </g>
 </svg>

data/cockpit/themes/reduced/symbols/otherwise.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="11" class="standtrans"/>
-  <line x1="9" y1="21" x2="21" y2="9" class="stand markstyle hoverstyle"/>
+  <line x1="9" y1="21" x2="21" y2="9" class="stand"/>
   <line x1="15.6" y1="4" x2="15.6" y2="27" class="edge"/>
 </svg>

data/cockpit/themes/reduced/symbols/parallel.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
   <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
   <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
 </svg>

data/cockpit/themes/reduced/symbols/parallel_branch.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="11" y="6" width="9" height="18" rx="0" class="white"/>
-  <path class="markstyle hoverstyle stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <path class="stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
   <line x1="15.6" y1="4" x2="15.6" y2="27" class="edge"/>
 </svg>

data/cockpit/themes/reduced/symbols/parallel_branch_event.svg

@@ -1,13 +1,13 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="3" width="24" height="24" rx="4" class="colorstyle hoverstyle execstyle markstyle stand"/>
+  <rect x="1" y="3" width="24" height="24" rx="4" class="colorstyle execstyle stand"/>
 
-  <circle cx="24" cy="15" r="9" class="markstyle execstyle standthin" style="stroke-dasharray: 1,2"/>
-  <circle cx="24" cy="15" r="7" class="markstyle execstyle standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="9" class="execstyle standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="execstyle standthin" style="stroke-dasharray: 1,2"/>
   <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
   <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
   <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
 
-  <circle cx="55.5" cy="15" r="14" class="colorstyle markstyle hoverstyle execstyle stand"/>
+  <circle cx="55.5" cy="15" r="14" class="colorstyle execstyle stand"/>
   <line x1="55.5" y1="11" x2="51.5" y2="18" class="stand"/>
   <line x1="51.5" y1="18" x2="59.5" y2="18" class="stand"/>
   <line x1="59.5" y1="18" x2="55.5" y2="11" class="stand"/>

data/cockpit/themes/reduced/symbols/parallel_branch_normal.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="11" y="6" width="9" height="18" rx="0" class="white"/>
-  <path class="markstyle hoverstyle stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <path class="stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
   <line x1="15.6" y1="4" x2="15.6" y2="27" class="edge"/>
 </svg>

data/cockpit/themes/reduced/symbols/parallel_eventbased_exclusive.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
   <circle cx="15.5" cy="15.5" r="8" class="standthin colorstyle"/>
   <circle cx="15.5" cy="15.5" r="6" class="standthin colorstyle"/>
   <path

data/cockpit/themes/reduced/symbols/parallel_eventbased_parallel.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle stand"/>
   <circle cx="15.5" cy="15.5" r="8" class="standthin colorstyle"/>
   <circle cx="15.5" cy="15.5" r="6" class="standthin colorstyle"/>
   <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>

data/cockpit/themes/reduced/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="execstyle stand"/>
   <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
 </svg>

data/cockpit/themes/reduced/symbols/start.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle markstyle hoverstyle execstyle stand"/>
+  <circle cx="15" cy="15" r="14" class="colorstyle execstyle stand"/>
 </svg>

data/cockpit/themes/reduced/symbols/start_event.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle hoverstyle execstyle markstyle stand"/>
+  <circle cx="15" cy="15" r="14" class="colorstyle execstyle stand"/>
   <rect x="7" y="10" width="16" height="11" class="black" style="fill: none"/>
   <path d="m 7,10 8,6 8,-6" class="black" style="fill: none"/>
 </svg>

data/cockpit/themes/reduced/symbols/stop.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15.5" cy="15.5" r="14" class="colorstyle hoverstyle execstyle markstyle stand"/>
+  <circle cx="15.5" cy="15.5" r="14" class="colorstyle execstyle stand"/>
   <line x1="12.5" y1="22.5" x2="12.5" y2="8.5" class="stand"/>
   <line x1="17.5" y1="22.5" x2="17.5" y2="8.5" class="stand"/>
 </svg>

data/cockpit/themes/reduced/symbols/wait_for_signal.svg

@@ -1,14 +1,14 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
-    <circle cx="15.5" cy="15" r="14" class="markstyle hoverstyle stand"/>
-    <circle cx="15.5" cy="15" r="11" class="colorstyle markstyle execstyle stand"/>
+    <circle cx="15.5" cy="15" r="14" class="stand"/>
+    <circle cx="15.5" cy="15" r="11" class="colorstyle execstyle stand"/>
     <line x1="15.5" y1="08" x2="09.5" y2="19" class="stand"/>
     <line x1="09.5" y1="19" x2="21.5" y2="19" class="stand"/>
     <line x1="21.5" y1="19" x2="15.5" y2="08" class="stand"/>
   </g>
   <g class="part-start">
-    <circle cx="15.5" cy="15" r="14" class="markstyle hoverstyle stand"/>
-    <circle cx="15.5" cy="15" r="11" class="colorstyle markstyle execstyle stand"/>
+    <circle cx="15.5" cy="15" r="14" class="stand"/>
+    <circle cx="15.5" cy="15" r="11" class="colorstyle execstyle stand"/>
     <line x1="15.5" y1="08" x2="09.5" y2="19" class="stand"/>
     <line x1="09.5" y1="19" x2="21.5" y2="19" class="stand"/>
     <line x1="21.5" y1="19" x2="15.5" y2="08" class="stand"/>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.97"
+  s.version          = "2.1.99"
   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,7 +22,7 @@ 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.126'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.146'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'

data/server/executionhandlers/eval/backend/{run → run.rb}

@@ -1,5 +1,3 @@
-#!/usr/bin/ruby
-require 'rbtrace'
 require 'yaml'
 opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
 opts[:pidf] = __FILE__ + '.pid'

data/server/executionhandlers/eval/connection.rb

@@ -36,31 +36,39 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::inform_syntax_error(arguments,err,code)# {{{
     # TODO extract spot (code) where error happened for better error handling (ruby 3.1 only)
     # https://github.com/rails/rails/pull/45818/commits/3beb2aff3be712e44c34a588fbf35b79c0246ca5
-    puts err.message
-    puts err.backtrace
     controller = arguments[0]
-    mess = err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : ''
-    mess += err.message
-    controller.notify("description/error", :message => mess)
+    begin
+      controller.notify("description/error", :message => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):\s(.*)/)[4] + err.message, :line => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[3], :where => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[1])
+    rescue => e
+      controller.notify("description/error", :message => err.message)
+    end
   end# }}}
   def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
-    puts err.message
-    puts err.backtrace
-    controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') + err.message)
+    begin
+      if err.backtrace[0] !~ /, Line/
+        controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/(Activity a\d+)/,'\1:'), :line => -1, :where => err.backtrace[0].match(/Activity a\d+/)[0])
+      else
+        controller.notify("executionhandler/error", :message => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):\s(.*)/)[4] + err.message, :line => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[3], :where => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[1])
+      end
+    rescue => e
+      controller.notify("executionhandler/error", :message => err.message)
+    end
   end # }}}
   def self::inform_position_change(arguments,ipc={}) # {{{
     controller = arguments[0]
     controller.notify("position/change", ipc)
   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)
+  end # }}}
 
   def initialize(arguments,position=nil,continue=nil) # {{{
     @controller = arguments[0]
     @handler_continue = continue
     @handler_position = position
     @handler_passthrough = nil
-    @handler_returnValue = nil
-    @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
     @guard_files = []
@@ -74,6 +82,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         'base' => @controller.base_url,
         'instance' => @controller.instance_id,
         'instance_url' => @controller.instance_url,
+        'instance_url_encoded' => Riddl::Protocols::Utils::escape(@controller.instance_url),
         'instance_uuid' => @controller.uuid
       },
       :task => {
@@ -112,7 +121,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
     params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
     params << Riddl::Header.new("CPEE-LABEL",@label||'')
-    params << Riddl::Header.new("CPEE-TWIN-TARGET",@controller.attributes['twin_target']) if @controller.attributes['twin_target']
+    params << Riddl::Header.new("CPEE-SIM-TARGET",@controller.attributes['sim_target']) if @controller.attributes['sim_target']
     @controller.attributes.each do |key,value|
       params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
     end
@@ -131,11 +140,11 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @guard_files += result
 
       if status == 561
-        if @controller.attributes['twin_translate']
-          gettrans = Riddl::Client.new(@controller.attributes['twin_translate'])
+        if @controller.attributes['sim_translate']
+          gettrans = Riddl::Client.new(@controller.attributes['sim_translate'])
           gtstatus, gtresult, gtheaders = gettrans.get
           if gtstatus >= 200 && gtstatus < 300
-            transwhat = case headers['CPEE-TWIN-TASKTYPE']
+            transwhat = case headers['CPEE-SIM-TASKTYPE']
               when 'i'; 'instantiation'
               when 'ir'; 'ipc-receive'
               when 'is'; 'ipc-send'
@@ -155,20 +164,25 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
                       a[k_ht] = headers[hname] if headers[hname]
                     end
                   end
-                  params.each do |p|
-                    if p.name == k
-                      if a.is_a? String
-                        p.value = a
-                      elsif a.is_a? Hash
-                        ohash = JSON::parse(p.value) rescue {}
-                        ohash.merge!(a)
-                        p.value = JSON.generate(ohash)
-                      end
-                    end
+                  p = params.find{|p| p.name == k }
+                  if p.nil?
+                    p = Riddl::Parameter::Simple.new(k,'{}')
+                    params << p
+                  end
+
+                  if a.is_a? String
+                    p.value = a
+                  elsif a.is_a? Hash
+                    ohash = JSON::parse(p.value) rescue {}
+                    ohash.merge!(a)
+                    p.value = JSON.generate(ohash)
                   end
                 end
               end
             end
+
+            order = { 'behavior' => 1, 'url' => 2, 'init' => 3, 'endpoints' => 4, 'attributes' => 5, 'customization' => 6 }
+            params.sort!{|a,b| order[a.name].to_i <=> order[b.name].to_i }
           end
         else
           @handler_endpoint = @handler_endpoint_orig
@@ -188,10 +202,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", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(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']))
         end
         if headers['CPEE_EVENT']
-          @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
+          @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)
         end
         # do nothing, later on things will happend
       else
@@ -205,7 +219,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", :'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
@@ -215,15 +230,10 @@ 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 # {{{
-    @handler_returnValue
-  end # }}}
-  def activity_result_options # {{{
-    @handler_returnOptions
-  end # }}}
-
   def activity_stop # {{{
     unless @handler_passthrough.nil?
       @controller.cancel_callback(@handler_passthrough)
@@ -242,20 +252,18 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @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)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("activity/manipulating", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
-    puts err.message
-    puts err.backtrace
-    @controller.notify("activity/failed", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @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])
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
-      @controller.notify("status/change", :'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))) }
@@ -275,33 +283,39 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   def callback(result=nil,options={}) #{{{
     recv = CPEE::EvalRuby::Translation::structurize_result(result)
-    @controller.notify("activity/receiving", :'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
 
     if 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']))
+      @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']))
     end
     if options['CPEE_EVENT']
-      @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
-    else
-      @handler_returnValue = recv
-      @handler_returnOptions = options
+      @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)
     end
     if options['CPEE_STATUS']
-      @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => 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'])
+    end
+
+    if options['CPEE_STATUS'] || options['CPEE_EVENT']
+      returnValue = nil
+      returnOptions = nil
+    else
+      returnValue = recv
+      returnOptions = options
     end
+
     if options['CPEE_UPDATE']
-      @handler_continue.continue WEEL::Signal::UpdateAgain
+      @handler_continue.continue WEEL::Signal::UpdateAgain, returnValue, returnOptions
     else
       @controller.cancel_callback(@handler_passthrough)
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
-        @handler_continue.continue WEEL::Signal::Salvage
+        @handler_continue.continue WEEL::Signal::Salvage, returnValue, returnOptions
       elsif options['CPEE_STOP']
-        @handler_continue.continue WEEL::Signal::Stop
+        @handler_continue.continue WEEL::Signal::Stop, returnValue, returnOptions
       else
-        @handler_continue.continue
+        @handler_continue.continue WEEL::Signal::Proceed, returnValue, returnOptions
       end
     end
   end #}}}
@@ -342,7 +356,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
   def test_condition(__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
     __struct = WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional).instance_eval(__code,'Condition',1)
-    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => __code, :condition => (__struct ? "true" : "false"))
+
+    @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 => {})
     __struct
   end #}}}
   def manipulate(__readonly,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__where,__result=nil,__options=nil) #{{{
@@ -356,10 +372,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     __struct
   end #}}}
 
-  def split_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]{{{
-    @controller.notify("gateway/split", :instance_uuid => @controller.uuid, :branches => branches)
+  def split_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
+    payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
+    payload[:branches] = branches.length if branches.length > 0
+    @controller.notify("gateway/split", payload )
   end #}}}
-  def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]{{{
-    @controller.notify("gateway/join", :instance_uuid => @controller.uuid, :branches => branches)
+  def join_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
+    payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
+    payload[:branches] = branches if branches.length > 0
+    payload[:branches_length] = branches.length if branches.length > 0
+    @controller.notify("gateway/join", payload )
   end #}}}
 end

data/server/executionhandlers/eval/controller.rb

@@ -125,6 +125,12 @@ class Controller
   def dataelements
     @instance.data
   end
+  def url_result_transformation
+    @opts[:url_result_transformation]
+  end
+  def url_code
+   @opts[:url_code]
+  end
 
   def start
     if vote("state/change", :state => 'running')