cpee 1.3.153 → 1.3.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ec5e5f7ac3fa863944fbc529d2ba6c76a607af
-  data.tar.gz: 62ece76319951cc933330e66790970c1459d9768
+  metadata.gz: 3b82462869a2853a428365a5d22819a6bc9012e7
+  data.tar.gz: dadf5ce874de2edc08552e8646e3ce1e15d65339
 SHA512:
-  metadata.gz: e3864d4873c6828dd51521d1a43f627ebed013d8a98a3fbb36cfc27d4f3fdb938d1a025dda7ccd818f2f67c7f3acb8c54769402b4db32b1b1b4b9f88d6f11bdc
-  data.tar.gz: 2205fc313cf30d7b99a0e6541dd57d434b61d574c22a9b915ec8536cfe526adc0788f0c45cd647ea37b30da1c31d5ec690747afcd4528460efb0cf5185e2bb4f
+  metadata.gz: 270cf087d7420d7a9a68623accbd86f4ae983b8434af89127eac41140cc046590320331f064d20afe1971a04fc8121395c85b66b36b63b728e30d8f8938e719f
+  data.tar.gz: 28f94599b36695d4acd61db487bc526e1aea42df4c879beaade34cc059626eed138c6467fd80db6a144a0cb9af69b4521971381fdefad2aa4980454dbfd851df

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.153"
+  s.version          = "1.3.154"
   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/processtransformation/bpmn2.rb

@@ -73,7 +73,7 @@ module CPEE
 
         def extract_nodelink(doc)
           doc.find("/bm:definitions/bm:process/bm:*[@id and @name and not(@itemSubjectRef) and not(name()='sequenceFlow')]").each do |e|
-            n = Node.new(e.attributes['id'],e.qname.name.to_sym,e.attributes['name'].strip,e.find('count(bm:incoming)'),e.find('count(bm:outgoing)'))
+            n = Node.new(self.object_id,e.attributes['id'],e.qname.name.to_sym,e.attributes['name'].strip,e.find('count(bm:incoming)'),e.find('count(bm:outgoing)'))
 
             if e.attributes['scriptFormat'] != ''
               n.script_type = e.attributes['scriptFormat']
@@ -189,7 +189,8 @@ module CPEE
             if node = traces.same_first
               if branch.empty? && branch.respond_to?(:id)
                 li = if (branch.id == traces.first_node.id)
-                  ### for tail controlled loops
+                  ### for tail controlled loops, use the link from this to next
+                  ### if a tasks loops to itself, then second_nodes returns the first
                   @graph.link(branch.id,traces.second_nodes.first.id)
                 else
                   @graph.link(branch.id,traces.first_node.id)
@@ -238,7 +239,7 @@ module CPEE
                     branch << InfiniteLoop.new(node.id)
                     ### add the blank conditional to get a break
                     len = loops.length
-                    loops.add_breaks
+                    loops.add_breaks(self.object_id)
                     puts '--> down loop2 to ' + (down + 1).to_s if debug
                     build_ttree branch.last, loops.dup, nil, debug, down + 1
                     puts '--> up loop2 from ' + (down + 1).to_s if debug
@@ -264,7 +265,7 @@ module CPEE
                 nb = branch.last.new_branch
                 if trcs.finished?
                   puts '--> branch down to ' + (down + 1).to_s if debug
-                  build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug, down + 1
+                  build_ttree nb, Traces.new([[Break.new(self.object_id,1)]]), endnode, debug, down + 1
                   puts '--> branch up from ' + (down + 1).to_s if debug
                 else  
                   puts '--> branch down to ' + (down + 1).to_s if debug

data/lib/cpee/processtransformation/structures.rb

@@ -41,13 +41,14 @@ module CPEE
 
     class Node #{{{ 
       include Container
-      @@niceid = -1
+      @@niceid = {}
       attr_reader :id, :label, :niceid
       attr_reader :endpoints, :methods, :parameters, :attributes
       attr_accessor :script, :script_id, :script_var, :script_type, :incoming, :outgoing, :type
-      def initialize(id,type,label,incoming,outgoing)
+      def initialize(context,id,type,label,incoming,outgoing)
+        @@niceid[context] ||= -1
+        @niceid = (@@niceid[context] += 1)
         @id = id
-        @niceid = (@@niceid += 1)
         @type = type
         @label = label
         @endpoints = []
@@ -73,8 +74,8 @@ module CPEE
     end #}}}
 
     class Break < Node
-      def initialize(incoming)
-        super '-1', :break, 'BREAK', incoming, []
+      def initialize(context,incoming)
+        super context, '-1', :break, 'BREAK', incoming, []
       end
     end
 
@@ -283,7 +284,7 @@ module CPEE
           self.first.first
         end
         def second_nodes
-          self.map { |t| t[1] }
+          self.map { |t| t.length > 1 ? t[1] : t[0] }
         end
 
         def shortest
@@ -338,13 +339,13 @@ module CPEE
         end
 
 
-        def add_breaks
+        def add_breaks(context)
           trueloops = self.find_all{ |t| t.last == t.first }.length
           if trueloops == self.length
             self << [self.first_node] ### the blank conditional so that we get a break
           else
             self.each do |t|
-              t << Break.new(1) unless t.last == t.first ### an explicit break
+              t << Break.new(context,1) unless t.last == t.first ### an explicit break
             end
           end  
         end

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>