cpee 1.3.140 → 1.3.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911233c2e45d805df55cdac08a7ab06d4500f167
-  data.tar.gz: 439c916ef6543f720017c8a94ee16e6bc25c9b54
+  metadata.gz: a9f727646483f63c20bd683be909a4f005c25527
+  data.tar.gz: 9c1ed21ea4c416c441ab704c3c258e33d1d404ac
 SHA512:
-  metadata.gz: 572d3b0edd625302a7e92380ea7f1785058b3075559f4789f8a7d5abdac33798ae13a2f80ba2ba86554de386f8bcc0a21f0f4fb578f7ef20ad28b03ab75a54fd
-  data.tar.gz: bcc7dee6644a9eadb04f8ac10c2d0b9d4c0e698f7a10f7b3a11a50bff4861b826099cf1a10910fdcd7ab9ea2ebd5eb0b188599ba57548795b882b7e185b714de
+  metadata.gz: cf4a477d3d1ed014480e06ec6640f6dc054727e9ae64633a49bb0d33d921be3469dff058d02eae9f00e405a629a925f363db416227fe3f3b7d74387aaa8a1921
+  data.tar.gz: f924f355af613ea2b75910e9e091f712df7c446eacfa019313b75bb28fae9b7d18955488a2f646471d1b9e1c4f760c8dfd79adeacd26a81c2385a45671c30de1

data/cockpit/js/wfadaptor.cpee.js

@@ -214,6 +214,29 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
+    'description' : {//{{{
+      'create':  function(target) {
+        var node = null;
+        node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
+        return node;
+      },
+      'permissible_children': function(node) {
+        if(node.children('manipulate').lenght < 1)
+          return [
+           {'label': 'Script Block', 
+            'function_call': adaptor.description.insert_last_into, 
+            'menu_icon': elements.callmanipulate.illustrator.svg, 
+            'params': [adaptor.description.elements.manipulate.create, node]}
+          ];
+        return [];
+      }
+    },//}}}
+    'adaptor' : {//{{{
+      'mousedown': function (node, e) {
+        events.mousedown(node,e,true, true);
+      },
+      'click': events.click,
+    }//}}}
   }; /*}}}*/
   this.elements.callcorrelation = { /*{{{*/
     'illustrator': {//{{{
@@ -227,6 +250,29 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
+    'description' : {//{{{
+      'create':  function(target) {
+        var node = null;
+        node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="correlation" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
+        return node;
+      },
+      'permissible_children': function(node) {
+        if(node.children('manipulate').lenght < 1)
+          return [
+           {'label': 'Script Block', 
+            'function_call': adaptor.description.insert_last_into, 
+            'menu_icon': elements.callmanipulate.illustrator.svg, 
+            'params': [adaptor.description.elements.manipulate.create, node]}
+          ];
+        return [];
+      }
+    },//}}}
+    'adaptor' : {//{{{
+      'mousedown': function (node, e) {
+        events.mousedown(node,e,true, true);
+      },
+      'click': events.click,
+    }//}}}
   }; /*}}}*/
   this.elements.callinstantiation = { /*{{{*/
     'illustrator': {//{{{
@@ -240,6 +286,29 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
+    'description' : {//{{{
+      'create':  function(target) {
+        var node = null;
+        node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="instantiate" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
+        return node;
+      },
+      'permissible_children': function(node) {
+        if(node.children('manipulate').lenght < 1)
+          return [
+           {'label': 'Script Block', 
+            'function_call': adaptor.description.insert_last_into, 
+            'menu_icon': elements.callmanipulate.illustrator.svg, 
+            'params': [adaptor.description.elements.manipulate.create, node]}
+          ];
+        return [];
+      }
+    },//}}}
+    'adaptor' : {//{{{
+      'mousedown': function (node, e) {
+        events.mousedown(node,e,true, true);
+      },
+      'click': events.click,
+    }//}}}
   }; /*}}}*/
   this.elements.callmanipulate = { /*{{{*/
     'illustrator': {//{{{
@@ -253,6 +322,29 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
+    'description' : {//{{{
+      'create':  function(target) {
+        var node = null;
+        node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="" xmlns="http://this.org/ns/description/1.0"><parameters><label></label><method>post</method><parameters/></parameters><manipulate output="result"/></call>');
+        return node;
+      },
+      'permissible_children': function(node) {
+        if(node.children('manipulate').lenght < 1)
+          return [
+           {'label': 'Script Block', 
+            'function_call': adaptor.description.insert_last_into, 
+            'menu_icon': elements.callmanipulate.illustrator.svg, 
+            'params': [adaptor.description.elements.manipulate.create, node]}
+          ];
+        return [];
+      }
+    },//}}}
+    'adaptor' : {//{{{
+      'mousedown': function (node, e) {
+        events.mousedown(node,e,true, true);
+      },
+      'click': events.click,
+    }//}}}
   }; /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'illustrator': {//{{{

data/cpee.gemspec

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

@@ -173,7 +173,7 @@ module CPEE
         end #}}}
         private :map_node
 
-        def build_ttree(branch,traces,enode=nil,debug=false)
+        def build_ttree(branch,traces,enode=nil,debug=false,down=0)
           while not traces.finished?
             ### if traces exist more than once, make it so they exist only once
             ### if somebody creates a modell with an inclusive/exclusive that
@@ -212,7 +212,7 @@ module CPEE
                       traces.shift_all
                     end
                     loops.remove_empty
-                    build_ttree branch.last, loops, nil, debug
+                    build_ttree branch.last, loops.dup, nil, debug, down + 1
                   else  
                     ### dont remove it, treat it as a normal conditional
                     ### an infinite loop that can only be left by break is created
@@ -221,7 +221,7 @@ module CPEE
                     ### add the blank conditional to get a break
                     len = loops.length
                     loops.add_breaks
-                    build_ttree branch.last, loops, nil, debug
+                    build_ttree branch.last, loops.dup, nil, debug, down + 1
                     ### set outgoing to number of loops (without the break) so that it can be ignored (should be 1 all the time)
                     node.outgoing -= len
                   end   
@@ -229,7 +229,7 @@ module CPEE
                   node.incoming -= loops.length
                   ### throw away the loop traces, remove loop traces from front of all other traces
                   traces.segment_by_loops loops
-                  build_ttree branch, loops, nil, debug
+                  build_ttree branch, loops.dup, nil, debug, down + 1
                 end
                 traces.remove(loops)
                 traces.remove_empty
@@ -240,9 +240,9 @@ module CPEE
               tracesgroup.each do |trcs|
                 nb = branch.last.new_branch
                 if trcs.finished?
-                  build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug
+                  build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug, down + 1
                 else  
-                  build_ttree nb, trcs, endnode, debug
+                  build_ttree nb, trcs, endnode, debug, down + 1
                 end  
                 endnode.incoming -= 1 unless endnode.nil?
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.140
+  version: 1.3.141
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl