cpee 1.3.174 → 1.3.175

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b2bcb0a54d9ba22dfe122a16356af176febe0d
-  data.tar.gz: b268f6cedef78bc4265d8564fdb72f7f940daaf6
+  metadata.gz: 70225433763cb242babcee10a600ef4c1c93608e
+  data.tar.gz: 656cdb6a210f034042af3286da1becec952e7e30
 SHA512:
-  metadata.gz: 37cc26d6baf204364d8b6852e8948c1a49bf6c47729aa7a8d323d5fc9e552d5e099e451562cfa5f58d747e629659f22829e8329b7690a3f384c8ee022bbe5e8e
-  data.tar.gz: a018352784375f69df6129f536d6d10a35cfc355c64b07b922962250165f4efc1174351d27763214f4e10fafc44bfaf25ed85037572b0de1b20ba9b8eb809500
+  metadata.gz: da3e0654adf834fdaa9b10268a31639516865fb80d9828a716679fc5d60e3c87147528ba16942254ce8ec81c25700b4533f1eddc049cc27aec8dfb8d15d6e623
+  data.tar.gz: 8b3493514a48f2fe03a7a1662ad71cacaedf124f92fa457bf179dbb6572c3d1d0ac12402c5cf0570ddcd82633de4e667d6364cc2944b9a0975ad049b34f610c0

data/Rakefile

@@ -2,12 +2,6 @@ require 'rake'
 require 'rubygems/package_task'
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['./test/*/tc_*.rb']
-  t.verbose = false
-end
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['./test/tc_*.rb']

data/cockpit/js/instance.js

@@ -610,6 +610,7 @@ function set_testset(testset) {// {{{
   });  
 
   load_testset_dataelements(url,testset);
+  load_testset_attributes(url,testset);
   load_testset_endpoints(url,testset);
   load_testset_pos(url,testset);
 
@@ -786,6 +787,20 @@ function load_testset_dataelements(url,testset) {// {{{
     error: report_failure
   });
 }// }}}
+function load_testset_attributes(url,testset) {// {{{
+  if ($("testset > attributes",testset).length == 0) { return; }
+  var ser = '';
+  $("testset > attributes > *",testset).each(function(){
+    ser += $(this).serializeXML() + "\n";
+  });
+  var val = "<content>" + ser + "</content>";
+  $.ajax({
+    type: "PUT", 
+    url: url + "/properties/values/attributes",
+    data: ({content: val}),
+    error: report_failure
+  });
+}// }}}
 function load_testset_endpoints(url,testset) {// {{{
   if ($("testset > endpoints",testset).length == 0) { return; }
   var ser = '';

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.174"
+  s.version          = "1.3.175"
   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/lib/cpee/controller.rb

@@ -62,6 +62,7 @@ module CPEE
       @callbacks = {}
       @instance = EmptyWorkflow.new(self)
       @positions = []
+      @attributes = {}
       @thread = nil
       @mutex = Mutex.new
       @opts = opts
@@ -93,6 +94,7 @@ module CPEE
       unserialize_endpoints!
       unserialize_dsl!
       unserialize_positions!
+      unserialize_attributes!
     end
 
     attr_reader :id
@@ -100,6 +102,7 @@ module CPEE
     attr_reader :notifications
     attr_reader :callbacks
     attr_reader :mutex
+    attr_reader :attributes
 
     def base_url 
       @opts[:url]
@@ -273,6 +276,12 @@ module CPEE
       end    
     end # }}} 
     
+    def unserialize_attributes! #{{{
+      @attributes = {}
+      @properties.data.find("/p:properties/p:attributes/p:*").map do |ele|
+        @attributes[ele.qname.name] = ele.text
+      end
+    end #}}}
     def unserialize_dataelements! #{{{
         @instance.data.clear
         @properties.data.find("/p:properties/p:dataelements/p:*").each do |e|

data/lib/cpee/handler_properties.rb

@@ -29,6 +29,8 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
       when 'dataelements'
         @data.unserialize_dataelements!
         @data.notify('properties/dataelements/change', :instance => @data.instance)
+      when 'attributes'
+        @data.unserialize_attributes!
       when 'positions'  
         @data.unserialize_positions!
         @data.notify('properties/position/change', :instance => @data.instance)

data/server/instances/1/properties.xml

@@ -1,65 +1,90 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>asd</info>
-  <state>stopped</state>
+  <info>Enter info here</info>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions>
-    <a1>after</a1>
-  </positions>
+  <positions/>
   <dataelements>
-    <x/>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>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>parallel do
-  parallel_branch do
-    call :a4, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
-  end
-  parallel_branch do
-    call :a5, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
+  <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
   end
 end
-call :a2, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; b } }, &lt;&lt;-end 
-data.x += "a2,"
+choose 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">
-      <!--{{{-->
-      <parallel svg-label="">
-        <parallel_branch svg-label="">
-          <call id="a4" endpoint="timeout" svg-label="">
-            <parameters>
-              <label/>
-              <method>post</method>
+      <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">
               <parameters>
-                <timeout>a</timeout>
+                <method>post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
               </parameters>
-            </parameters>
-          </call>
-        </parallel_branch>
-        <parallel_branch svg-label="">
-          <call id="a5" endpoint="timeout" svg-label="">
+              <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>
-              <label/>
               <method>post</method>
               <parameters>
-                <timeout>a</timeout>
+                <costs>data.costs</costs>
               </parameters>
             </parameters>
           </call>
-        </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>
+        </alternative>
+      </choose>
     </description>
   </dslx>
   <status>
@@ -68,41 +93,48 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <parallel svg-label="">
-        <parallel_branch svg-label="">
-          <call id="a4" endpoint="timeout" svg-label="">
-            <parameters>
-              <label/>
-              <method>post</method>
+      <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">
               <parameters>
-                <timeout>a</timeout>
+                <method>post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
               </parameters>
-            </parameters>
-          </call>
-        </parallel_branch>
-        <parallel_branch svg-label="">
-          <call id="a5" endpoint="timeout" svg-label="">
+              <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>
-              <label/>
               <method>post</method>
               <parameters>
-                <timeout>a</timeout>
+                <costs>data.costs</costs>
               </parameters>
             </parameters>
           </call>
-        </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>
+        </alternative>
+      </choose>
     </description>
   </description>
   <transformation>

data/server/instances/10/properties.xml

@@ -1,90 +1,62 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <info>Enter info here</info>
-  <state>finished</state>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
-    <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>
+    <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'
+  <dsl>call :a1, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end 
+  data.x += "a1,"
 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
-  end
+call :a2, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end 
+  data.x += "a2,"
 end
-choose :inclusive do
-  alternative "data.costs &gt; 700" do
-    call :a4, :approve, { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
-  end
+call :a3, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end 
+  data.x += "a3,"
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
         <parameters>
-          <method>:post</method>
+          <!--{{{-->
+          <method>post</method>
           <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
+            <timeout>2</timeout>
           </parameters>
         </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
+        <!--}}}-->
+        <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>
       </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>
@@ -93,48 +65,40 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
+      <!--{{{-->
+      <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">
         <parameters>
-          <method>:post</method>
+          <!--{{{-->
+          <method>post</method>
           <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
+            <timeout>4</timeout>
           </parameters>
         </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
+        <!--}}}-->
+        <manipulate output="result">  data.x += "a3,"</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>