cpee 1.3.158 → 1.3.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b5ffdfcdf5cdde6a5cad7fd8239b6a576af523
-  data.tar.gz: 1d7c3456cc507e0c59a5b03cfb825c78f8364c98
+  metadata.gz: 7c839fcbe55d2d855568d6467466d136d756288c
+  data.tar.gz: 74c5767ec1e718a38f440c01005922f54ba90920
 SHA512:
-  metadata.gz: 310a5d9957e04db8b3f323fcc07e0cb9ec163bd1219eeeef4fb1bc5ca59c6bddb71468f9dfc67931875d84b521413c7439e63c0c68b399edebb4365620eb1b4c
-  data.tar.gz: e4ae347430703183ca97f271c64ed22944f716e8c11d517295ef516726b75621f1481ea6ac440f7febdb70c2a3044ba887fcc7b8962b8164ec7864de822bbdcc
+  metadata.gz: 532002e583957edbb012a7f9e62282680fc1dd59c5c495349762250de952822f96ccd94664ed05f9eab26306a4edd537aed9fc9001a0a1425117049a8b0cab21
+  data.tar.gz: d4bcf178ce517f1df5cbd3f3278976d6c1da7610f74db0084d459cf321eb2a5a160c06896dcba9a8f04e8c88a3108f86f11a5c127ac13b3c09aea00163f2ecac

data/cpee.gemspec

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

@@ -206,9 +206,10 @@ module CPEE
                   end  
                 end  
               end
+              nic = traces.incoming(node)
               if node == enode
                 traces.shift_all
-              elsif node.incoming <= 1
+              elsif nic == 1 || branch.is_a?(CPEE::ProcessTransformation::InfiniteLoop)
                 traces.shift_all
                 n = map_node(node)
                 if !(n.nil? || (n.container? && (node.outgoing <=1 || traces.finished?)))
@@ -218,6 +219,7 @@ module CPEE
                 loops = traces.loops
                 if node.type == :exclusiveGateway || traces.all_loops?
                   ### as the first is a decision node, just remove and continue
+                  ### change to nic
                   if node.incoming == 2
                     node.incoming = 1
                     branch << Loop.new(node.id)
@@ -274,7 +276,12 @@ module CPEE
                 end  
                 endnode.incoming -= 1 unless endnode.nil?
               end
-              traces.empty! if endnode.nil?
+              # remove all traces that don't start with endnode to account for loops
+              if endnode.nil?
+                traces.empty!
+              else  
+                traces.remove_by_endnode(endnode)
+              end  
               ### all before is reduced to one incoming arrow
               ### if now there is still more than one incoming we have a loop situation
               ### where the end of a branching statement is also the starting/endpoint 

data/lib/cpee/processtransformation/structures.rb

@@ -271,6 +271,11 @@ module CPEE
             self.delete(t)
           end  
         end
+        def remove_by_endnode(enode)
+          self.delete_if do |t|
+            t[0] != enode 
+          end
+        end
 
         def empty!
           self.delete_if{true}
@@ -311,14 +316,13 @@ module CPEE
         end
 
         # future use
-        def incoming
-          if node = self.same_first
-            tcount = 1
-            self.each{|t| tcount += 1 if t.first == t.last }
-            tcount
-          else
-            raise "Wrong Question"
+        def incoming(node)
+          tcount = 1
+          self.each do |t|
+            break if t.length == 1
+            tcount += 1 if t.last == node
           end  
+          tcount
         end
 
         def include_in_all?(e)
@@ -341,11 +345,12 @@ module CPEE
 
         def add_breaks(context)
           trueloops = self.find_all{ |t| t.last == t.first }.length
+          tb = Break.new(context,1)
           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(context,1) unless t.last == t.first ### an explicit break
+              t << tb unless t.last == t.first ### an explicit break
             end
           end  
         end
@@ -439,7 +444,8 @@ module CPEE
         def find_endnode
           # supress loops
           trcs = self.dup
-          # trcs.delete_if { |t| t.uniq.length < t.length }
+          # dangerous TODO
+          trcs.delete_if { |t| t.uniq.length < t.length }
 
           # find common node (except loops)
           enode = nil

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>