cpee 2.1.1 → 2.1.7

data/cockpit/themes/packed/theme.js

@@ -1154,7 +1154,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'svg': self.adaptor.theme_dir + 'symbols/start.svg'
     },//}}}
-    'description': null,
+    'description': self.adaptor.theme_dir + 'rngs/start.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }

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

@@ -25,19 +25,28 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
 
-      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Sensor">
-          <element name="sensor">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
-            <element name="extractor_url" rngui:label="Extractor Url">
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='code'>Code</value>
+                <value id='service'>Service</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_params" rngui:label="Extractor Arguments:">
-              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>
@@ -48,7 +57,7 @@
               <data type="string" rngui:label="Service Url"/>
             </element>
             <element name="visualizer_params" rngui:label="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+              <zeroOrMore rngui:label="Create Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>

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

@@ -25,19 +25,28 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
 
-      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Sensor">
-          <element name="sensor">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
-            <element name="extractor_url" rngui:label="Extractor Url">
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='code'>Code</value>
+                <value id='service'>Service</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_params" rngui:label="Extractor Arguments:">
-              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>
@@ -47,8 +56,8 @@
             <element name="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="visualizer_params" rngui:header="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>

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

@@ -1,7 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data elements (internal context) in the process can be used as input for context data probes. All probes can be the basis for impact factors. Please go to individual tasks to define deal with data that is  ">
+  <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All changes to data elements in the process as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to individual tasks to define more restricted data probes.">
 
-    <element name="probes" rngui:header="Context Data Extraction" rngui:fold="closed">
+    <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
       <zeroOrMore rngui:label="Add Probe">
         <element name="probe">
           <element name="name" rngui:label="Label">
@@ -9,18 +9,18 @@
           </element>
           <element name="extractor_type" rngui:label="Extractor Type">
             <choice>
-              <value id='code'>Extractor Code</value>
-              <value id='service'>Extractor Service</value>
+              <value id='code'>Code</value>
+              <value id='service'>Service</value>
             </choice>
           </element>
-          <element name="extractor_code" rngui:label="Extractor Code">
-            <text rngui:label="Service Url"/>
+          <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic data'>
+            <text rngui:label="Code"/>
           </element>
-          <element name="extractor_url" rngui:label="Extractor Service">
+          <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For intrinsic &amp; discrete data'>
             <data type="string" rngui:label="Service Url"/>
           </element>
           <element name="extractor_params" rngui:label="Extractor Service Arguments:">
-            <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+            <zeroOrMore rngui:label="Create Argument Pairs">
               <element rngui:label="Name">
                 <anyName/>
                 <data type="string" rngui:label="Value / Json"/>
@@ -31,7 +31,7 @@
             <data type="string" rngui:label="Service Url"/>
           </element>
           <element name="visualizer_params" rngui:label="Visualizer Arguments">
-            <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+            <zeroOrMore rngui:label="Create Argument Pairs">
               <element rngui:label="Name">
                 <anyName/>
                 <data type="string" rngui:label="Value / Json"/>

data/cockpit/track.html

@@ -55,6 +55,7 @@
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/track.js"></script>
+    <script type="text/javascript" src="js/modifiers.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="css/track.css" type="text/css"/>
   </head>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.1"
+  s.version          = "2.1.7"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.108'
+  s.add_runtime_dependency 'riddl', '~> 0.114'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.99'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'json', '~>2.1'

data/lib/cpee/implementation_notifications.rb

@@ -26,10 +26,10 @@ module CPEE
           end
           on resource "subscriptions" do
             run CPEE::Notifications::Subscriptions, id, opts if get
-            run CPEE::Notifications::CreateSubscription, id, opts if post 'subscribe'
+            run CPEE::Notifications::CreateSubscription, id, opts if post 'create_subscription'
             on resource do
               run CPEE::Notifications::Subscription, id, opts if get
-              run CPEE::Notifications::UpdateSubscription, id, opts if put 'subscribe'
+              run CPEE::Notifications::UpdateSubscription, id, opts if put 'change_subscription'
               run CPEE::Notifications::DeleteSubscription, id, opts if delete
               on resource 'sse' do
                 run CPEE::Notifications::SSE, id, opts if sse
@@ -92,7 +92,8 @@ module CPEE
             ret = XML::Smart::string <<-END
               <subscription xmlns='http://riddl.org/ns/common-patterns/notifications-producer/2.0'/>
             END
-            url = CPEE::Persistence::extract_item(id,opts,File.join('handler',key,'url'))
+            url = CPEE::Persistence::extract_item(id,opts,File.join('handlers',key,'url'))
+            ret.root.attributes['id'] = key
             ret.root.attributes['url'] = url if url && !url.empty?
             items = {}
             CPEE::Persistence::extract_handler(id,opts,key).each do |h|
@@ -121,8 +122,7 @@ module CPEE
         id = @a[0]
         opts = @a[1]
 
-        key = Digest::MD5.hexdigest(Kernel::rand().to_s)
-
+        key = @p[0].name == 'id' ? @p.shift.value : Digest::MD5.hexdigest(Kernel::rand().to_s)
         url = @p[0].name == 'url' ? @p.shift.value : nil
         values = []
         while @p.length > 0

data/lib/properties/executionhandler.rng

@@ -2,7 +2,7 @@
   <define name="executionhandler">
     <element name="executionhandler" ns="http://cpee.org/ns/properties/2.0">
       <data type="string">
-        <param name="pattern">[A-Z][a-zA-Z]*</param>
+        <param name="pattern">[a-zA-Z]+</param>
       </data>
     </element>
   </define>

data/server/routing/end.pid

@@ -0,0 +1 @@
+742413

data/server/routing/forward-events.pid

@@ -0,0 +1 @@
+742401

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+742405

data/server/routing/persist.pid

@@ -0,0 +1 @@
+742409

data/tools/cpee

@@ -94,13 +94,13 @@ if command == 'ui'
     s.start
   end
 elsif command == 'cpui'
-    if !File.exists?(p1)
-      FileUtils.cp_r(cockpit,p1)
-    else
-      FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')).delete_if{|e| e =~ /\.json/ || e=~ /legacy/ })
-      puts "Directory already exists, updating ..."
-    end
-    js_libs(p1)
+  if !File.exists?(p1)
+    FileUtils.cp_r(cockpit,p1)
+  else
+    FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')).delete_if{|e| e =~ /\.json/ || e=~ /legacy/ },p1,remove_destination: true)
+    puts "Directory already exists, updating ..."
+  end
+  js_libs(p1)
 elsif command == 'convert'
   Dir['*.xml'].each do |f|
     XML::Smart.modify(f) do |doc|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.7
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.114'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.114'
 - !ruby/object:Gem::Dependency
   name: weel
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - cockpit/js/edit.js
 - cockpit/js/instance.js
 - cockpit/js/model.js
+- cockpit/js/modifiers.js
 - cockpit/js/parameters.js
 - cockpit/js/replay.js
 - cockpit/js/track.js
@@ -586,7 +587,6 @@ files:
 - lib/engine.xml
 - lib/engine/instance-info.rng
 - lib/engine/instances.rng
-- lib/instantiation.xml
 - lib/properties.xml
 - lib/properties/arbitrary.rng
 - lib/properties/attributes.rng
@@ -630,9 +630,13 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
+- 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.rb
@@ -659,7 +663,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee.org). If you

data/lib/instantiation.xml

@@ -1,125 +0,0 @@
-<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <message name="xmlsimple">
-    <parameter name="xml" mimetype="*/xml"/>
-  </message>
-  <message name="xml">
-    <parameter name="behavior" type="string">
-      <choice>
-        <value>fork_ready</value>
-        <value>fork_running</value>
-        <value>wait_ready</value>
-        <value>wait_running</value>
-      </choice>
-    </parameter>
-    <parameter name="xml" mimetype="*/xml"/>
-    <optional>
-      <parameter name="init" type="string"/>
-    </optional>
-  </message>
-  <message name="url_info">
-    <parameter name="info" type="string"/>
-    <parameter name="behavior" type="string">
-      <choice>
-        <value>fork_ready</value>
-        <value>fork_running</value>
-        <value>wait_ready</value>
-        <value>wait_running</value>
-      </choice>
-    </parameter>
-    <parameter name="url" type="string"/>
-    <optional>
-      <parameter name="init" type="string"/>
-    </optional>
-    <optional>
-      <parameter name="endpoints" type="string"/>
-    </optional>
-    <optional>
-      <parameter name="stream" type="string"/>
-    </optional>
-  </message>
-  <message name="url">
-    <parameter name="behavior" type="string">
-      <choice>
-        <value>fork_ready</value>
-        <value>fork_running</value>
-        <value>wait_ready</value>
-        <value>wait_running</value>
-      </choice>
-    </parameter>
-    <parameter name="url" type="string"/>
-    <optional>
-      <parameter name="init" type="string"/>
-    </optional>
-    <optional>
-      <parameter name="endpoints" type="string"/>
-    </optional>
-    <optional>
-      <parameter name="stream" type="string"/>
-    </optional>
-  </message>
-  <message name="git">
-    <parameter name="behavior" type="string">
-      <choice>
-        <value>fork_ready</value>
-        <value>fork_running</value>
-        <value>wait_ready</value>
-        <value>wait_running</value>
-      </choice>
-    </parameter>
-    <parameter name="repo" type="string"/>
-    <parameter name="branch" type="string"/>
-    <parameter name="path" type="string"/>
-    <optional>
-      <parameter name="init" type="string"/>
-    </optional>
-    <optional>
-      <parameter name="endpoints" type="string"/>
-    </optional>
-    <optional>
-      <parameter name="stream" type="string"/>
-    </optional>
-  </message>
-  <message name="instance">
-    <parameter name="behavior" type="string">
-      <choice>
-        <value>fork_ready</value>
-        <value>fork_running</value>
-        <value>wait_ready</value>
-        <value>wait_running</value>
-        <value>wait_stopped_running</value>
-        <value>wait_finished_running</value>
-      </choice>
-    </parameter>
-    <parameter name="instance" type="integer"/>
-    <optional>
-      <parameter name="init" type="string"/>
-    </optional>
-  </message>
-
-  <message name="result">
-    <parameter name="instance" mimetype="application/json"/>
-  </message>
-
-  <resource>
-    <post in="xmlsimple" out="result"/>
-    <resource relative="xml">
-      <post in="xml" out="result"/>
-    </resource>
-    <resource relative="instance">
-      <post in="instance" out="result"/>
-    </resource>
-    <resource relative="url">
-      <post in="url" out="result"/>
-      <post in="url_info" out="result"/>
-    </resource>
-    <resource relative="git">
-      <post in="git" out="result"/>
-    </resource>
-    <resource relative="callback">
-      <resource>
-        <post/>
-      </resource>
-    </resource>
-  </resource>
-
-</description>