cpee 1.5.24 → 1.5.25

data/cockpit/themes/compact/theme.js

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);

data/cockpit/themes/default/theme.js

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);

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

@@ -92,6 +92,12 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label='ω - Wait'>
+        <data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
+      </element>
+      <element name="_timing_threshold" rngui:label='κ - 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>

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

@@ -115,6 +115,12 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label='ω - Wait'>
+        <data type='float' rngui:label='[0,1]'/>
+      </element>
+      <element name="_timing_threshold" rngui:label='κ - 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>

data/cockpit/themes/extended/theme.js

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
@@ -264,33 +264,18 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var rep = $('body').attr('current-resources');
         var ep = self.endpoints[$(node).attr('endpoint')];
-        var avg = $('_timing_avg',$(node).children('annotations')).text();
+        var wait = $('_timing_wait',$(node).children('annotations')).text();
+        var threshold = $('_timing_threshold',$(node).children('annotations')).text();
         var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
         var ret = [ { column: 'ID', value: $(node).attr('id') } ];
         if (lab != '') {
           ret.unshift( { column: 'Label', value: lab } );
         }
-        if (ep != undefined) {
-          var lnd = $(node).attr('endpoint');
-          ret.push({ column: 'Resource', value: lnd });
-          if (save['endpoints_cache'][lnd] && save['endpoints_cache'][lnd].properties) {
-            var prop = save['endpoints_cache'][lnd].properties;
-            if (prop.resource) {
-              if (prop.resource == 'exclusive' && prop.lock) {
-                ret.push({ column: 'RP', value: prop.resource + ' (' + prop.lock + ')' });
-              } else {
-                ret.push({ column: 'RP', value: prop.resource });
-              }
-            }
-            if (prop.alternatives) {
-              ret.push({ column: 'R#', value: prop.alternatives.length + 1});
-            } else {
-              ret.push({ column: 'R#', value: '1' });
-            }
-          }
+        if (wait != '') {
+          ret.push({ column: 'Wait', value: 'ω = ' + wait });
         }
-        if (avg != '') {
-          ret.push({ column: 'Average', value: avg + 'min' });
+        if (threshold != '') {
+          ret.push({ column: 'Threshold', value: 'κ = ' + threshold });
         }
         return ret;
       },

data/cockpit/themes/model/theme.js

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);

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

@@ -92,6 +92,12 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label='ω - Wait'>
+        <data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
+      </element>
+      <element name="_timing_threshold" rngui:label='κ - 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>

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

@@ -115,6 +115,12 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label='ω - Wait'>
+        <data type='float' rngui:label='[0,1]'/>
+      </element>
+      <element name="_timing_threshold" rngui:label='κ - 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>

data/cockpit/themes/packed/theme.js

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);

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

@@ -92,6 +92,12 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label='ω - Wait'>
+        <data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
+      </element>
+      <element name="_timing_threshold" rngui:label='κ - 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>

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

@@ -115,6 +115,12 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label='ω - Wait'>
+        <data type='float' rngui:label='[0,1]'/>
+      </element>
+      <element name="_timing_threshold" rngui:label='κ - 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>

data/cockpit/themes/preset/theme.js

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.24"
+  s.version          = "1.5.25"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -373,7 +373,7 @@ module CPEE
         node = doc.find("/p:properties/p:state").first
         state = node.text
       end
-      if call_vote("state/change", :instance => @id, :info => info, :state => state)
+      if call_vote("state/change", :instance => @id, :info => info, :state => state, :attributes => attributes_translated)
         case state
           when 'stopping'
             stop

data/log/sic.rb

@@ -58,6 +58,7 @@ def help
   puts '  Copy: sic.rb https://centurio.work/log/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml copy'
   puts '  Copy: sic.rb ~/Projects/cpee/log/logs/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml copy'
   puts '  View: sic.rb 865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml'
+  true
 end
 
 react(ARGV[0]) || help

data/server/handlerwrappers/default.rb

@@ -16,7 +16,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def self::inform_state_change(arguments,newstate) # {{{
     controller = arguments[0]
 		controller.serialize_state!
-		controller.notify("state/change", :instance => controller.instance, :instance_uuid => controller.uuid, :state => newstate, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+		controller.notify("state/change", :instance => controller.instance, :instance_uuid => controller.uuid, :state => newstate, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => controller.attributes_translated)
 		controller.finalize_if_finished
   end # }}}
   def self::inform_syntax_error(arguments,err,code)# {{{

data/tools/instantiation/instantiation

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
 require 'rubygems'
+gem 'cpee', '~>1.5'
 require 'cpee/instantiation'
 
 options = {

data/tools/server/server.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
 require 'rubygems'
+gem 'cpee', '~>1.5'
 require 'cpee/implementation'
 
 Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do |opts|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.24
+  version: 1.5.25
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -161,49 +161,59 @@ files:
 - cockpit/rngs/attributes.rng
 - cockpit/rngs/dataelements.rng
 - cockpit/rngs/endpoints.rng
-- cockpit/test.html
-- cockpit/testsets/Async.xml
-- cockpit/testsets/BCO.xml
-- cockpit/testsets/BCS.xml
-- cockpit/testsets/Centurio.xml
-- cockpit/testsets/Concurrent.xml
-- cockpit/testsets/Coopis Testset.xml
-- cockpit/testsets/Endpoints and Data Manipulation.xml
-- cockpit/testsets/ICSOC Testset.xml
-- cockpit/testsets/Infinity.xml
-- cockpit/testsets/Lego Boxer.xml
-- cockpit/testsets/Lego Conveyor.xml
-- cockpit/testsets/Lego Crane.xml
-- cockpit/testsets/Lego Ejector.xml
-- cockpit/testsets/Lego Full.xml
-- cockpit/testsets/Lego Liddy.xml
-- cockpit/testsets/Lego Plate.xml
-- cockpit/testsets/Lego Transporter.xml
-- cockpit/testsets/Lego_Part_1.xml
-- cockpit/testsets/LgLinear.xml
-- cockpit/testsets/Linear.xml
-- cockpit/testsets/Log.xml
-- cockpit/testsets/Mangler 1.xml
-- cockpit/testsets/Mangler 2.xml
-- cockpit/testsets/Manuel Labels.xml
-- cockpit/testsets/Promise.xml
-- cockpit/testsets/SOPROMO Test Sonification.xml
-- cockpit/testsets/Subprocess.xml
-- cockpit/testsets/Syncing P34 1.xml
-- cockpit/testsets/Syncing P34 2.xml
-- cockpit/testsets/Syncing P34 3.xml
-- cockpit/testsets/Syncing P34.xml
-- cockpit/testsets/TEST - Bad Loop.xml
-- cockpit/testsets/TEST - Wrong Positions.xml
-- cockpit/testsets/Take_5.xml
-- cockpit/testsets/Update.xml
-- cockpit/testsets/Worklist Parallel.xml
-- cockpit/testsets/Worklist Test CPEE.xml
-- cockpit/testsets/Worklist Test.xml
-- cockpit/testsets/Worklist Test2.xml
-- cockpit/testsets/convert_preset.rb
-- cockpit/testsets/testsets.xml
-- cockpit/testsets/transformations.xml
+- cockpit/templates.legacy/Async.xml
+- cockpit/templates.legacy/BCO.xml
+- cockpit/templates.legacy/BCS.xml
+- cockpit/templates.legacy/Centurio.xml
+- cockpit/templates.legacy/Concurrent.xml
+- cockpit/templates.legacy/Coopis Testset.xml
+- cockpit/templates.legacy/Endpoints and Data Manipulation.xml
+- cockpit/templates.legacy/ICSOC Testset.xml
+- cockpit/templates.legacy/Infinity.xml
+- cockpit/templates.legacy/Lego Boxer.xml
+- cockpit/templates.legacy/Lego Conveyor.xml
+- cockpit/templates.legacy/Lego Crane.xml
+- cockpit/templates.legacy/Lego Ejector.xml
+- cockpit/templates.legacy/Lego Full.xml
+- cockpit/templates.legacy/Lego Liddy.xml
+- cockpit/templates.legacy/Lego Plate.xml
+- cockpit/templates.legacy/Lego Transporter.xml
+- cockpit/templates.legacy/Lego_Part_1.xml
+- cockpit/templates.legacy/LgLinear.xml
+- cockpit/templates.legacy/Linear.xml
+- cockpit/templates.legacy/Log.xml
+- cockpit/templates.legacy/Mangler 1.xml
+- cockpit/templates.legacy/Mangler 2.xml
+- cockpit/templates.legacy/Manuel Labels.xml
+- cockpit/templates.legacy/Promise.xml
+- cockpit/templates.legacy/SOPROMO Test Sonification.xml
+- cockpit/templates.legacy/Syncing P34 1.xml
+- cockpit/templates.legacy/Syncing P34 2.xml
+- cockpit/templates.legacy/Syncing P34 3.xml
+- cockpit/templates.legacy/Syncing P34.xml
+- cockpit/templates.legacy/TEST - Bad Loop.xml
+- cockpit/templates.legacy/TEST - Wrong Positions.xml
+- cockpit/templates.legacy/Update.xml
+- cockpit/templates.legacy/Worklist Parallel.xml
+- cockpit/templates.legacy/Worklist Test CPEE.xml
+- cockpit/templates.legacy/Worklist Test.xml
+- cockpit/templates.legacy/Worklist Test2.xml
+- cockpit/templates.legacy/convert_preset.rb
+- cockpit/templates.legacy/testsets.xml
+- cockpit/templates.legacy/transformations.xml
+- cockpit/templates/BPM 2020 Manual Adjust.xml
+- cockpit/templates/BPM 2020 Solution Baseline.xml
+- cockpit/templates/BPM 2020 Solution NN.xml
+- cockpit/templates/BPM 2020 Solution View.xml
+- cockpit/templates/BPM 2020.xml
+- cockpit/templates/Coopis 2010.xml
+- cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml
+- cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml
+- cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml
+- cockpit/templates/Worklist.xml
+- cockpit/templates/convert_preset.rb
+- cockpit/templates/testsets.xml
+- cockpit/templates/transformations.xml
 - cockpit/themes/compact/rngs/alternative.rng
 - cockpit/themes/compact/rngs/call.rng
 - cockpit/themes/compact/rngs/callmanipulate.rng
@@ -541,16 +551,10 @@ files:
 - server/handlerwrappers/default.rb
 - server/handlerwrappers/soap.rb
 - server/resources/empty_dslx.xml
-- server/resources/notifications/logging/consumer-secret
-- server/resources/notifications/logging/producer-secret
-- server/resources/notifications/logging/subscription.xml
 - server/resources/properties.init
 - server/resources/properties.schema.active
 - server/resources/properties.schema.finished
 - server/resources/properties.schema.inactive
-- server/resources/test1.xml
-- server/resources/test2.xml
-- server/resources/test3.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl

data/cockpit/test.html

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>CPEE Cockpit</title>
-    <style>
-      :root {
-        --xx1: bold;
-        --xx2: normal;
-      }
-      #a, #c {
-        font-weight: var(--xx1);
-      }
-      #b, #d {
-        font-weight: var(--xx2);
-      }
-      #a:hover, #c:hover {
-        @nest & {
-          --xx1: bold;
-        }
-      }
-      #b:hover, #d:hover {
-        @nest & {
-          --xx2: bold;
-        }
-      }
-    </style>
-  </head>
-  <body>
-    <div id='graphgrid'>
-      <div>
-        <div id='a' class='a'>aaa</div>
-        <div id='b' class='b'>bbb</div>
-      </div>
-      <div id='c' class='a'>aaa</div>
-      <div id='d' class='b'>bbb</div>
-    </div>
-  </body>
-</html>

data/cockpit/testsets/Subprocess.xml

@@ -1,56 +0,0 @@
-<testset>
-  <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
-    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <instantiate xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://localhost:9296/url/</instantiate>
-  </endpoints>
-  <positions/>
-  <description>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="instantiate">
-        <parameters>
-          <label>Take 5</label>
-          <method>:post</method>
-          <arguments>
-            <info>Take Time</info>
-            <behavior>wait_running</behavior>
-            <url>http://localhost/testsets/Take_5.xml</url>
-            <init>
-              <a>3</a>
-            </init>
-          </arguments>
-        </parameters>
-        <code>
-          <finalize output="result">data.instance = result['CPEE-INSTANCE']
-data.res = result</finalize>
-          <update output="result"/>
-        </code>
-        <annotations>
-          <_timing>
-            <_timing_min/>
-            <_timing_max/>
-            <_timing_avg/>
-          </_timing>
-          <_notes>
-            <_notes_general/>
-            <_notes_output/>
-            <_attachments/>
-          </_notes>
-        </annotations>
-      </call>
-    </description>
-  </description>
-  <transformation>
-    <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
-  </transformation>
-  <attributes>
-    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Subprocess</info>
-    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
-    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
-    <customer xmlns="http://riddl.org/ns/common-patterns/properties/1.0">pilotfabrik</customer>
-    <status xmlns="http://riddl.org/ns/common-patterns/properties/1.0">development</status>
-  </attributes>
-</testset>