cpee 2.1.51 → 2.1.53

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

@@ -4,16 +4,16 @@
   </attribute>
   <attribute name="endpoint" rngui:label="Type">
     <choice>
-      <value id="machine">Machine Invocation</value>
-      <value id="sensor">Read From Sensor</value>
-      <value id="human">Human Task</value>
-      <value id="subprocess">Subprocess</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>
-      <value id="wait">Wait</value>
+      <value rngui:label="Machine Invocation">machine</value>
+      <value rngui:label="Read From Sensor">sensor</value>
+      <value rngui:label="Human Task">human</value>
+      <value rngui:label="Subprocess">subprocess</value>
+      <value rngui:label="Robot Task">robot</value>
+      <value rngui:label="Robot Subprocess">robot_subprocess</value>
+      <value rngui:label="PLC">plc</value>
+      <value rngui:label="Send Message">send</value>
+      <value rngui:label="Receive Message">receive</value>
+      <value rngui:label="Wait">wait</value>
     </choice>
   </attribute>
   <element name="parameters" rngui:header="Properties">

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

@@ -4,16 +4,16 @@
   </attribute>
   <attribute name="endpoint" rngui:label="Type">
     <choice>
-      <value id="machine">Machine Invocation</value>
-      <value id="sensor">Read From Sensor</value>
-      <value id="human">Human Task</value>
-      <value id="subprocess">Subprocess</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>
-      <value id="wait">Wait</value>
+      <value rngui:label="Machine Invocation">machine</value>
+      <value rngui:label="Read From Sensor">sensor</value>
+      <value rngui:label="Human Task">human</value>
+      <value rngui:label="Subprocess">subprocess</value>
+      <value rngui:label="Robot Task">robot</value>
+      <value rngui:label="Robot Subprocess">robot_subprocess</value>
+      <value rngui:label="PLC">plc</value>
+      <value rngui:label="Send Message">send</value>
+      <value rngui:label="Receive Message">receive</value>
+      <value rngui:label="Wait">wait</value>
     </choice>
   </attribute>
   <element name="parameters" rngui:header="Properties">

data/cockpit/themes/model/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,13 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1375,7 +1385,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -96,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -120,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/packed/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/packed/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,13 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1443,7 +1453,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -96,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -120,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -4,8 +4,8 @@
   </attribute>
   <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
     <choice>
-      <value id='last'>After Last Task in Branch</value>
-      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/preset/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/preset/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,14 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      // only after setting content can we set the focus and position. It might loose some stuff nonetheless.
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1444,7 +1455,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.51"
+  s.version          = "2.1.53"
   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."
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.126'
+  s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.111'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'

data/lib/cpee/implementation.rb

@@ -91,7 +91,7 @@ module CPEE
     opts[:sse_keepalive_frequency]    ||= 10
     opts[:sse_connections]            = {}
 
-    opts[:statemachine]               = CPEE::StateMachine.new opts[:states], %w{running simulating replaying finishing stopping abandoned finished} do |id|
+    opts[:statemachine]               = CPEE::StateMachine.new opts[:states], %w{running simulating finishing stopping abandoned finished} do |id|
       CPEE::Persistence::extract_item(id,opts,"state")
     end
 

data/lib/cpee/implementation_properties.rb

@@ -125,7 +125,12 @@ module CPEE
           doc.find('/p:properties/p:dslx').first.add XML::Smart::string(val).root rescue nil
         end #}}}
         if val = CPEE::Persistence::extract_item(id,opts,'description') #{{{
-          doc.find('/p:properties/p:description').first.add XML::Smart::string(val).root rescue nil
+          d = XML::Smart::string(val).root rescue nil
+          if d.nil?
+            doc.find('/p:properties/p:description').first.text = val
+          else
+            doc.find('/p:properties/p:description').first.add d
+          end
         end #}}}
         doc.find('/p:properties/p:transformation/p:description').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/description')
         doc.find('/p:properties/p:transformation/p:dataelements').first.text = CPEE::Persistence::extract_item(id,opts,'transformation/dataelements')
@@ -648,21 +653,26 @@ module CPEE
 
     class PutDescription < Riddl::Implementation #{{{
       def self::transform(descxml,tdesc,tdesctype,tdata,tdatatype,tendp,tendptype,hw,opts) #{{{
-        desc = XML::Smart::string(descxml)
-        desc.register_namespace  'p', 'http://cpee.org/ns/description/1.0'
+        desc = XML::Smart::string(descxml) rescue nil
+        if desc.nil?
+          if descxml.empty?
+            tdesctype = tdatatype = tendptype = 'clean'
+          end
+        else
+          desc.register_namespace  'p', 'http://cpee.org/ns/description/1.0'
+          if desc.root.children.empty?
+            tdesctype = tdatatype = tendptype = 'clean'
+          end
+        end
 
         dslx = nil
         dsl = nil
         de = {}
         ep = {}
 
-        if desc.root.children.empty?
-          tdesctype = tdatatype = tendptype = 'clean'
-        end
-
         ### description transformation, including dslx to dsl
         addit = if tdesctype == 'copy' || tdesc.empty?
-          desc
+          desc || ''
         elsif tdesctype == 'rest' && !tdesc.empty?
           srv = Riddl::Client.interface(tdesc,opts[:transformation_service])
           status, res = srv.post [
@@ -670,15 +680,15 @@ module CPEE
             Riddl::Parameter::Simple.new("type","description")
           ]
           if status >= 200 && status < 300
-            XML::Smart::string(res[0].value.read).root
+            XML::Smart::string(res[0].value.read)
           else
             raise 'Could not extract dslx'
           end
         elsif tdesctype == 'xslt' && !tdesc.empty?
           trans = XML::Smart::open_unprotected(tdesc)
-          desc.transform_with(trans).root
+          desc.transform_with(trans)
         elsif tdesctype == 'clean'
-          XML::Smart::open_unprotected(opts[:empty_dslx]).root
+          XML::Smart::open_unprotected(opts[:empty_dslx])
         else
           nil
         end
@@ -689,7 +699,7 @@ module CPEE
 
         ### dataelements extraction
         addit = if tdatatype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tdata,@opts[:transformation_service])
+          srv = Riddl::Client.interface(tdata,opts[:transformation_service])
           status, res = srv.post [
             Riddl::Parameter::Complex.new("description","text/xml",descxml),
             Riddl::Parameter::Simple.new("type","dataelements")
@@ -715,7 +725,7 @@ module CPEE
 
         ### endpoints extraction
         addit = if tendptype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tendp,@opts[:transformation_service])
+          srv = Riddl::Client.interface(tendp,opts[:transformation_service])
           status, res = srv.post [
             Riddl::Parameter::Complex.new("description","text/xml",descxml),
             Riddl::Parameter::Simple.new("type","endpoints")

data/lib/cpee/message.rb

@@ -15,8 +15,20 @@
 module CPEE
 
   module Message
-    WHO = 'cpee'
-    TYPE = 'instance'
+    @@who = 'cpee'
+    @@type = 'instance'
+    def self::who #{{{
+      @@who
+    end #}}}
+    def self::who=(it) #{{{
+      @@who = it
+    end #}}}
+    def self::type #{{{
+      @@type
+    end #}}}
+    def self::type=(it) #{{{
+      @@type = it
+    end #}}}
 
     def self::set_workers(workers)
       @@tworkers = (workers < 1 && workers > 99 ? 1 : workers).freeze
@@ -32,17 +44,17 @@ module CPEE
       topic = ::File::dirname(event)
       name = ::File::basename(event)
       payload = {
-        WHO => cpee,
-        TYPE + '-url' => File.join(cpee,instance.to_s),
-        TYPE => instance,
+        @@who => cpee,
+        @@type + '-url' => File.join(cpee,instance.to_s),
+        @@type => instance,
         'topic' => topic,
         'type' => type,
         'name' => name,
         'timestamp' =>  Time.now.xmlschema(3),
         'content' => content
       }
-      payload[TYPE + '-uuid'] = instance_uuid if instance_uuid
-      payload[TYPE + '-name'] = instance_name if instance_name
+      payload[@@type + '-uuid'] = instance_uuid if instance_uuid
+      payload[@@type + '-name'] = instance_name if instance_name
 
       backend.publish(type.to_s + ':' + target + ':' + event.to_s,
         instance.to_s + ' ' +
@@ -55,7 +67,7 @@ module CPEE
         topic = ::File::dirname(event)
         name = ::File::basename(event)
         payload = {
-          WHO => cpee,
+          @@who => cpee,
           'topic' => topic,
           'type' => type,
           'name' => name,

data/lib/cpee/persistence.rb

@@ -19,6 +19,9 @@ module CPEE
     def self::obj #{{{
       @@obj
     end #}}}
+    def self::obj=(it) #{{{
+      @@obj = it
+    end #}}}
 
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
@@ -81,6 +84,15 @@ module CPEE
       end
     end
 
+    def self::new_object(opts)
+      id = opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
+      opts[:redis].zadd(@@obj + 's',id,id)
+      id
+    end
+    def self::new_static_object(id,opts)
+      opts[:redis].set(File.join(@@obj + ":#{id}",'state'),'')
+      nil
+    end
     def self::new_object(opts)
       id = opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
       opts[:redis].zadd(@@obj + 's',id,id)

data/lib/properties/state.rng

@@ -8,7 +8,6 @@
         <value>ready</value>
         <value>running</value>
         <value>simulating</value>
-        <value>replaying</value>
         <value>stopping</value>
         <value>stopped</value>
         <value>abandoned</value>
@@ -22,7 +21,6 @@
         <value>ready</value>
         <value>running</value>
         <value>simulating</value>
-        <value>replaying</value>
         <value>stopping</value>
         <value>stopped</value>
         <value>abandoned</value>

data/lib/properties.xml

@@ -38,7 +38,6 @@
         <value>ready</value>
         <value>running</value>
         <value>simulating</value>
-        <value>replaying</value>
         <value>stopping</value>
         <value>stopped</value>
         <value>abandoned</value>
@@ -133,7 +132,7 @@
     <parameter name="dslx" mimetype="*/xml"/>
   </message> <!--}}}-->
   <message name="description"> <!--{{{-->
-    <parameter name="description" mimetype="*/xml"/>
+    <parameter name="description" mimetype="*"/>
   </message> <!--}}}-->
 
   <message name="transformation"> <!--{{{-->

data/server/executionhandlers/ruby/connection.rb

@@ -42,8 +42,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end# }}}
   def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
-    p err.message
-    p err.backtrace
+    puts err.message
+    puts err.backtrace
     controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') + err.message)
   end # }}}
   def self::inform_position_change(arguments,ipc={}) # {{{
@@ -64,11 +64,11 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @guard_items = []
   end # }}}
 
-  def prepare(readonly, endpoints, parameters, replay=false) #{{{
+  def prepare(readonly, endpoints, parameters) #{{{
     @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
-    if @controller.attributes['mock']
+    if @controller.attributes['twin_engine']
       @handler_endpoint_orig = @handler_endpoint
-      @handler_endpoint = @controller.attributes['mock'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
+      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
     params = parameters.dup
     params[:arguments] = params[:arguments].dup if params[:arguments]
@@ -127,7 +127,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-REPLAY",@controller.attributes['replayer_target']) if @controller.attributes[:replayer] && @controller.attributes['replayer_target']
+    params << Riddl::Header.new("CPEE-TWIN-TARGET",@controller.attributes['twin_target']) if @controller.attributes['twin_target']
     @controller.attributes.each do |key,value|
       params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
     end
@@ -142,19 +142,55 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @handler_passthrough = callback
       @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
 
+      pp params
+
       status, result, headers = client.request type => params
       @guard_files += result
 
       if status == 561
-        @handler_endpoint = @handler_endpoint_orig
-        params.delete_if { |p| p.name == 'original_endpoint' }
-        params.each do |p|
-          if p.name == 'attributes'
-            t = JSON::parse(p.value) rescue {}
-            t['mock'] = @controller.attributes['mock']
-            p.value = t.to_json
+        if @controller.attributes['twin_translate']
+          gettrans = Riddl::Client.new(@controller.attributes['twin_translate'])
+          gtstatus, gtresult, gtheaders = gettrans.get
+          if gtstatus >= 200 && gtstatus < 300
+            transwhat = case headers['CPEE-TWIN-TASKTYPE']
+              when 'i'; 'instantiation'
+              when 'ir'; 'ipc-receive'
+              when 'is'; 'ipc-send'
+              else
+                'instantiation'
+            end
+            JSON::parse(gtresult.first.value.read).each do |e|
+              if e['type'] == transwhat
+                @handler_endpoint = e['endpoint'] if e['endpoint']
+                e['arguments']&.each do |k,a|
+                  if a.is_a? String
+                    hname = a.gsub(/-/,'_')
+                    a = headers[hname] if headers[hname]
+                  elsif a.is_a? Hash
+                    a.each do |k_ht, a_ht|
+                      hname = a_ht.gsub(/-/,'_')
+                      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
+                  end
+                end
+              end
+            end
           end
+        else
+          @handler_endpoint = @handler_endpoint_orig
         end
+        params.delete_if { |p| p.name == 'original_endpoint' }
       end
     end while status == 561