cpee 1.4.20 → 1.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abed28f89d5a0d2d9fb9a1b3441abf39da7558ece841f3f5bf5e73112cb761fe
-  data.tar.gz: b7ebbda76cd00081c7512a934e77ee23b5566b334d782ce03ae38f65ba610d6e
+  metadata.gz: 353a2b794638ff548e66e80c3e3f07156f2950418e1235a15227218ad8ef3865
+  data.tar.gz: 213780c132273b1db52b734ff9d0f591a5beaa82fa0e26b891086af335acd827
 SHA512:
-  metadata.gz: 2655808212b6d633c2e85172285dd8cf8405bc8944a0cc00c22336e0189f585ea8ff6ed5ff0b33f55f54524bf8f55940659dd65788c3b2e5972f5bd51ccd714d
-  data.tar.gz: f170b5a892b8e5c649cf451074e987bc8f24a0c662491de161bfc95fc4c7a6992fb11e9e949c45f6ba2780978436ecb563b50c75ea4ca2a617527b6a3b40319a
+  metadata.gz: c5479c3f260fc5371bda1f6c813144020d08d76698faf74a10319b836760405df9a38553c3d00a6243de8b0944a66c0f29cf39933d692b2a6ef5622c3160f5aa
+  data.tar.gz: dbf3338aec98924ae690c524b3b7ec59a5cca2125a640b8396eec0632a8c84123f4d310be9c97099fb498b21fb18e43b31538861438cb34fbd71f432c6a8076a

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.20"
+  s.version          = "1.4.21"
   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/instantiation.rb

@@ -70,11 +70,13 @@ module CPEE
                 inp = "url=" + URI.encode_www_form_component(url)
                 inp = inp + "&topic=" + han.children.first.attributes['topic']
                 inp = inp + "&" + han.children.first.qname.to_s + "=" + han.children.first.to_s
-                pp cpee+ins+"/notifications/subscriptions/"
-                pp inp
-                status,body = Riddl::Client::new(cpee+ins+"/notifications/subscriptions/").post([Riddl::Parameter::Simple.new("url",han.attributes['url']),Riddl::Parameter::Simple.new("topic",han.children.first.attributes['topic']),Riddl::Parameter::Simple.new(han.children.first.qname.to_s,han.children.first.to_s)])
-                pp status
-                pp body
+                status,body = Riddl::Client::new(cpee+ins+"/notifications/subscriptions/").post(
+                  [
+                    Riddl::Parameter::Simple.new("url",han.attributes['url']),
+                    Riddl::Parameter::Simple.new("topic",han.children.first.attributes['topic']),
+                    Riddl::Parameter::Simple.new(han.children.first.qname.to_s,han.children.first.to_s)
+                  ]
+                )
               end
             end
           end
@@ -147,11 +149,18 @@ module CPEE
         if (instance, uuid = load_testset(tdoc,cpee,@p[0].value)).first == -1
           @status = 500
         else
-          @headers << Riddl::Header.new('CPEE-INSTANTIATION',File.join(cpee,instance))
           handle_data cpee, instance, @p[3]&.value
           handle_waiting cpee, instance, uuid, @p[1].value, selfurl, cblist
           handle_starting cpee, instance, @p[1].value
-          return Riddl::Parameter::Simple.new("url",cpee + instance)
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => @p[1].value
+          }
+          @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
       end
     end  #}}}
@@ -174,11 +183,17 @@ module CPEE
         if (instance, uuid = load_testset(tdoc,cpee)).first == -1
           @status = 500
         else
-          @headers << Riddl::Header.new('CPEE-INSTANTIATION',File.join(cpee,instance))
           handle_data cpee, instance, @p[data+1]&.value
           handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
           handle_starting cpee, instance, behavior
-          return Riddl::Parameter::Simple.new("url",cpee + instance)
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => behavior
+          }
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
       end
     end #}}}
@@ -217,12 +232,13 @@ module CPEE
         key = @r.last
         cb, condition, instance, uuid, instance_url = cblist.lrange(key,0,-1)
 
-        send = {
+        orisend = {
           'CPEE-INSTANCE' => instance,
           'CPEE-INSTANCE-URL' => instance_url,
           'CPEE-INSTANCE-UUID' => uuid,
           'CPEE-STATE' => notification['state']
         }
+        send = orisend.dup
 
         if notification['state'] == condition
           cblist.del(key)
@@ -236,9 +252,7 @@ module CPEE
               send[e.qname.name] = CPEE::ValueHelper::parse(e.text)
             end
           end
-          Riddl::Client.new(cb).put [
-            Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(send))
-          ]
+          Riddl::Client.new(cb).put Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(send))
         else
           Riddl::Client.new(cb).put [
             Riddl::Header.new('CPEE-UPDATE','true'),

data/lib/instantiation.xml

@@ -49,7 +49,7 @@
   </message>
 
   <message name="result">
-    <parameter name="url" type="anyURI"/>
+    <parameter name="instance" mimetype="application/json"/>
   </message>
 
   <resource>

data/log/logs/0a499c6f-397b-4ead-9528-8ce4190d5e8c.xes.yaml

@@ -0,0 +1,138 @@
+---
+log:
+  extension:
+    time: http://www.xes-standard.org/time.xesext
+    concept: http://www.xes-standard.org/concept.xesext
+    organisational: http://www.xes-standard.org/org.xesext
+    lifecycle: http://www.xes-standard.org/lifecycle.xesext
+    cpee: http://cpee.org/cpee.xesext
+  global:
+    trace:
+      concept:name: __INVALID__
+      cpee:name: __INVALID__
+    event:
+      concept:instance: -1
+      concept:name: __INVALID__
+      concept:endpoint: ''
+      id:id: ''
+      cpee:uuid: ''
+      lifecycle:transition: complete
+      cpee:lifecycle:transition: activity/calling
+      time:timestamp: ''
+  classifier:
+    Data: data_send data_received data_changed data_values
+    Data_Received: data_receiver
+    Data_Send: data_send
+    Data_Changed: data_changer
+    Data_Values: data_values
+  trace:
+    concept:name: '44'
+    cpee:name: Take Time
+    cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+---
+event:
+  concept:instance: '44'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: endpoints/change
+  data:
+    data_changer:
+    - timeout
+    data_values:
+      timeout: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+    data_received: 
+  time:timestamp: '2019-02-20T00:13:39.555+01:00'
+---
+event:
+  concept:instance: '44'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: attributes/change
+  data:
+    data_changer:
+    - info
+    - modeltype
+    - theme
+    - customer
+    - status
+    data_values:
+      info: Take Time
+      modeltype: CPEE
+      theme: default
+      customer: pilotfabrik
+      status: development
+    data_received: 
+  time:timestamp: '2019-02-20T00:13:39.582+01:00'
+---
+event:
+  concept:instance: '44'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: dataelements/change
+  data:
+    data_receiver: 
+  time:timestamp: '2019-02-20T00:13:39.587+01:00'
+---
+event:
+  concept:instance: '44'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: start
+  cpee:lifecycle:transition: activity/calling
+  data:
+    data_send:
+    - name: timeout
+      value: '5'
+    data_received: 
+  time:timestamp: '2019-02-20T00:13:40.352+01:00'
+---
+event:
+  concept:instance: '44'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: activity/receiving
+  data:
+    data_receiver:
+    - name: result
+      mimetype: text/html
+      data: 'Timeout: 5'
+  time:timestamp: '2019-02-20T00:13:45.350+01:00'
+---
+event:
+  concept:instance: '44'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: complete
+  cpee:lifecycle:transition: activity/done
+  data:
+    data_receiver: 
+  time:timestamp: '2019-02-20T00:13:45.373+01:00'
+---
+event:
+  concept:instance: '44'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 0a499c6f-397b-4ead-9528-8ce4190d5e8c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: dataelements/change
+  data:
+    data_changer:
+    - a
+    data_values:
+      a: 17
+    data_received: 
+  time:timestamp: '2019-02-20T00:13:45.384+01:00'

data/log/logs/0eec6f24-d5f5-4f07-9125-b1985854e96c.xes.yaml

@@ -0,0 +1,191 @@
+---
+log:
+  extension:
+    time: http://www.xes-standard.org/time.xesext
+    concept: http://www.xes-standard.org/concept.xesext
+    organisational: http://www.xes-standard.org/org.xesext
+    lifecycle: http://www.xes-standard.org/lifecycle.xesext
+    cpee: http://cpee.org/cpee.xesext
+  global:
+    trace:
+      concept:name: __INVALID__
+      cpee:name: __INVALID__
+    event:
+      concept:instance: -1
+      concept:name: __INVALID__
+      concept:endpoint: ''
+      id:id: ''
+      cpee:uuid: ''
+      lifecycle:transition: complete
+      cpee:lifecycle:transition: activity/calling
+      time:timestamp: ''
+  classifier:
+    Data: data_send data_received data_changed data_values
+    Data_Received: data_receiver
+    Data_Send: data_send
+    Data_Changed: data_changer
+    Data_Values: data_values
+  trace:
+    concept:name: '25'
+    cpee:name: Plain Instance
+    cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+---
+event:
+  concept:instance: '25'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: dataelements/change
+  time:timestamp: '2019-02-19T23:42:49.048+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: endpoints/change
+  list:
+    data_changer:
+    - timeout
+    - instantiate
+    data_values:
+      timeout: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+      instantiate: http://localhost:9296/url/
+  time:timestamp: '2019-02-19T23:42:49.074+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: attributes/change
+  list:
+    data_changer:
+    - uuid
+    - info
+    - modeltype
+    - theme
+    - customer
+    - status
+    data_values:
+      uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+      info: Subprocess
+      modeltype: CPEE
+      theme: default
+      customer: pilotfabrik
+      status: development
+  time:timestamp: '2019-02-19T23:42:49.191+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: start
+  cpee:lifecycle:transition: activity/calling
+  list:
+    data_send:
+    - name: info
+      value: Take Time
+    - name: behavior
+      value: wait_running
+    - name: url
+      value: http://localhost/testsets/Take_5.xml
+    - name: init
+      value: '{ "a": 3 }'
+  time:timestamp: '2019-02-19T23:42:50.496+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: activity/receiving
+  list:
+    data_receiver:
+    - name: dataelements
+      mimetype: application/json
+      data:
+        CPEE-INSTANCE: '26'
+        CPEE-INSTANCE-URL: http://localhost:8298/26
+        CPEE-INSTANCE-UUID: d8624a1e-11de-4b1c-806a-9cdd5f808043
+        CPEE-STATE: running
+  time:timestamp: '2019-02-19T23:42:51.542+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: start
+  cpee:lifecycle:transition: task/instantiation
+  time:timestamp: '2019-02-19T23:42:51.554+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: start
+  cpee:lifecycle:transition: task/instantiation
+  time:timestamp: '2019-02-19T23:42:56.791+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: activity/receiving
+  list:
+    data_receiver:
+    - name: dataelements
+      mimetype: application/json
+      data:
+        CPEE-INSTANCE: '26'
+        CPEE-INSTANCE-URL: http://localhost:8298/26
+        CPEE-INSTANCE-UUID: d8624a1e-11de-4b1c-806a-9cdd5f808043
+        CPEE-STATE: finished
+        a: 17
+  time:timestamp: '2019-02-19T23:42:56.816+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: complete
+  cpee:lifecycle:transition: activity/done
+  time:timestamp: '2019-02-19T23:42:56.837+01:00'
+---
+event:
+  concept:instance: '25'
+  concept:name: Take 5
+  concept:endpoint: http://localhost:9296/url/
+  id:id: a1
+  cpee:uuid: 0eec6f24-d5f5-4f07-9125-b1985854e96c
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: dataelements/change
+  list:
+    data_changer:
+    - instance
+    - res
+    data_values:
+      instance: '26'
+      res:
+        CPEE-INSTANCE: '26'
+        CPEE-INSTANCE-URL: http://localhost:8298/26
+        CPEE-INSTANCE-UUID: d8624a1e-11de-4b1c-806a-9cdd5f808043
+        CPEE-STATE: finished
+        a: 17
+  time:timestamp: '2019-02-19T23:42:56.862+01:00'

data/log/logs/17532e92-8e6e-4c91-bfa9-28817e42faee.xes.yaml

@@ -0,0 +1,138 @@
+---
+log:
+  extension:
+    time: http://www.xes-standard.org/time.xesext
+    concept: http://www.xes-standard.org/concept.xesext
+    organisational: http://www.xes-standard.org/org.xesext
+    lifecycle: http://www.xes-standard.org/lifecycle.xesext
+    cpee: http://cpee.org/cpee.xesext
+  global:
+    trace:
+      concept:name: __INVALID__
+      cpee:name: __INVALID__
+    event:
+      concept:instance: -1
+      concept:name: __INVALID__
+      concept:endpoint: ''
+      id:id: ''
+      cpee:uuid: ''
+      lifecycle:transition: complete
+      cpee:lifecycle:transition: activity/calling
+      time:timestamp: ''
+  classifier:
+    Data: data_send data_received data_changed data_values
+    Data_Received: data_receiver
+    Data_Send: data_send
+    Data_Changed: data_changer
+    Data_Values: data_values
+  trace:
+    concept:name: '38'
+    cpee:name: Take Time
+    cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+---
+event:
+  concept:instance: '38'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: endpoints/change
+  data:
+    data_changer:
+    - timeout
+    data_values:
+      timeout: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+    data_received: 
+  time:timestamp: '2019-02-20T00:05:11.116+01:00'
+---
+event:
+  concept:instance: '38'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: attributes/change
+  data:
+    data_changer:
+    - info
+    - modeltype
+    - theme
+    - customer
+    - status
+    data_values:
+      info: Take Time
+      modeltype: CPEE
+      theme: default
+      customer: pilotfabrik
+      status: development
+    data_received: 
+  time:timestamp: '2019-02-20T00:05:11.147+01:00'
+---
+event:
+  concept:instance: '38'
+  concept:name: external
+  id:id: external
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: dataelements/change
+  data:
+    data_receiver: 
+  time:timestamp: '2019-02-20T00:05:11.154+01:00'
+---
+event:
+  concept:instance: '38'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: start
+  cpee:lifecycle:transition: activity/calling
+  data:
+    data_send:
+    - name: timeout
+      value: '5'
+    data_received: 
+  time:timestamp: '2019-02-20T00:05:11.949+01:00'
+---
+event:
+  concept:instance: '38'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: activity/receiving
+  data:
+    data_receiver:
+    - name: result
+      mimetype: text/html
+      data: 'Timeout: 5'
+  time:timestamp: '2019-02-20T00:05:16.939+01:00'
+---
+event:
+  concept:instance: '38'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: unknown
+  cpee:lifecycle:transition: dataelements/change
+  data:
+    data_changer:
+    - a
+    data_values:
+      a: 17
+    data_received: 
+  time:timestamp: '2019-02-20T00:05:16.965+01:00'
+---
+event:
+  concept:instance: '38'
+  concept:name: ''
+  concept:endpoint: http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php
+  id:id: a1
+  cpee:uuid: 17532e92-8e6e-4c91-bfa9-28817e42faee
+  lifecycle:transition: complete
+  cpee:lifecycle:transition: activity/done
+  data:
+    data_receiver: 
+  time:timestamp: '2019-02-20T00:05:16.978+01:00'