cpee 2.0.16 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcc2914034c068617935d34e6fbef9702d4707465e1b5643be0d94ed9a6ff81d
-  data.tar.gz: 569ac606a86cac5d9cc1026c79362f61125c3938a821ac2dab19263b21cb0291
+  metadata.gz: 453366f3d93cb53a550570068fdf5247e1b53d0f2d43a16cf35302145b72f5fb
+  data.tar.gz: 8d5d89a1f03113e27b88fcf24c3f23fd44b5d3e5b65c0514a71a05ba443e30a8
 SHA512:
-  metadata.gz: deee6aa33e4038728143d3f120d418327220f741ef2c0bd1fc87b80a7b2e75d430a075605f386b3af7747e2af0852993d24027cd4702a0b679534c2809befd45
-  data.tar.gz: a5bb1384576ee78ac6074e192bc989fb1166185c95fc1bcaac506ae597db6576ebc68586c8b2614cf282049f7b2701a974079c56d2d5ff1c10d8b4c826a36b17
+  metadata.gz: 6079a6cbf45321f1870243373f28f45233c918113e6ae97c3e28dea23f972b5db7afd5041644673ef169b6a7f6bb1d6bc99b94f573cb119a4ca78b25b67f18e5
+  data.tar.gz: a12c1138fe1e58dd244b8e68b9988b0cde59702be03843ae06b09c3f84b4a2394117144783dac3fa9ffd8a4ea292e678c2034903d1957cb62b55f649b6a22b07

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

@@ -837,6 +837,7 @@ function get_testset(deferred) {// {{{
       $('testset > transformation',testset).remove();
       $('testset > dsl',testset).remove();
       $('testset > dslx',testset).remove();
+      $('testset > attributes > uuid',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) => {
@@ -887,9 +888,7 @@ function save_svgfile() {// {{{
         type: "GET",
         url: url + "/properties/attributes/info/",
         success: function(res){
-          var name = $(res.documentElement).text();
-
-          $('#savesvgfile').attr('download',name + '.svg');
+          $('#savesvgfile').attr('download',res + '.svg');
           $('#savesvgfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(gc.serializeXML()));
           document.getElementById('savesvgfile').click();
         },
@@ -912,6 +911,7 @@ async function set_testset(testset,exec) {// {{{
   tset.append($("testset > attributes",testset));
   tset.append($("testset > description",testset));
   tset.append($("testset > transformation",testset));
+  $('testset > attributes > info',tset).remove();
 
   promises.push(
     $.ajax({

data/cockpit/themes/compact/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

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

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/diana/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

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

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

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

@@ -8,6 +8,11 @@
       <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>
     </choice>
   </attribute>
   <element name="parameters" rngui:header="Properties">
@@ -59,4 +64,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

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

@@ -8,6 +8,11 @@
       <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>
     </choice>
   </attribute>
   <element name="parameters" rngui:header="Properties">
@@ -64,4 +69,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

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/cockpit/themes/packed/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

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

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

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

@@ -1,4 +1,7 @@
 <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>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/preset/theme.js

@@ -217,7 +217,7 @@ function WFAdaptorManifestation(adaptor) {
     self.adaptor.illustrator.get_elements().removeClass('selected');
     self.adaptor.illustrator.get_labels().removeClass('selected');
 
-    if (e && e.ctrlKey) {
+    if (e && (e.ctrlKey || e.metaKey)) {
       if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
       var tab = $('#dat_details');
           tab.empty();

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.16"
+  s.version          = "2.0.21"
   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/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|