cpee 1.3.176 → 1.3.177

data/cockpit/lib/wfadaptor.css

@@ -124,7 +124,7 @@ svg text.normal {
   font-stretch:normal;
   text-align:center;
   line-height:125%;
-  writing-mode:lr-tb;
+  writing-mode:horizontal-tb;
   text-anchor:middle;
   color:#000000;
   fill:#000000;
@@ -140,7 +140,7 @@ svg text.inverted {
   font-stretch:normal;
   text-align:center;
   line-height:125%;
-  writing-mode:lr-tb;
+  writing-mode:horizontal-tb;
   text-anchor:middle;
   color:#ffffff;
   fill:#ffffff;
@@ -157,7 +157,7 @@ svg text.super {
   font-stretch:normal;
   text-align:center;
   line-height:100%;
-  writing-mode:lr-tb;
+  writing-mode:horizontal-tb;
   text-anchor:start;
   color:#000000;
   fill:#000000;
@@ -188,7 +188,7 @@ svg text.normallarge {
   font-stretch:normal;
   text-align:center;
   line-height:125%;
-  writing-mode:lr-tb;
+  writing-mode:horizontal-tb;
   text-anchor:middle;
   color:#000000;
   fill:#000000;
@@ -205,7 +205,7 @@ svg text.small {
   font-stretch:normal;
   text-align:center;
   line-height:125%;
-  writing-mode:lr-tb;
+  writing-mode:horizontal-tb;
   text-anchor:middle;
   color:#000000;
   fill:#000000;

data/cockpit/lib/wfadaptor.js

@@ -234,7 +234,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   this.get_node_by_svg_id = function(svg_id) { // {{{
     return $('[svg-id = \'' + svg_id + '\']', description);
   } // }}}
-  this.get_free_id = function() { // {{{
+  var get_free_id = this.get_free_id = function() { // {{{
     var existing = new Array();
     $('*[id]', description).each(function(){existing.push($(this).attr('id'))});
     var id = 1;
@@ -242,7 +242,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       id += 1; 
     }
     return 'a' + id;
-  } // }}}
+  } // }}} 
   var update = this.update = function(svgid) { // {{{
     id_counter = {};
     if(update_illustrator){
@@ -263,25 +263,19 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   // }}}
   // Adaption functions {{{
   this.insert_after = function(new_node, target) { // {{{
-    var nn;
-    if(typeof(new_node) == 'function') {nn = new_node(target);}
-    else {nn = new_node;}
+    var nn = $X(new_node.replace(/###/,get_free_id()));
     target.after(nn);
     nn.attr('new','true');
     update();
   } // }}}
   this.insert_first_into = function(new_node, target, selector) { // {{{
-    var nn;
-    if(typeof(new_node) == 'function') {nn = new_node(target);}
-    else {nn = new_node;}
+    var nn = $X(new_node.replace(/###/,get_free_id()));
     target.prepend(nn);
     nn.attr('new','true');
     update();
   } // }}}
   this.insert_last_into = function(new_node, target, selector) { // {{{
-    var nn;
-    if(typeof(new_node) == 'function') {nn = new_node(target);}
-    else {nn = new_node;}
+    var nn = $X(new_node.replace(/###/,get_free_id()));
     target.append(nn);
     nn.attr('new','true');
     update();

data/cockpit/testsets/Worklist Parallel.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<testset>
+  <dataelements>
+    <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
+    <a xmlns="http://riddl.org/ns/common-patterns/properties/1.0">1</a>
+    <b xmlns="http://riddl.org/ns/common-patterns/properties/1.0">1</b>
+    <c xmlns="http://riddl.org/ns/common-patterns/properties/1.0">1</c>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</cb>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a2" endpoint="cb" svg-label="">
+            <parameters>
+              <label>"OKA"</label>
+              <method>:post</method>
+              <parameters>
+                <orgmodel>"organisation1"</orgmodel>
+                <domain>"Virtual Business 1"</domain>
+                <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+                <role>"regular"</role>
+                <schaden>"10001"</schaden>
+                <text>"sehr gut"</text>
+              </parameters>
+            </parameters>
+            <finalize>data.a = result.value</finalize>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a3" endpoint="cb" svg-label="">
+            <parameters>
+              <label>"OKB"</label>
+              <method>:post</method>
+              <parameters>
+                <orgmodel>"organisation1"</orgmodel>
+                <domain>"Virtual Business 1"</domain>
+                <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+                <role>"regular"</role>
+                <schaden>"12341231"</schaden>
+                <text>"totalo kaputto"</text>
+              </parameters>
+            </parameters>
+            <finalize>data.b = result.value</finalize>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="cb">
+            <parameters>
+              <label>"OKC"</label>
+              <method>:post</method>
+              <parameters>
+                <orgmodel>"organisation1"</orgmodel>
+                <domain>"Virtual Business 1"</domain>
+                <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+                <role>"regular"</role>
+                <schaden>"3000"</schaden>
+                <text>"ein Totalschaden"</text>
+              </parameters>
+            </parameters>
+            <finalize>data.c = result.value</finalize>
+          </call>
+        </parallel_branch>
+      </parallel>
+      <call id="a1" endpoint="cb" svg-label="OK OR NOT OK">
+        <parameters>
+          <label>"OK OR NOT OK"</label>
+          <method>:post</method>
+          <parameters>
+            <orgmodel>"organisation1"</orgmodel>
+            <domain>"Virtual Business 1"</domain>
+            <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+            <role>"regular"</role>
+            <schaden>"55546"</schaden>
+            <text>"fetzen hin"</text>
+          </parameters>
+        </parameters>
+        <finalize>data.bla = result.value</finalize>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+  </attributes>
+</testset>

data/cockpit/testsets/Worklist Test CPEE.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<testset>
+  <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9302</cb>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="cb">
+        <parameters>
+          <label>"OK OR NOT OK"</label>
+          <method>:post</method>
+          <parameters>
+            <orgmodel>"organisation1"</orgmodel>
+            <domain>"Virtual Business 1"</domain>
+            <form>"http://cpee.org/forms/form-f.html"</form>
+            <role>"regular"</role>
+            <schaden>"55546"</schaden>
+            <text>"fetzen hin"</text>
+          </parameters>
+        </parameters>
+        <manipulate>data.bla = result.value</manipulate>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+  </attributes>
+</testset>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.176"
+  s.version          = "1.3.177"
   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"
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl'
-  s.add_runtime_dependency 'weel'
-  s.add_runtime_dependency 'savon'
-  s.add_runtime_dependency 'highline'
+  s.add_runtime_dependency 'riddl', '>= 0.99.180'
+  s.add_runtime_dependency 'weel', '>= 1.99.39'
+  s.add_runtime_dependency 'savon', '~> 2'
+  s.add_runtime_dependency 'highline', '~> 1.6'
 end

data/lib/cpee/controller.rb

@@ -251,7 +251,7 @@ module CPEE
                 end
               end
             end
-            evs.each { |e| @votes[e].delete(key) if @votes[e] }
+            evs.each { |e| @events[e].delete(key) if @events[e] }
             vos.each do |e| 
               @callbacks.each{|voteid,cb|cb.delete_if!(e,key)}
               @votes[e].delete(key) if @votes[e]

data/lib/cpee/processtransformation/cpee.rb

@@ -54,8 +54,7 @@ module CPEE
 
         def print_Node(node,res)
           if node.endpoints.empty? && !node.script.nil? && node.script.strip != ''
-            n = res.add('d:manipulate', 'id' => "a#{node.niceid}")
-            n.text = node.script
+            n = res.add('d:manipulate', 'id' => "a#{node.niceid}", node.script)
             n.attributes['output'] = node.script_var unless node.script_var.nil?
             n.attributes['language'] = node.script_type unless node.script_type.nil?
           else
@@ -70,7 +69,7 @@ module CPEE
               par.add(k,v)
             end
             if !node.script.nil? && node.script.strip != ''
-              x = n.add('manipulate',node.script)
+              x = n.add('d:finalize',node.script)
               x.attributes['output'] = node.script_var unless node.script_var.nil?
               x.attributes['language'] = node.script_type unless node.script_type.nil?
             end

data/server/instances/38/properties.xml

@@ -0,0 +1,46 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl>call :a1, :cb, { :label =&gt; "", :method =&gt; :post, :parameters =&gt; nil }
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="cb">
+        <parameters>
+          <label>""</label>
+          <method>:post</method>
+          <parameters/>
+        </parameters>
+      </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="cb">
+        <parameters>
+          <label>""</label>
+          <method>:post</method>
+          <parameters/>
+        </parameters>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+</properties>

data/server/instances/39/properties.xml

@@ -0,0 +1,58 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+  </attributes>
+  <state>stopped</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions>
+    <a1>at</a1>
+  </positions>
+  <dataelements>
+    <b>8</b>
+  </dataelements>
+  <endpoints>
+    <cb>http://gruppe.wst.univie.ac.at/~mangler/services/callback.simple.php</cb>
+  </endpoints>
+  <dsl>call :a1, :cb, { :label =&gt; "Update", :method =&gt; :post, :parameters =&gt; nil }, &lt;&lt;-END, &lt;&lt;-END
+data.a = result.value
+END
+data.b = result.value
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="cb">
+        <parameters>
+          <label>"Update"</label>
+          <method>:post</method>
+          <parameters/>
+        </parameters>
+        <finalize>data.a = result.value</finalize>
+        <update>data.b = result.value</update>
+      </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="cb">
+        <parameters>
+          <label>"Update"</label>
+          <method>:post</method>
+          <parameters/>
+        </parameters>
+        <finalize>data.a = result.value</finalize>
+        <update>data.b = result.value</update>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+</properties>

data/server/instances/40/properties.xml

@@ -0,0 +1,148 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</airline>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </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>
+  </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
+  end
+end
+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="bookAir">
+        <parameters>
+          <method>:post</method>
+          <parameters>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </parameters>
+        </parameters>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </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>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </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>
+    <id>0</id>
+    <message>undefined</message>
+  </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>
+        <finalize output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</finalize>
+      </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>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
+            </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>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>