cpee 2.0.18 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2116b2c1f931131731d1328509215edd4ee481765210015badc21334f744e4ef
-  data.tar.gz: d2dc61196bc6979eb60ad3f342358a43e3441dc20fd891d8e114b5c33f77179b
+  metadata.gz: 245c1fa5ecd451992f6fb7ba0386858bc8595f640e08c353ad153ec69e57eb14
+  data.tar.gz: 71f69beee300e44b98c70b97c06818fea60fe18685e9080f6e796d95109ee20c
 SHA512:
-  metadata.gz: 6fd16252179b91efe2f3a33f440afd9450312c39059080b8fdee165f88a1583ddb21dfa8d86d86ba2a1ab4cdec8696149a1fcf355f5bfa5980809a4efff3791a
-  data.tar.gz: dbaedb2fa0821d278e732fbf9d42fe0d7bfe43553d19f3a2595b1b19e15fe80bfb8316cccffebaab0c77004a797e15176c1f574024845de00243e23676b61cdd
+  metadata.gz: 2aac6ff87441d239b3d0c359c3a42fe489e3f6e6bf7f8363d66032a53095c818d6162db6e9d448bcf20a8cc379815bf7b126f6a2cab122381709d9cc2f387d30
+  data.tar.gz: 0acb4ca004b780c45eb46736b98b4c30c0709e22dc97e674c62a2ff5a0971447e12940b7c1fb14fdc5b5044cdb8614c6a7447e19307bb8baca6f78f9baa76ec1

data/cockpit/css/wfadaptor.css

@@ -346,6 +346,23 @@ svg text.label {
   font-family:Arial;
 }
 
+svg text.smaller {
+  font-size:12px;
+  font-style:normal;
+  font-variant:normal;
+  font-weight:bold;
+  font-stretch:normal;
+  text-align:center;
+  line-height:125%;
+  writing-mode:horizontal-tb;
+  text-anchor:middle;
+  color: var(--wfadaptor-base);
+  fill: var(--wfadaptor-base);
+  fill-opacity:1;
+  stroke:none;
+  font-family:Arial;
+}
+
 #arrow {
   stroke: var(--wfadaptor-base);
   stroke-width: 2;

data/cockpit/js/instance.js

@@ -629,9 +629,11 @@ function monitor_instance_state() {// {{{
 }// }}}
 function monitor_instance_transformation() {// {{{
   var url = $('body').attr('current-instance');
+  console.log('hallo');
+  console.log(url);
   $.ajax({
     type: "GET",
-    url: url + "/properties/attributes/modeltype",
+    url: url + "/properties/attributes/modeltype/",
     success: function(res){
       $("#currentmodel").text(res);
     },
@@ -774,7 +776,7 @@ function start_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/state",
+    url: url + "/properties/state/",
     data: ({value: "running"}),
     error: report_failure
   });
@@ -783,7 +785,7 @@ function replay_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/state",
+    url: url + "/properties/state/",
     data: ({value: "replaying"}),
     error: report_failure
   });
@@ -793,7 +795,7 @@ function aba_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/state",
+    url: url + "/properties/state/",
     data: ({value: "abandoned"}),
     error: report_failure
   });
@@ -802,7 +804,7 @@ function stop_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/state",
+    url: url + "/properties/state/",
     data: ({value: "stopping"}),
     error: report_failure
   });
@@ -838,7 +840,6 @@ function get_testset(deferred) {// {{{
       $('testset > dsl',testset).remove();
       $('testset > dslx',testset).remove();
       $('testset > attributes > uuid',testset).remove();
-      $('testset > attributes > theme',testset).remove();
       testset.append($X('<transformation xmlns="http://cpee.org/ns/properties/2.0"><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>'));
       var name =  $('testset > attributes > info',testset).text();
       $('[xmlns]',testset).each((idx,ele) => {
@@ -952,7 +953,7 @@ async function set_testset(testset,exec) {// {{{
     success: function(res){
       $.ajax({
         type: "PUT",
-        url: url + "/properties/state",
+        url: url + "/properties/state/",
         data: ({value: res}),
         error: report_failure,
         success: function(res){
@@ -1054,7 +1055,7 @@ function load_modeltype() {// {{{
     success: function(res){
       $.ajax({
         type: "PUT",
-        url: url + "/properties/attributes/modeltype",
+        url: url + "/properties/attributes/modeltype/",
         data: ({value: name}),
         success: function(){
           set_testset(res,false);

data/cockpit/templates/.CPEE.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<testset>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</testset>

data/cockpit/templates/.Signavio.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<testset>
+  <transformation>
+    <description type='rest'>http://localhost:9295/bpmn2/</description>
+    <dataelements type='rest'>http://localhost:9295/bpmn2/</dataelements>
+    <endpoints type='rest'>http://localhost:9295/bpmn2/</endpoints>
+  </transformation>
+</testset>

data/cockpit/templates/.templates.xml

@@ -0,0 +1,13 @@
+<testsets>
+  <testset>UR-VUE 2020</testset>
+  <testset>UR-VUE 2020 Solution View</testset>
+  <testset>UR-VUE 2020 Solution Baseline</testset>
+  <testset>UR-VUE 2020 Solution NN</testset>
+  <testset>Coopis 2010</testset>
+  <testset>IUPC arXiv:1104.3609 P34 1</testset>
+  <testset>IUPC arXiv:1104.3609 P34 2</testset>
+  <testset>IUPC arXiv:1104.3609 P34 3</testset>
+  <testset>Worklist</testset>
+  <testset>Track Test</testset>
+  <testset>Track Test Local</testset>
+</testsets>

data/cockpit/templates/.transformations.xml

@@ -0,0 +1,4 @@
+<transformations>
+  <transformation>CPEE</transformation>
+  <transformation>Signavio</transformation>
+</transformations>

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

@@ -8,7 +8,8 @@
       <value id="sensor">Read From Sensor</value>
       <value id="human">Human Task</value>
       <value id="subprocess">Subprocess</value>
-      <value id="robot">Robot</value>
+      <value id="robot">Robot Task</value>
+      <value id="robot_subprocess">Robot Subprocess</value>
       <value id="plc">PLC</value>
       <value id="send">Send Message</value>
       <value id="receive">Receive Message</value>

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

@@ -8,7 +8,8 @@
       <value id="sensor">Read From Sensor</value>
       <value id="human">Human Task</value>
       <value id="subprocess">Subprocess</value>
-      <value id="robot">Robot</value>
+      <value id="robot">Robot Task</value>
+      <value id="robot_subprocess">Robot Subprocess</value>
       <value id="plc">PLC</value>
       <value id="send">Send Message</value>
       <value id="receive">Receive Message</value>

data/cockpit/themes/model/theme.js

@@ -241,7 +241,7 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var ret;
         if ($('> url',$(node).children('parameters').children('arguments')).length > 0) {
-          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="blank_" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
+          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="_blank" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
         } else {
           ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
         }

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.18"
+  s.version          = "2.0.23"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/templates/.templates.xml,cockpit/templates/.transformations.xml,cockpit/templates/.Signavio.xml,cockpit/templates/.CPEE.xml,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,server/redis*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'

data/lib/cpee/controller.rb

@@ -20,6 +20,7 @@ require 'riddl/client'
 require_relative 'value_helper'
 require_relative 'attributes_helper'
 require_relative 'message'
+require_relative 'redis'
 
 require 'ostruct'
 class ParaStruct < OpenStruct
@@ -34,7 +35,9 @@ module CPEE
 
   class Controller
     def initialize(id,dir,opts)
-      @redis = Redis.new(path: opts[:redis_path], db: opts[:redis_db])
+      CPEE::redis_connect(opts)
+
+      @redis = opts[:redis]
       @votes = []
 
       @id = id
@@ -134,7 +137,7 @@ module CPEE
 
       if votes.length > 0
         @votes += votes
-        psredis = Redis.new(path: @opts[:redis_path], db: @opts[:redis_db])
+        psredis = @opts[:redis_dyn].call
         collect = []
         psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s, 'vote-end:' + e.to_s] }.flatten) do |on|
           on.message do |what, message|
@@ -158,7 +161,7 @@ module CPEE
     def callback(hw,key,content)
       CPEE::Message::send(:callback,'activity/content',base,@id,uuid,info,content.merge(:key => key),@redis)
 
-      psredis = Redis.new(path: @opts[:redis_path], db: @opts[:redis_db])
+      psredis = @opts[:redis_dyn].call
       response = nil
       Thread.new do
         psredis.subscribe('callback-response:' + key, 'callback-end:' + key) do |on|

data/lib/cpee/implementation.rb

@@ -16,6 +16,7 @@ require 'fileutils'
 require 'redis'
 require 'riddl/server'
 require 'riddl/client'
+require_relative 'redis'
 require_relative 'message'
 require_relative 'persistence'
 require_relative 'statemachine'
@@ -70,12 +71,22 @@ module CPEE
     opts[:watchdog_start_off]         ||= false
     opts[:backend_instance]           ||= 'instance.rb'
     opts[:infinite_loop_stop]         ||= 10000
-    opts[:redis_path]                 ||= '/tmp/redis.sock'
-    opts[:redis_db]                   ||= 3
-    opts[:sse_keepalive_frequency]    ||= 10
 
+    ### set redis_cmd to nil if you want to do global
+    ### at least redis_path or redis_url and redis_db have to be set if you do global
+    opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
+    opts[:redis_db]                   ||= 0
+    ### optional redis stuff
+    opts[:redis_url]                  ||= nil
+    opts[:redis_cmd]                  ||= 'redis-server --port 0 --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes'
+    opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
+    opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
+
+    CPEE::redis_connect opts
+
+    opts[:sse_keepalive_frequency]    ||= 10
     opts[:sse_connections]            = {}
-    opts[:redis]                      = Redis.new(path: opts[:redis_path], db: opts[:redis_db])
+
     opts[:statemachine]               = CPEE::StateMachine.new opts[:states], %w{running simulating replaying finishing stopping abandoned finished} do |id|
       opts[:redis].get("instance:#{id}/state")
     end
@@ -90,9 +101,9 @@ module CPEE
 
     Proc.new do
       parallel do
-        CPEE::watch_services(opts[:watchdog_start_off])
+        CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
         EM.add_periodic_timer(opts[:watchdog_frequency]) do ### start services
-          CPEE::watch_services(opts[:watchdog_start_off])
+          CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
         end
         EM.defer do ### catch all sse connections
           CPEE::Notifications::sse_distributor(opts)
@@ -132,14 +143,18 @@ module CPEE
     end
   end
 
-  def self::watch_services(watchdog_start_off)
+  def self::watch_services(watchdog_start_off,url,path,db)
     return if watchdog_start_off
      EM.defer do
        Dir[File.join(__dir__,'..','..','server','routing','*.rb')].each do |s|
          s = s.sub(/\.rb$/,'')
          pid = (File.read(s + '.pid').to_i rescue nil)
          if (pid.nil? || !(Process.kill(0, pid) rescue false)) && !File.exist?(s + '.lock')
-           system "#{s}.rb restart 1>/dev/null 2>&1"
+           if url.nil?
+             system "#{s}.rb -p \"#{path}\" -d #{db} restart 1>/dev/null 2>&1"
+           else
+             system "#{s}.rb -u \"#{url}\" -d #{db} restart 1>/dev/null 2>&1"
+           end
            puts "➡ Service #{File.basename(s,'.rb')} started ..."
          end
        end

data/lib/cpee/implementation_notifications.rb

@@ -165,7 +165,7 @@ module CPEE
     end #}}}
 
     def self::sse_distributor(opts) #{{{
-      conn = Redis.new(path: opts[:redis_path], db: opts[:redis_db])
+      conn = opts[:redis_dyn].call
       conn.psubscribe('forward:*','event:state/change') do |on|
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'

data/lib/cpee/persistence.rb

@@ -30,7 +30,8 @@ module CPEE
         YAML::dump({
           :host => opts[:host],
           :url => opts[:url],
-          :redis_path => opts[:redis_path],
+          :redis_url => opts[:redis_url],
+          :redis_path => File.join(opts[:basepath],opts[:redis_path]),
           :redis_db => opts[:redis_db],
           :global_handlerwrappers => opts[:global_handlerwrappers],
           :handlerwrappers => opts[:handlerwrappers]

data/lib/cpee/redis.rb

@@ -0,0 +1,57 @@
+# This file is part of CPEE.
+#
+# CPEE is free software: you can redistribute it and/or modify it under the terms
+# of the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
+require 'redis'
+
+module CPEE
+  def self::redis_connect(opts)
+    if opts[:redis_cmd].nil?
+      begin
+        if opts[:redis_path]
+          opts[:redis_dyn] = Proc.new { Redis.new(path: opts[:redis_path], db: opts[:redis_db]) }
+        elsif opts[:redis_url]
+          opts[:redis_dyn] = Proc.new { Redis.new(url: opts[:redis_url], db: opts[:redis_db]) }
+        else
+          raise
+        end
+        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis].dbsize
+      rescue
+        puts 'can not connect to redis. check if it is running and cpee is configured correctly ...'
+        exit
+      end
+    else # we always assume file socket if redis is startet locally
+      opts[:redis_dyn] = Proc.new { Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i) }
+      begin
+        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis].dbsize
+      rescue
+        rcmd = opts[:redis_cmd]
+        rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])
+        rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
+        rcmd.gsub! /#redis_db_name#/, opts[:redis_db_name]
+        rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
+        res = system rcmd
+        if res
+          puts 'starting redis ... it will keep running, just to let you know ...'
+          sleep 1
+          retry
+        else
+          puts 'can not start redis. check if cpee is configured correctly ...'
+          exit
+        end
+      end
+    end
+  end
+end

data/server/handlerwrappers/default.rb

@@ -109,7 +109,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
     client = Riddl::Client.new(tendpoint)
 
-    @controller.callback(self,callback,:'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
+    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
     @handler_passthrough = callback
 
     status, result, headers = client.request type => params
@@ -123,7 +123,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
         @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_-]/,'')}", :'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
       if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
         headers['CPEE_UPDATE'] = true
@@ -142,11 +142,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @sensors = parameters.dig(:stream,:sensors)
     @aggregators = parameters.dig(:stream,:aggregators)
     @costs = parameters.dig(:stream,:costs)
-    @controller.notify("activity/calling", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
-      @controller.callback(self,passthrough,:'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
+      @controller.callback(self,passthrough,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
       @handler_passthrough = passthrough
     end
   end # }}}
@@ -175,33 +175,33 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   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", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   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", :'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", :'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])
   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", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil?
-      @controller.notify("dataelements/change", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
+      @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
     end
     unless changed_endpoints.nil?
-      @controller.notify("endpoints/change", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
+      @controller.notify("endpoints/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
     end
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.vote("activity/syncing_after", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label)
+    @controller.vote("activity/syncing_after", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label)
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.vote("activity/syncing_before", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
+    @controller.vote("activity/syncing_before", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
   end # }}}
 
   def simplify_result(result)
@@ -260,13 +260,13 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
     result = simplify_result(result)
     @handler_returnValue = result
     @handler_returnOptions = options
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
-        @controller.notify("activity/status", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
+        @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
       end
       @handler_continue.continue WEEL::Signal::Again
     else
@@ -290,7 +290,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
 
     @controller.vote("simulating/step",
-      :'activity_uuid' => @handler_activity_uuid,
+      :'activity-uuid' => @handler_activity_uuid,
       :label => @label,
       :activity => tid,
       :endpoint => @handler_endpoint,