cpee 2.0.23 → 2.0.24

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

@@ -26,7 +26,8 @@
       </zeroOrMore>
     </element>
     <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
-      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+
+      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
         <zeroOrMore rngui:label="Add Sensor">
           <element name="sensor">
             <element name="name" rngui:label="Label">
@@ -35,13 +36,18 @@
             <element name="extractor_url" rngui:label="Extractor Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_arg" rngui:label="Extractor Argument">
-              <data type="string" rngui:label="Value / Json"/>
+            <element name="extractor_params" rngui:label="Extractor Arguments:">
+              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
             </element>
             <element name="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
               <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
@@ -52,42 +58,44 @@
           </element>
         </zeroOrMore>
       </element>
-      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Aggregator">
-          <element name="aggregator">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="aggregator_url" rngui:label="Aggregator Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="aggregator_arg" rngui:label="Aggregator Argument">
-              <data type="string" rngui:label="Value / Json"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-      <element name="costs" rngui:header="Costs" rngui:fold="closed">
-        <zeroOrMore rngui:label="Create Cost Factor">
-          <element name="cost_factor">
+
+      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Impact Profile">
+          <element name="ip">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
             <element name="target" rngui:label="Target Value">
               <data type="string" rngui:label="Value"/>
             </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="vfunc_arg" rngui:label="Violation Function Argument">
-              <data type="string" rngui:label="Service Url"/>
+            <element name="ifs" rngui:header="Impact Factors">
+              <zeroOrMore rngui:label="Add Impact Factor">
+                <element name="if">
+                  <element name="ivs" rngui:header="Impact Values">
+                    <zeroOrMore rngui:label="Add Impact Value ">
+                      <element name="iv">
+                        <element name="extractor_url" rngui:label="Extractor Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="aggregator_url" rngui:label="Aggregator Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                      </element>
+                    </zeroOrMore>
+                  </element>
+                  <element name="aggregator_url" rngui:label="Impact Function Url">
+                    <data type="string" rngui:label="Service Url + Parameters"/>
+                  </element>
+                </element>
+              </zeroOrMore>
             </element>
-            <element name="vcost" rngui:label="Violation Cost">
-              <data type="string" rngui:label="Value"/>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url + Parameters"/>
             </element>
           </element>
         </zeroOrMore>
       </element>
+
     </element>
     <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
       <element name="url" rngui:label='HTML Snippet'>
@@ -97,21 +105,40 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
-        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
-      </element>
-      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
-        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
-      </element>
-      <element name="_timing_min" rngui:label="Min in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
-      <element name="_timing_max" rngui:label="Max in min">
-        <data type="float" rngui:label="Minutes"/>
+      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
+        <data type="float" rngui:label="[0,1]"/>
       </element>
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
+      <element name="explanations" rngui:header="Explanations">
+        <zeroOrMore rngui:label="Add Explanation">
+          <element name="explanation">
+            <element name="type" rngui:label="Type">
+              <choice>
+                <value>&gt;</value>
+                <value>&lt;</value>
+              </choice>
+            </element>
+            <element name="deviation" rngui:label="Deviation">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="behaviour" rngui:label="Behaviour">
+              <choice>
+                <value>Immediately</value>
+                <value>Wait until next</value>
+                <value>Use grace period value</value>
+              </choice>
+            </element>
+            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="text" rngui:label="Explanation">
+              <data type="string" rngui:label="Patterns"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
     </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
       <element name="_notes_general" rngui:label="General">

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

@@ -26,7 +26,8 @@
       </zeroOrMore>
     </element>
     <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
-      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+
+      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
         <zeroOrMore rngui:label="Add Sensor">
           <element name="sensor">
             <element name="name" rngui:label="Label">
@@ -35,8 +36,13 @@
             <element name="extractor_url" rngui:label="Extractor Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_arg" rngui:label="Extractor Argument">
-              <data type="string" rngui:label="Value / Json"/>
+            <element name="extractor_params" rngui:label="Extractor Arguments:">
+              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
             </element>
             <element name="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
@@ -52,42 +58,60 @@
           </element>
         </zeroOrMore>
       </element>
-      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Aggregator">
-          <element name="aggregator">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="aggregator_url" rngui:label="Aggregator Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="aggregator_arg" rngui:label="Aggregator Argument">
-              <data type="string" rngui:label="Value / Json"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-      <element name="costs" rngui:header="Costs" rngui:fold="closed">
-        <zeroOrMore rngui:label="Create Cost Factor">
-          <element name="cost_factor">
+
+      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Impact Profile">
+          <element name="ip">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
             <element name="target" rngui:label="Target Value">
               <data type="string" rngui:label="Value"/>
             </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="vfunc_arg" rngui:label="Violation Function Argument">
-              <data type="string" rngui:label="Service Url"/>
+            <element name="ifs" rngui:header="Impact Factors">
+              <zeroOrMore rngui:label="Add Impact Factor">
+                <element name="if">
+                  <element name="ivs" rngui:header="Impact Values">
+                    <zeroOrMore rngui:label="Add Impact Value ">
+                      <element name="iv">
+                        <element name="extractor_url" rngui:label="Extractor Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="extractor_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                        <element name="aggregator_url" rngui:label="Aggregator Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="aggregator_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                      </element>
+                    </zeroOrMore>
+                  </element>
+                  <element name="aggregator_url" rngui:label="Impact Function Url">
+                    <data type="string" rngui:label="Service Url + Parameters"/>
+                  </element>
+                </element>
+              </zeroOrMore>
             </element>
-            <element name="vcost" rngui:label="Violation Cost">
-              <data type="string" rngui:label="Value"/>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url + Parameters"/>
             </element>
           </element>
         </zeroOrMore>
       </element>
+
     </element>
     <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
       <element name="url" rngui:label='HTML Snippet'>
@@ -120,21 +144,40 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>
       </element>
-      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
-        <data type="float" rngui:label="[0,3,n]"/>
-      </element>
-      <element name="_timing_min" rngui:label="Min in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
-      <element name="_timing_max" rngui:label="Max in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
+      <element name="explanations" rngui:header="Explanations">
+        <zeroOrMore rngui:label="Add Explanation">
+          <element name="explanation">
+            <element name="type" rngui:label="Type">
+              <choice>
+                <value>&gt;</value>
+                <value>&lt;</value>
+              </choice>
+            </element>
+            <element name="deviation" rngui:label="Deviation">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="behaviour" rngui:label="Behaviour">
+              <choice>
+                <value>Immediately</value>
+                <value>Wait until next</value>
+                <value>Use grace period value</value>
+              </choice>
+            </element>
+            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="text" rngui:label="Explanation">
+              <data type="string" rngui:label="Patterns"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
     </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
       <element name="_notes_general" rngui:label="General">

data/cockpit/track.html

@@ -111,13 +111,6 @@
                 </svg>
               </button>
               <span id="state_extended">
-                <button name="state_replay" title='replay'>
-                  <svg viewBox="0 -1.5 7 12" width="10" height="16">
-                    <path
-                      style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                      d="m -0.24999978,8.9999993 c 0,-2.7488167 0,-5.4976332 0,-8.24644997 C 1.1183278,0.76955385 2.4884861,0.71666052 3.8555376,0.79065567 4.5083287,0.83810218 5.2238942,1.0790874 5.5755039,1.7307256 6.1661398,2.7080902 6.0299484,4.2180754 5.1108772,4.9019222 4.7622397,5.1617467 4.3480204,5.2956156 3.9336064,5.3605366 4.9287868,5.9394132 5.4254071,7.0996814 6.0167729,8.0858876 6.1549588,8.3769029 6.4657247,8.7723933 6.5,8.9999999 c -0.5944185,0 -1.1888371,0 -1.7832559,0 C 4.0758679,7.9893475 3.4946311,6.9294648 2.7923497,5.9678488 2.4230355,5.5319748 1.8508715,5.5458842 1.3513114,5.5576027 c -0.1507526,-0.00412 -0.044576,0.272902 -0.076255,0.3990664 0,1.0144436 0,2.028887 0,3.0433307 -0.50835205,-3e-7 -1.01670555,8e-7 -1.52505618,-5e-7 z M 1.2750578,4.2411336 C 2.111059,4.2189781 2.9581852,4.3060525 3.7849326,4.1387394 4.4863715,3.8915585 4.5732952,2.6432813 3.9026802,2.2941453 3.5098807,2.068434 3.050719,2.1857044 2.6267379,2.1489138 c -0.4505578,-0.00242 -0.90112,0.00147 -1.3516801,-3.456e-4 0,0.6975176 0,1.3950347 0,2.0925522 z"
-                  </svg>
-                </button>
                 <button name="state_abandon" title='abandon'>
                   <svg viewBox="0 -1.5 7 12" width="10" height="16">
                     <path

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.23"
+  s.version          = "2.0.24"
   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/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.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/*.html,cockpit/themes/*/*,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/server/handlerwrappers/default.rb

@@ -53,7 +53,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def prepare(readonly, endpoints, parameters, replay=false) #{{{
-    if replay
+    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]
@@ -99,7 +99,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     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_args'])
+    params << Riddl::Header.new("CPEE-REPLAY",@controller.attributes['replayer_target']) if @controller.attributes[:replayer] && @controller.attributes['replayer_target']
     @controller.attributes.each do |key,value|
       params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
     end

data/server/routing/end.pid

@@ -0,0 +1 @@
+385086

data/server/routing/forward-events.pid

@@ -0,0 +1 @@
+385070

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+385078

data/server/routing/persist.pid

@@ -0,0 +1 @@
+385082

data/server/server.pid

@@ -0,0 +1 @@
+385042

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -125,20 +125,24 @@ files:
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
 - cockpit/css/model.css
+- cockpit/css/replay.css
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
+- cockpit/edit.html
 - cockpit/graph.html
 - cockpit/index.html
 - cockpit/js/details.js
 - cockpit/js/instance.js
 - cockpit/js/model.js
 - cockpit/js/parameters.js
+- cockpit/js/replay.js
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
 - cockpit/js_libs.zip
 - cockpit/model.html
+- cockpit/replay.html
 - cockpit/rngs/attributes.rng
 - cockpit/rngs/dataelements.rng
 - cockpit/rngs/endpoints.rng
@@ -253,6 +257,54 @@ files:
 - cockpit/themes/compact/symbols/stop.svg
 - cockpit/themes/compact/symbols/terminate.svg
 - cockpit/themes/compact/theme.js
+- cockpit/themes/control/rngs/alternative.rng
+- cockpit/themes/control/rngs/call.rng
+- cockpit/themes/control/rngs/callmanipulate.rng
+- cockpit/themes/control/rngs/choose.rng
+- cockpit/themes/control/rngs/closed_loop.rng
+- cockpit/themes/control/rngs/closed_loop_cancel.rng
+- cockpit/themes/control/rngs/closed_loop_control.rng
+- cockpit/themes/control/rngs/closed_loop_measuring.rng
+- cockpit/themes/control/rngs/critical.rng
+- cockpit/themes/control/rngs/escape.rng
+- cockpit/themes/control/rngs/group.rng
+- cockpit/themes/control/rngs/loop.rng
+- cockpit/themes/control/rngs/manipulate.rng
+- cockpit/themes/control/rngs/otherwise.rng
+- cockpit/themes/control/rngs/parallel.rng
+- cockpit/themes/control/rngs/parallel_branch.rng
+- cockpit/themes/control/rngs/scripts.rng
+- cockpit/themes/control/rngs/stop.rng
+- cockpit/themes/control/rngs/terminate.rng
+- cockpit/themes/control/symbols/alternative.svg
+- cockpit/themes/control/symbols/arrow.svg
+- cockpit/themes/control/symbols/call.svg
+- cockpit/themes/control/symbols/callmanipulate.svg
+- cockpit/themes/control/symbols/choose.svg
+- cockpit/themes/control/symbols/choose_exclusive.svg
+- cockpit/themes/control/symbols/choose_inclusive.svg
+- cockpit/themes/control/symbols/closed_loop.svg
+- cockpit/themes/control/symbols/closed_loop_cancel.svg
+- cockpit/themes/control/symbols/closed_loop_control.svg
+- cockpit/themes/control/symbols/closed_loop_measuring.svg
+- cockpit/themes/control/symbols/complex.svg
+- cockpit/themes/control/symbols/critical.svg
+- cockpit/themes/control/symbols/end.svg
+- cockpit/themes/control/symbols/escape.svg
+- cockpit/themes/control/symbols/event_end.svg
+- cockpit/themes/control/symbols/loop.svg
+- cockpit/themes/control/symbols/manipulate.svg
+- cockpit/themes/control/symbols/otherwise.svg
+- cockpit/themes/control/symbols/parallel.svg
+- cockpit/themes/control/symbols/parallel_branch.svg
+- cockpit/themes/control/symbols/parallel_branch_compact.svg
+- cockpit/themes/control/symbols/parallel_branch_event.svg
+- cockpit/themes/control/symbols/parallel_branch_normal.svg
+- cockpit/themes/control/symbols/scripts.svg
+- cockpit/themes/control/symbols/start.svg
+- cockpit/themes/control/symbols/stop.svg
+- cockpit/themes/control/symbols/terminate.svg
+- cockpit/themes/control/theme.js
 - cockpit/themes/default/rngs/alternative.rng
 - cockpit/themes/default/rngs/call.rng
 - cockpit/themes/default/rngs/callmanipulate.rng
@@ -300,6 +352,7 @@ files:
 - cockpit/themes/default/symbols/start.svg
 - cockpit/themes/default/symbols/stop.svg
 - cockpit/themes/default/symbols/terminate.svg
+- cockpit/themes/default/theme.js
 - cockpit/themes/diana/rngs/alternative.rng
 - cockpit/themes/diana/rngs/call.rng
 - cockpit/themes/diana/rngs/callmanipulate.rng
@@ -605,11 +658,16 @@ files:
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
+- server/routing/end.pid
 - server/routing/end.rb
+- server/routing/forward-events.pid
 - server/routing/forward-events.rb
+- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
+- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
+- server/server.pid
 - server/server.rb
 - tools/cpee
 - tools/server/cpee