cpee 1.3.167 → 1.3.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e61062d563c87e26436f94789bf2afa142ec64
-  data.tar.gz: d184fba43665672dd02b1c3538e85fcc04b693b5
+  metadata.gz: 8d20a645cd5602319c252baed2c151cd1a6ea266
+  data.tar.gz: a089ecaf444932dcfdb1b6b192dbcb7563233e88
 SHA512:
-  metadata.gz: 3cd3c1d205e31818b4762a241e804c9009a715bf0d957766270587a498401a2e5106bf574b3f1dc187e73ed6754bc247b100cd0109a02cb0abf2bac3ab58cd7c
-  data.tar.gz: 36b3658d3581d5ee4283525e388fa915704cbb800145337835c8e6fb84a0ef7c30e1e75090eb6fdc4ca5a2cdd9045496eca33baeefc62f8fc6a390f01914a958
+  metadata.gz: 57bcce0f278869e45f44966bb9a3f5318621791a86b32d91cfa04c82d2007e056aefe2a3e6b5f34322161b206416de7302618eca7ef78e04436c1c4aa71201d9
+  data.tar.gz: 8cdc6249a12fadc991ae264efcd16e28e25462048218f12e790533ad336df23f0be0949d38d28788eafb0a0db97e09cd12be3deaaf4da5a0505fb64d669c580c

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.167"
+  s.version          = "1.3.169"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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/server/handlerwrappers/default.rb

@@ -41,7 +41,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       end
       params << Riddl::Header.new("CPEE_BASE",@controller.base_url)
       params << Riddl::Header.new("CPEE_INSTANCE",@controller.instance_url)
-      params << Riddl::Header.new("CPEE_CALLBACK",callback)
+      params << Riddl::Header.new("CPEE_CALLBACK",@controller.instance_url + '/callbacks/' + callback)
 
       type = parameters[:method] || 'post'
       client = Riddl::Client.new(@handler_endpoint)
@@ -155,6 +155,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
           result = JSON::parse(result[0].value.read)
         elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
           result = XML::Smart::string(result[0].value.read)
+        elsif result[0].mimetype == 'text/plain'
+          result = result[0].value.read
         else
           result = result[0]
         end

data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/consumer-secret

@@ -0,0 +1 @@
+d206763d6042af84dad267ae316c2a00

data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/producer-secret

@@ -0,0 +1 @@
+63f8cb395dd00d19bf520b0ffa283007

data/server/instances/{16/notifications/d412275a0c76f202ecb65bfff859cf32 → 1/notifications/d12eff1ac812661c05d7090ce7394cf9}/subscription.xml

@@ -21,9 +21,6 @@
   <topic id="properties/endpoints">
     <event>change</event>
   </topic>
-  <topic id="properties/handlerwrapper">
-    <event>result</event>
-  </topic>
   <topic id="properties/handlers">
     <event>change</event>
   </topic>

data/server/instances/1/properties.xml

@@ -1,90 +1,65 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>Enter info here</info>
-  <state>ready</state>
+  <info>asd</info>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
-    <persons>3</persons>
-    <card>Visa_12345</card>
-    <airline>null</airline>
-    <hotels>[]</hotels>
-    <from>Vienna</from>
-    <to>Prague</to>
-    <costs>0</costs>
+    <x/>
   </dataelements>
   <endpoints>
-    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
-    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
-    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>call :a1, :bookAir, { :method =&gt; "post", :parameters =&gt; { :from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons } }, &lt;&lt;-end 
-  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'
-end
-parallel do
-  loop pre_test{data.persons &gt; 0} do
-    parallel_branch data.persons do |p|
-      call :a2, :bookHotel, { :method =&gt; "post", :parameters =&gt; { :to =&gt; data.to } }, &lt;&lt;-end 
-        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f
-      end
-    end
-    manipulate :a3, &lt;&lt;-end 
-      data.persons -= 1
-    end
+  <dsl>parallel do
+  parallel_branch do
+    call :a4, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
   end
-end
-choose do
-  alternative data.costs &gt; 700 do
-    call :a4, :approve, { :method =&gt; "post", :parameters =&gt; { :costs =&gt; data.costs } }
+  parallel_branch do
+    call :a5, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
   end
 end
+call :a2, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; b } }, &lt;&lt;-end 
+data.x += "a2,"
+end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>post</method>
-          <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </parameters>
-        </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
-      </call>
-      <parallel>
-        <loop pre_test="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
+      <!--{{{-->
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
               <parameters>
-                <method>post</method>
-                <parameters>
-                  <to>data.to</to>
-                </parameters>
+                <timeout>a</timeout>
               </parameters>
-              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</manipulate>
-            </call>
-          </parallel_branch>
-          <manipulate id="a3">      data.persons -= 1</manipulate>
-        </loop>
-      </parallel>
-      <choose>
-        <alternative condition="data.costs &gt; 700">
-          <call id="a4" endpoint="approve">
+            </parameters>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a5" endpoint="timeout" svg-label="">
             <parameters>
+              <label/>
               <method>post</method>
               <parameters>
-                <costs>data.costs</costs>
+                <timeout>a</timeout>
               </parameters>
             </parameters>
           </call>
-        </alternative>
-      </choose>
+        </parallel_branch>
+      </parallel>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>post</method>
+          <parameters>
+            <timeout>b</timeout>
+          </parameters>
+        </parameters>
+        <manipulate>data.x += "a2,"</manipulate>
+      </call>
     </description>
   </dslx>
   <status>
@@ -93,48 +68,41 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>post</method>
-          <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </parameters>
-        </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
-      </call>
-      <parallel>
-        <loop pre_test="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
+      <!--{{{-->
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
               <parameters>
-                <method>post</method>
-                <parameters>
-                  <to>data.to</to>
-                </parameters>
+                <timeout>a</timeout>
               </parameters>
-              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</manipulate>
-            </call>
-          </parallel_branch>
-          <manipulate id="a3">      data.persons -= 1</manipulate>
-        </loop>
-      </parallel>
-      <choose>
-        <alternative condition="data.costs &gt; 700">
-          <call id="a4" endpoint="approve">
+            </parameters>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a5" endpoint="timeout" svg-label="">
             <parameters>
+              <label/>
               <method>post</method>
               <parameters>
-                <costs>data.costs</costs>
+                <timeout>a</timeout>
               </parameters>
             </parameters>
           </call>
-        </alternative>
-      </choose>
+        </parallel_branch>
+      </parallel>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>post</method>
+          <parameters>
+            <timeout>b</timeout>
+          </parameters>
+        </parameters>
+        <manipulate>data.x += "a2,"</manipulate>
+      </call>
     </description>
   </description>
   <transformation>

data/server/instances/10/properties.xml

@@ -1,62 +1,90 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <info>Enter info here</info>
-  <state>ready</state>
+  <state>finished</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions>
-    <a1>after</a1>
-  </positions>
+  <positions/>
   <dataelements>
-    <x/>
+    <persons>0</persons>
+    <card>Visa_12345</card>
+    <airline>Lufthansa</airline>
+    <hotels>["Rathaus","Rathaus","Ibis"]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>940.0</costs>
   </dataelements>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
   </endpoints>
-  <dsl>call :a1, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end 
-  data.x += "a1,"
+  <dsl>call :a1, :bookAir, { :method =&gt; :post, :parameters =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, &lt;&lt;-end 
+  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'
 end
-call :a2, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end 
-  data.x += "a2,"
+parallel do
+  loop pre_test{data.persons &gt; 0} do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, { :method =&gt; :post, :parameters =&gt; {:to =&gt; data.to} }, &lt;&lt;-end 
+        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f
+      end
+    end
+    manipulate :a3, &lt;&lt;-end 
+      data.persons -= 1
+    end
+  end
 end
-call :a3, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end 
-  data.x += "a3,"
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
+  end
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <call id="a1" endpoint="timeout">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <!--{{{-->
-          <method>post</method>
+          <method>:post</method>
           <parameters>
-            <timeout>2</timeout>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
-      </call>
-      <call id="a2" endpoint="timeout">
-        <parameters>
-          <!--{{{-->
-          <method>post</method>
-          <parameters>
-            <timeout>4</timeout>
-          </parameters>
-        </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a2,"</manipulate>
-      </call>
-      <call id="a3" endpoint="timeout">
-        <parameters>
-          <!--{{{-->
-          <method>post</method>
-          <parameters>
-            <timeout>4</timeout>
-          </parameters>
-        </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a3,"</manipulate>
+        <manipulate output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</manipulate>
       </call>
+      <parallel>
+        <loop pre_test="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
+              </parameters>
+              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</manipulate>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <parameters>
+                <costs>data.costs</costs>
+              </parameters>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </dslx>
   <status>
@@ -65,40 +93,48 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <call id="a1" endpoint="timeout">
-        <parameters>
-          <!--{{{-->
-          <method>post</method>
-          <parameters>
-            <timeout>2</timeout>
-          </parameters>
-        </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>
-      </call>
-      <call id="a2" endpoint="timeout">
-        <parameters>
-          <!--{{{-->
-          <method>post</method>
-          <parameters>
-            <timeout>4</timeout>
-          </parameters>
-        </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a2,"</manipulate>
-      </call>
-      <call id="a3" endpoint="timeout">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <!--{{{-->
-          <method>post</method>
+          <method>:post</method>
           <parameters>
-            <timeout>4</timeout>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
           </parameters>
         </parameters>
-        <!--}}}-->
-        <manipulate output="result">  data.x += "a3,"</manipulate>
+        <manipulate output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</manipulate>
       </call>
+      <parallel>
+        <loop pre_test="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
+              </parameters>
+              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</manipulate>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <parameters>
+                <costs>data.costs</costs>
+              </parameters>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </description>
   <transformation>