cpee 1.4.23 → 1.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0684d7e7afade30d9f451dd8a32839d98d3be45ba7fcf3f901ee61646daf04b
-  data.tar.gz: edb98cf9fddb0d88ccc29879ad83668c4cdb95684f4d02901cfb5f23209145eb
+  metadata.gz: '08f6653fda7afe6c8b24428c634d92056edcf4528c29b9824345bbcf0be3a942'
+  data.tar.gz: e9d94336c0c9434185a49712a3bdd6781537ac161cffc1bc897dc41110fd5d7e
 SHA512:
-  metadata.gz: 13cb10d326b707afbcb43721bcb044ad1a66dd7ba1e9fce8fc36e19a8d0f94092d6d6b8604fdc22d20bdbab94f42848db7c697f81a9e11b8d828e0018f1659f2
-  data.tar.gz: 8bd78ae132f025df061ecfa1417a1e918ccb411b60b3c54d8155fd3ca21b186bb09c2160112ac7f4cc356096c5153491412d580288e5c20426cdb1d64efcf816
+  metadata.gz: 81c4e4692923091514f6675ba6bd74f48edd7f167be906a7a7f186931d77e131c15d451a5448302a254124d6af59d99f3d985a5f5f07968fe131d9bad0f28e9f
+  data.tar.gz: 773d660cdd071885f5dc4c04d621b2955d7654346306ded87e0fbc200698ac53431a101159985fb65447a8e0ff2ef7bc883679c5b15e926c14186fe51e841b90

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.23"
+  s.version          = "1.4.24"
   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

@@ -121,14 +121,15 @@ module CPEE
       def handle_data(cpee,instance,data) #{{{
         if data
           srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+          content = XML::Smart.string('<content/>')
           JSON::parse(data).each do |k,v|
-            res = srv.resource("/#{instance}/properties/values/dataelements/#{k}")
-            status, response = res.put [
-              Riddl::Parameter::Simple.new('value',v)
-            ]
-            sleep 0.42
-          end rescue nil
-        end
+            content.root.add(k,v)
+          end
+          res = srv.resource("/#{instance}/properties/values/dataelements/")
+          status, response = res.patch [
+            Riddl::Parameter::Complex.new('content','text/xml',content.to_s)
+          ]
+        end # rescue nil
       end #}}}
     end #}}}
 

data/server/handlerwrappers/default.rb

@@ -95,6 +95,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
         headers['CPEE_UPDATE'] = true
         callback result, headers
+      elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
+        # do nothing, later on things will happend
       else
         callback result
       end

data/server/instances/45/notifications/logging/consumer-secret

@@ -0,0 +1 @@
+f7c77861ac613eeac8fb9829c9a545a2

data/server/instances/45/notifications/logging/producer-secret

@@ -0,0 +1 @@
+2a24d172b1aeb05fe94fdc5e095dec32

data/server/instances/45/notifications/logging/subscription.xml

@@ -0,0 +1,19 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/">
+  <topic id="activity">
+    <event>calling</event>
+    <event>receiving</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+  <topic id="task">
+    <event>instantiation</event>
+  </topic>
+</subscription>

data/server/instances/45/properties.xml

@@ -0,0 +1,79 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>68204132-808e-44fc-b843-b5bab9d77205</uuid>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state changed="2019-03-06T10:25:24+01:00">ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <instantiate>http://localhost:9296/start/url/</instantiate>
+  </endpoints>
+  <dsl>call :a1, :instantiate, parameters: { :label =&gt; "", :method =&gt; :post, :arguments =&gt; nil, :sensors =&gt; nil }, finalize: &lt;&lt;-END, update: &lt;&lt;-END
+  data.testf = result
+END
+  data.testu = result
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+          <sensors/>
+        </parameters>
+        <finalize output="result">data.testf = result</finalize>
+        <update output="result">data.testu = result</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+          <sensors/>
+        </parameters>
+        <finalize output="result">data.testf = result</finalize>
+        <update output="result">data.testu = result</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+</properties>

data/server/instances/46/notifications/logging/consumer-secret

@@ -0,0 +1 @@
+f7c77861ac613eeac8fb9829c9a545a2

data/server/instances/46/notifications/logging/producer-secret

@@ -0,0 +1 @@
+2a24d172b1aeb05fe94fdc5e095dec32

data/server/instances/46/notifications/logging/subscription.xml

@@ -0,0 +1,19 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/">
+  <topic id="activity">
+    <event>calling</event>
+    <event>receiving</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+  <topic id="task">
+    <event>instantiation</event>
+  </topic>
+</subscription>

data/server/instances/46/properties.xml

@@ -0,0 +1,92 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>682ad1a6-0203-4ab1-aab8-1e03a8e2e7ac</uuid>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state changed="2019-03-06T10:44:07+01:00">finished</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <testu>{"CPEE-INSTANCE":"49","CPEE-INSTANCE-URL":"http://localhost:8298/49","CPEE-INSTANCE-UUID":"1af18178-9c8a-4796-99b7-e578c10e6d73","CPEE-BEHAVIOR":"wait_running"}</testu>
+    <testf>{"CPEE-INSTANCE":"49","CPEE-INSTANCE-URL":"http://localhost:8298/49","CPEE-INSTANCE-UUID":"1af18178-9c8a-4796-99b7-e578c10e6d73","CPEE-STATE":"finished","x":"a2,a3,"}</testf>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <instantiate>http://localhost:9296/url/</instantiate>
+  </endpoints>
+  <dsl>call :a1, :instantiate, parameters: { :label =&gt; "", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :info, :value =&gt; "Bla"), ⭐(:name =&gt; :behavior, :value =&gt; "wait_running"), ⭐(:name =&gt; :url, :value =&gt; "http://tango.wst.univie.ac.at/flow/testsets/Linear.xml"), ⭐(:name =&gt; :init, :value =&gt; "{ \"name\": \"test1\", \"test2\": \"test3\" }")], :sensors =&gt; nil }, finalize: &lt;&lt;-END, update: &lt;&lt;-END
+  data.testf = result
+END
+  data.testu = result
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <info>Bla</info>
+            <behavior>wait_running</behavior>
+            <url>http://tango.wst.univie.ac.at/flow/testsets/Linear.xml</url>
+            <init>{ "name": "test1", "test2": "test3" }</init>
+          </arguments>
+          <sensors/>
+        </parameters>
+        <finalize output="result">data.testf = result</finalize>
+        <update output="result">data.testu = result</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <info>Bla</info>
+            <behavior>wait_running</behavior>
+            <url>http://tango.wst.univie.ac.at/flow/testsets/Linear.xml</url>
+            <init>{ "name": "test1", "test2": "test3" }</init>
+          </arguments>
+          <sensors/>
+        </parameters>
+        <finalize output="result">data.testf = result</finalize>
+        <update output="result">data.testu = result</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+</properties>

data/server/instances/47/notifications/7972f12a8de016831501aff37ed5d42b/consumer-secret

@@ -0,0 +1 @@
+d628d7c1a07abe86b995f6a54ed55ac2

data/server/instances/47/notifications/7972f12a8de016831501aff37ed5d42b/producer-secret

@@ -0,0 +1 @@
+f9b8c6a0687aa5794b9a1d09366f3b1a

data/server/instances/47/notifications/7972f12a8de016831501aff37ed5d42b/subscription.xml

@@ -0,0 +1,5 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9296/callback/630fca62-f4fa-482d-ac0b-6d8473ee0542">
+  <topic id="state">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/47/notifications/logging/consumer-secret

@@ -0,0 +1 @@
+f7c77861ac613eeac8fb9829c9a545a2

data/server/instances/47/notifications/logging/producer-secret

@@ -0,0 +1 @@
+2a24d172b1aeb05fe94fdc5e095dec32

data/server/instances/47/notifications/logging/subscription.xml

@@ -0,0 +1,19 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/">
+  <topic id="activity">
+    <event>calling</event>
+    <event>receiving</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+  <topic id="task">
+    <event>instantiation</event>
+  </topic>
+</subscription>

data/server/instances/47/properties.xml

@@ -0,0 +1,120 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>dced9a5b-f903-4867-9c6e-c518354c83c0</uuid>
+    <info>Bla</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state changed="2019-03-06T10:41:23+01:00">ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions>
+    <a1>after</a1>
+  </positions>
+  <dataelements>
+    <x/>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl>call :a1, :timeout, parameters: { :label =&gt; "Step 1", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; "2")] }, finalize: &lt;&lt;-END
+  data.x += \"a1,\"
+END
+call :a2, :timeout, parameters: { :label =&gt; "Step 2", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; "4")] }, finalize: &lt;&lt;-END
+  data.x += \"a2,\"
+END
+call :a3, :timeout, parameters: { :label =&gt; "Step 3", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; "4")] }, finalize: &lt;&lt;-END
+  data.x += \"a3,\"
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/48/notifications/8a4421761a669db8ca22cd6087db6039/consumer-secret

@@ -0,0 +1 @@
+033903231c1738f8bf3098517416eb41

data/server/instances/48/notifications/8a4421761a669db8ca22cd6087db6039/producer-secret

@@ -0,0 +1 @@
+0973915969ce7e306913a6bc4098f2c3