cpee 2.1.47 → 2.1.48

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

@@ -50,6 +50,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/default/rngs/closed_loop_control.rng

@@ -1,6 +1,6 @@
 <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="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">

data/cockpit/themes/default/rngs/closed_loop_measuring.rng

@@ -1,8 +1,8 @@
 <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="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
-  <element name="_expected" rngui:header="Values Expected to Change">
+  <element name="_expected" rngui:header="Measured Values">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">
         <data type="string" rngui:label="a dataelement"/>

data/cockpit/themes/default/theme.js

@@ -253,6 +253,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -264,15 +276,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
-      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
-      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-      if (vtarget.length > 0) {
-        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
-          del_ui_pos(xml_node);
-        } else {
-          add_ui_pos(xml_node);
-        }
-      }
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -305,6 +309,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');

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

@@ -27,6 +27,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

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

@@ -50,6 +50,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/extended/rngs/closed_loop_control.rng

@@ -1,6 +1,6 @@
 <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="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">

data/cockpit/themes/extended/rngs/closed_loop_measuring.rng

@@ -1,8 +1,8 @@
 <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="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
-  <element name="_expected" rngui:header="Values Expected to Change">
+  <element name="_expected" rngui:header="Measured Values">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">
         <data type="string" rngui:label="a dataelement"/>

data/cockpit/themes/extended/theme.js

@@ -253,6 +253,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -264,15 +276,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
-      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
-      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-      if (vtarget.length > 0) {
-        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
-          del_ui_pos(xml_node);
-        } else {
-          add_ui_pos(xml_node);
-        }
-      }
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -305,6 +309,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');

data/cockpit/themes/model/theme.js

@@ -229,6 +229,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -240,15 +252,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
-      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
-      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-      if (vtarget.length > 0) {
-        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
-          del_ui_pos(xml_node);
-        } else {
-          add_ui_pos(xml_node);
-        }
-      }
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -281,6 +285,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');

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

@@ -27,6 +27,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

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

@@ -50,6 +50,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

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

@@ -1,6 +1,6 @@
 <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="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">

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

@@ -1,8 +1,8 @@
 <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="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
-  <element name="_expected" rngui:header="Values Expected to Change">
+  <element name="_expected" rngui:header="Measured Values">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">
         <data type="string" rngui:label="a dataelement"/>

data/cockpit/themes/packed/theme.js

@@ -253,6 +253,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -264,15 +276,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
-      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
-      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-      if (vtarget.length > 0) {
-        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
-          del_ui_pos(xml_node);
-        } else {
-          add_ui_pos(xml_node);
-        }
-      }
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -305,6 +309,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');

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

@@ -27,6 +27,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

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

@@ -50,6 +50,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

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

@@ -1,6 +1,6 @@
 <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="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">

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

@@ -1,8 +1,8 @@
 <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="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
+  <attribute name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
-  <element name="_expected" rngui:header="Values Expected to Change">
+  <element name="_expected" rngui:header="Measured Values">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">
         <data type="string" rngui:label="a dataelement"/>

data/cockpit/themes/preset/theme.js

@@ -253,6 +253,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -264,15 +276,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
-      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
-      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-      if (vtarget.length > 0) {
-        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
-          del_ui_pos(xml_node);
-        } else {
-          add_ui_pos(xml_node);
-        }
-      }
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -305,6 +309,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.47"
+  s.version          = "2.1.48"
   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."

data/lib/cpee/implementation.rb

@@ -295,7 +295,7 @@ module CPEE
       name     = @p[0].value
       id       = CPEE::Persistence::new_object(opts)
       uuid     = SecureRandom.uuid
-      instance = CPEE::Persistence::OBJ + ':' + id.to_s
+      instance = CPEE::Persistence::obj + ':' + id.to_s
       redis.multi do |multi|
         multi.zadd('instances',id,id)
         doc.root.find(PROPERTIES_PATHS_FULL.join(' | ')).each do |e|
@@ -319,12 +319,12 @@ module CPEE
             doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
             key = File.basename(File.dirname(f))
             url = doc.find('string(/np:subscription/@url)')
-            multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers",key)
-            multi.set(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}/url",url)
+            multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers",key)
+            multi.set(CPEE::Persistence::obj + ":#{id}/handlers/#{key}/url",url)
             doc.find('/np:subscription/np:topic/*').each do |e|
               c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
-              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}",c)
-              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{c}",key)
+              multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{key}",c)
+              multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{c}",key)
             end
           end rescue nil # all the ones that are not ok, are ignored
         end

data/lib/cpee/persistence.rb

@@ -15,7 +15,10 @@
 module CPEE
 
   module Persistence
-    OBJ = 'instance'
+    @@obj = 'instance'
+    def self::obj #{{{
+      @@obj
+    end #}}}
 
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
@@ -39,13 +42,13 @@ module CPEE
       )
     end #}}}
     def self::extract_set(id,opts,item) #{{{
-      opts[:redis].smembers(OBJ + ":#{id}/#{item}").map do |e|
-        [e,opts[:redis].get(OBJ + ":#{id}/#{item}/#{e}")]
+      opts[:redis].smembers(@@obj + ":#{id}/#{item}").map do |e|
+        [e,opts[:redis].get(@@obj + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
     def self::extract_list(id,opts,item) #{{{
-      opts[:redis].zrange(OBJ + ":#{id}/#{item}",0,-1).map do |e|
-        [e,opts[:redis].get(OBJ + ":#{id}/#{item}/#{e}")]
+      opts[:redis].zrange(@@obj + ":#{id}/#{item}",0,-1).map do |e|
+        [e,opts[:redis].get(@@obj + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
 
@@ -62,32 +65,32 @@ module CPEE
       )
     end #}}}
     def self::extract_item(id,opts,item) #{{{
-      opts[:redis].get(OBJ + ":#{id}/#{item}")
+      opts[:redis].get(@@obj + ":#{id}/#{item}")
     end #}}}
 
     def self::exists?(id,opts) #{{{
-      opts[:redis].exists?(OBJ + ":#{id}/state")
+      opts[:redis].exists?(@@obj + ":#{id}/state")
     end #}}}
     def self::is_member?(id,opts,item,value) #{{{
-      opts[:redis].sismember(OBJ + ":#{id}/#{item}",value)
+      opts[:redis].sismember(@@obj + ":#{id}/#{item}",value)
     end  #}}}
 
     def self::each_object(opts)
-      opts[:redis].zrevrange(OBJ + 's',0,-1).each do |instance|
+      opts[:redis].zrevrange(@@obj + 's',0,-1).each do |instance|
         yield instance
       end
     end
 
     def self::new_object(opts)
-      opts[:redis].zrevrange(OBJ + 's', 0, 0).first.to_i + 1
+      opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
     end
 
     def self::keys(id,opts,item=nil)
-      opts[:redis].keys(File.join(OBJ + ":#{id}",item.to_s,'*'))
+      opts[:redis].keys(File.join(@@obj + ":#{id}",item.to_s,'*'))
     end
 
     def self::set_handler(id,opts,key,url,values,update=false) #{{{
-      exis = opts[:redis].smembers(OBJ + ":#{id}/handlers/#{key}")
+      exis = opts[:redis].smembers(@@obj + ":#{id}/handlers/#{key}")
 
       if update == false && exis.length > 0
         return 405
@@ -120,14 +123,14 @@ module CPEE
       200
     end #}}}
     def self::extract_handler(id,opts,key) #{{{
-      opts[:redis].smembers(OBJ + ":#{id}/handlers/#{key}")
+      opts[:redis].smembers(@@obj + ":#{id}/handlers/#{key}")
     end #}}}
     def self::exists_handler?(id,opts,key) #{{{
-      opts[:redis].exists?(OBJ + ":#{id}/handlers/#{key}")
+      opts[:redis].exists?(@@obj + ":#{id}/handlers/#{key}")
     end #}}}
     def self::extract_handlers(id,opts) #{{{
-      opts[:redis].smembers(OBJ + ":#{id}/handlers").map do |e|
-        [e, opts[:redis].get(OBJ + ":#{id}/handlers/#{e}/url")]
+      opts[:redis].smembers(@@obj + ":#{id}/handlers").map do |e|
+        [e, opts[:redis].get(@@obj + ":#{id}/handlers/#{e}/url")]
       end
     end #}}}
   end

data/server/executionhandlers/ruby/connection.rb

@@ -64,10 +64,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
 
   def prepare(readonly, endpoints, parameters, replay=false) #{{{
-    if replay && @controller.attributes[:replayer]
-      @handler_endpoint = @controller.attributes[:replayer]
-    else
-      @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    if @controller.attributes['mock']
+      @handler_endpoint_orig = @handler_endpoint
+      @handler_endpoint = @controller.attributes['mock'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
     params = parameters.dup
     params[:arguments] = params[:arguments].dup if params[:arguments]
@@ -131,15 +131,23 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
     end
 
-    tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
-    type = $2 || parameters[:method] || 'post'
+    status = result = headers = nil
+    catch :no_mock do
+      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+      type = $2 || parameters[:method] || 'post'
+
+      client = Riddl::Client.new(tendpoint)
 
-    client = Riddl::Client.new(tendpoint)
+      @handler_passthrough = callback
+      @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
 
-    @handler_passthrough = callback
-    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
+      status, result, headers = client.request type => params
+      if status == 561
+        @handler_endpoint = @handler_endpoint_orig
+        throw :no_mock
+      end
+    end
 
-    status, result, headers = client.request type => params
     if status < 200 || status >= 300
       headers['CPEE_SALVAGE'] = true
       c = result[0]&.value
@@ -270,7 +278,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       enc = detect_encoding(result)
       enc == 'OTHER' ? result : (result.encode('UTF-8',enc) rescue convert_to_base64(result))
     else
-      result
+      Riddl::Parameter::Array[*result]
     end
   end
 
@@ -353,6 +361,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
         @handler_continue.continue WEEL::Signal::Salvage
+      elsif options['CPEE_STOP']
+        @handler_continue.continue WEEL::Signal::Stop
       else
         @handler_continue.continue
       end