cpee 1.3.164 → 1.3.166

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e39c003d6c60ea476a8befe15a93e3eeda0499
-  data.tar.gz: c362d7d34ad999b76ce606069d6b01b779b64f3d
+  metadata.gz: 198b8bcfa733ead864fc0e454c7ac32b17a8c9e5
+  data.tar.gz: 5908f1709219d3e4acd55c0d199fb3288bf1bf72
 SHA512:
-  metadata.gz: 183a69191898278d48bb3eeb4bb83b002d32d1c3fef44474fec400c0dcd5b2412e58fc481c8c3096c5e320dfb64da86675158de6c29e5443a175b8435708e015
-  data.tar.gz: 7a560160ba66231876b568f043aae90793342464c8f6f0ee7e344bdbc2d65b8cbcd1681a61cf7a91210254c66d7449cad21c1f50c51bd11d41e27803e9a942fd
+  metadata.gz: 4f3b1b70935400d609579ba813b6facede85f666ef2cbf7ea35a7f829d85183f2341856c78512a565f690cc4f0a3e96a728610ba3a9ca0657854709f9f22df5a
+  data.tar.gz: 4857693b77b788378610c44317e6aba7f1a440bd8555498a6bb2abfc10eb1f78f3132113dd17e63a6140bfba92bc34da88c3c732e0501a7106b7850f8597b424

data/cockpit/css/ui.css

@@ -37,23 +37,16 @@ button.highlight { background-color: #cc0000; }
 #areainstance select                { width: 18em; }
 #areainstance input[type=file]      { width: 18em; }
 
-#areainstance table.compact { width: 100% }
 
 #areainstance table.compact tbody.loadsave td:nth-child(2)        { padding-right: 0.5em; }
 #areainstance table.compact tbody.loadsave td:nth-child(3)        { padding: 0 0.5em; border-left: 1px solid ButtonShadow; }
-#areainstance table.compact tbody.loadsave td:nth-child(3) button { height: 5em; width: 15ex; }
+#areainstance table.compact tbody.loadsave td:nth-child(3) button { height: 5em; }
 #areainstance table.compact tbody.loadsave td:nth-child(4)        { padding: 0 0.5em; border-left: 1px solid ButtonShadow; }
-#areainstance table.compact tbody.loadsave td:nth-child(4) button { height: 5em; width: 15ex; }
+#areainstance table.compact tbody.loadsave td:nth-child(4) button { height: 5em; }
 
-#areainstance table.compact button[name=loadtestsetfile]   { width: 12em; }
-#areainstance table.compact button[name=loadtestset]       { width: 12em; }
-#areainstance table.compact button[name=loadmodelfile]     { width: 12em; }
-
-#areainstance table.compact:first-child tr td:nth-child(1) { width: 15ex; }
-
-#areainstance table.compact:last-child tr td:nth-child(1) { width: 18em; }
-#areainstance table.compact:last-child tr td:nth-child(2) { width: 12em; }
-#areainstance table.compact:last-child tr td:nth-child(3) { width: 15ex; }
+#areainstance table.compact button[name=setmodeltype]   { width: 10em; }
+#areainstance table.compact button[name=loadtestset]    { width: 10em; }
+#areainstance table.compact button[name=loadmodelfile]  { width: 10em; }
 
 #areaexecution { height: 7em; overflow: auto; }
 #areaexecution input { padding: 0; margin:0; }

data/cockpit/index.html

@@ -192,14 +192,14 @@
           <table class='compact'>
             <tbody class='loadsave'>
               <tr>
-                <td><select title='a testset includes various setting, subscriptions and a model' name="testset-names"></select></td>
-                <td><button title='a testset includes various setting, subscriptions and a model' name="loadtestset">load from testset</button></td>
+                <td><input type='file' name='testsetfile' id='testsetfile' style='display:none'/><select title='a testset includes various setting, subscriptions and a model' name="testset-names"><optgroup label='Local Files'><option value='###'>Select file ...</option></optgroup><optgroup label='Predefined examples'></optgroup></select></td>
+                <td><button title='a testset includes various setting, subscriptions and a model' name="loadtestset">load testset</button></td>
                 <td rowspan='3'><button title='a testset includes various setting, subscriptions and a model' name="savetestset">save testset</button><a id="savetestset" href="" download=""></a></td>
                 <td rowspan='3'><button title='a testset includes various setting, subscriptions and a model' name="savesvg">save svg graph</button><a id="savesvg" href="" download=""></a></td>
               </tr>
               <tr>
-                <td><input title='a testset includes various setting, subscriptions and a model' type='file' id='testsetfile'/></td>
-                <td><button title='a testset includes various setting, subscriptions and a model' name="loadtestsetfile">load from testset</button></td>
+                <td><select title='the model type affects the transformation property of an instance' name="transformation-names"></select></td>
+                <td><button title='a testset includes various setting, subscriptions and a model' name="setmodeltype">set model type</button></td>
               </tr>
               <tr>
                 <td><input title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' type='file' id='modelfile'/></td>

data/cockpit/js/instance.js

@@ -50,23 +50,23 @@ $(document).ready(function() {// {{{
   $("button[name=base]").click(function(){ create_instance(null); });
   $("button[name=instance]").click(function(){ ui_tab_click("#tabinstance"); monitor_instance(false); });
   $("button[name=loadtestset]").click(load_testset);
-  $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
   $("button[name=savetestset]").click(function(){ save_testset(); });
   $("button[name=savesvg]").click(function(){ save_svg(); });
   $("input[name=votecontinue]").click(check_subscription);
-
+  $("input[name=testsetfile]").change(load_testsetfile);
 
   $.ajax({ 
-    url: "testsets/index.xml", 
+    url: "testsets/testsets.xml", 
     dataType: 'xml',
     success: function(res){
       $('testset',res).each(function(){
         var ts = $(this).text();
-        $('select[name=testset-names]').append(
+        $('select[name=testset-names] optgroup:last-child').append(
           $("<option></option>").attr("value",ts).text(ts)
         );
       });
+      $('select[name=testset-names] optgroup:last-child option:first-child').attr('selected','selected');
       var q = $.parseQuery();
       if (q.monitor && q.load) {
         $("input[name=instance-url]").val(q.monitor);
@@ -85,6 +85,18 @@ $(document).ready(function() {// {{{
       }  
     }
   });
+  $.ajax({ 
+    url: "testsets/transformations.xml", 
+    dataType: 'xml',
+    success: function(res){
+      $('transformation',res).each(function(){
+        var ts = $(this).text();
+        $('select[name=transformation-names]').append(
+          $("<option></option>").attr("value",ts).text(ts)
+        );
+      });
+    }
+  });
 });// }}}
 
 function check_subscription() { // {{{
@@ -621,6 +633,7 @@ function set_testset(testset) {// {{{
  }// }}}
 function load_testsetfile() { //{{{
   if (running) return;
+  running = true;
   if (typeof window.FileReader !== 'function') {
     alert('FileReader not yet supportet');
     return;
@@ -662,16 +675,23 @@ function load_testset() {// {{{
 
   var name = $("select[name=testset-names]").val();
 
-  $.ajax({ 
-    cache: false,
-    dataType: 'xml',
-    url: "testsets/" + name + ".xml",
-    success: function(res){ 
-      document.title = name;
-      set_testset(res);
-    }
-  });
-  running  = false;
+  if (name == '###') {
+    running = false;
+    document.getElementById('testsetfile').click();
+  } else {  
+    $.ajax({ 
+      cache: false,
+      dataType: 'xml',
+      url: "testsets/" + name + ".xml",
+      success: function(res){ 
+        document.title = name;
+        set_testset(res);
+      },
+      complete: function() {
+        running  = false;
+      }
+    });
+  }  
 }// }}}
 
 function load_des(url,model) { //{{{

data/cockpit/js/wfadaptor.cpee.js

@@ -217,7 +217,7 @@ function CPEE(adaptor) {
     '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>');
+        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) {
@@ -253,7 +253,7 @@ function CPEE(adaptor) {
     '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>');
+        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) {
@@ -289,7 +289,7 @@ function CPEE(adaptor) {
     '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>');
+        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) {
@@ -325,7 +325,7 @@ function CPEE(adaptor) {
     '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>');
+        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) {
@@ -398,7 +398,7 @@ function CPEE(adaptor) {
     'description' : {//{{{
       'create':  function(target) {
         var node = $X('<call id="' + adaptor.description.get_free_id() + '" endpoint="" xmlns="http://cpee.org/ns/description/1.0"/>');
-        node.append($X('<parameters xmlns="http://cpee.org/ns/description/1.0"><label></label><method>post</method><parameters/></parameters>'));
+        node.append($X('<parameters xmlns="http://cpee.org/ns/description/1.0"><label>""</label><method>:post</method><parameters/></parameters>'));
         return node;
       },
       'permissible_children': function(node) {

data/cockpit/testsets/CPEE.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<testset>
+  <positions/>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <dataelements/>
+  <handlers/>
+  <endpoints><!--{{{-->
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout1.php</timeout>
+  </endpoints><!--}}}-->
+  <description/>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</testset>

data/cockpit/testsets/transformations.xml

@@ -0,0 +1,4 @@
+<transformations>
+  <transformation>CPEE</transformation>
+  <transformation>Signavio</transformation>
+</transformations>

data/cpee.gemspec

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

@@ -216,32 +216,34 @@ module CPEE
                 end
               else
                 loops = traces.loops
-                if node.type == :exclusiveGateway || traces.all_loops?
+                if node.type == :exclusiveGateway || traces.all_loops? # or (infinite loop[s])
+                  traces.remove(loops)
+
                   ### an infinite loop that can only be left by break is created
                   ### at the output time it is decided wether this can be optimized
                   branch << Loop.new(node.id)
                   ### duplicate because we need it later to remove all the shit from traces
-                  lops = loops.dup
+                  loops.add_breaks(self.object_id,node.type == :exclusiveGateway)
                   ### remove the exclusive gateway because we no longer need it
-                  lops.add_breaks(self.object_id,node.type == :exclusiveGateway)
-                  traces.remove(loops)
+                  ### if there is non (tail controlled, remove the loop target (last)
                   if node.type == :exclusiveGateway
-                    lops.shift_all
+                    loops.shift_all
                     traces.shift_all 
                   else
-                    lops.pop_all
+                    loops.pop_all
                   end
                   ### add the blank conditional to get a break
                   puts '--> down head_loop to ' + (down + 1).to_s if debug
-                  build_ttree branch, lops, nil, debug, down + 1
+                  build_ttree branch, loops, nil, debug, down + 1
                   puts '--> up head_loop from ' + (down + 1).to_s if debug
                 else
                   ### throw away the loop traces, remove loop traces from front of all other traces
-                  traces.segment_by_loops loops
+                  traces.remove(loops)
+                  traces.eliminate(loops)
+                  loops.extend
                   puts '--> down tail_loop to ' + (down + 1).to_s if debug
                   build_ttree branch, loops.dup, nil, debug, down + 1
                   puts '--> up tail_loop from ' + (down + 1).to_s if debug
-                  traces.remove(loops)
                 end
                 traces.remove_empty
               end
@@ -251,11 +253,7 @@ module CPEE
               tracesgroup, endnode = traces.segment_by endnode
               tracesgroup.each do |trcs|
                 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(self.object_id)]]), endnode, debug, down + 1
-                  puts '--> branch up from ' + (down + 1).to_s if debug
-                else  
+                unless trcs.finished?
                   puts '--> branch down to ' + (down + 1).to_s if debug
                   build_ttree nb, trcs, endnode, debug, down + 1
                   puts '--> branch up from ' + (down + 1).to_s if debug

data/lib/cpee/processtransformation/cpee.rb

@@ -22,38 +22,19 @@ module CPEE
 
   module ProcessTransformation
 
-    module Target
+    module Target 
 
-      class CPEE
-        def initialize(tree)
-          @tree = tree
-        end
+      class CPEE < Default
         def generate
           res = XML::Smart.string("<description xmlns='http://cpee.org/ns/description/1.0'/>")
           res.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-          generate_for_list(@tree,res.root)
-          res
-        end
-
-        def generate_for_list(list,res)
-          list.each do |e|
-            nam = e.class.name.gsub(/\w+:+/,'')
-            send("print_#{nam}".to_sym,e,res)
-          end
+          super.generate(res.root)
         end
-        private :generate_for_list
 
         def print_Break(node,res)
           res.add('escape')
         end
 
-        def print_InfiniteLoop(node,res)
-          s1 = res.add('loop', 'pre_test' => 'true')
-          node.attributes.each do |k,v|
-            s1.attributes[k] = v
-          end
-          generate_for_list(node,s1)
-        end
         def print_Loop_default(node,res)
           if node.sub.length == 2
             s1 = res.add('loop', 'pre_test' => node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && '))

data/lib/cpee/processtransformation/structures.rb

@@ -22,22 +22,19 @@ module CPEE
 
   module ProcessTransformation
 
-    class Link #{{{
-      attr_accessor :from, :to
-      attr_reader :condition, :attributes
-      def initialize(from,to,cond=nil)
-        @from  = from
-        @to = to
-        @condition = cond
-        @attributes = {}
-      end
-    end #}}}
-
-    module Container
+    module Container #{{{
       def container?
         @container || false
       end
-    end
+    end #}}}
+    module Struct #{{{
+      def each(&a)
+        @sub.each{|s| a.call(s)}
+      end
+      def length
+        @sub.length
+      end  
+    end #}}}
 
     class Node #{{{ 
       include Container
@@ -63,21 +60,21 @@ module CPEE
         @attributes = {}
       end
     end # }}} 
-
-    module Struct #{{{
-      def each(&a)
-        @sub.each{|s| a.call(s)}
+    class Link #{{{
+      attr_accessor :from, :to
+      attr_reader :condition, :attributes
+      def initialize(from,to,cond=nil)
+        @from  = from
+        @to = to
+        @condition = cond
+        @attributes = {}
       end
-      def length
-        @sub.length
-      end  
     end #}}}
-
-    class Break < Node
+    class Break < Node #{{{
       def initialize(context)
         super context, '-1', :break, 'BREAK', 1, []
       end
-    end
+    end #}}}
 
     class Alternative < Array #{{{
       include Container
@@ -101,6 +98,7 @@ module CPEE
         @id = id
       end
     end #}}}
+
     class Loop #{{{
       include Container
       include Struct
@@ -233,22 +231,22 @@ module CPEE
       class Tree < Array #{{{
         def condition?; false; end
 
-        def to_s
-          "TREE:\n" << print_tree(self)
+        def to_s(verbose=true)
+          "TREE:\n" << print_tree(self,'  ',verbose)
         end
 
-        def print_tree(ele,indent='  ')
+        def print_tree(ele,indent='  ',verbose=true)
           ret = ''
           ele.each_with_index do |e,i|
             last  = (i == ele.length - 1)
             pchar = last ? '└' : '├'
             if e.container?
               ret << indent + pchar + ' ' + e.class.to_s.gsub(/[^:]*::/,'') + "\n"
-              ret << print_tree(e,indent + (last ? '  ' : '│ '))
-            elsif e.is_a?(Break) && 
+              ret << print_tree(e,indent + (last ? '  ' : '│ '),verbose)
+            elsif e.is_a?(Break)
               ret << indent + pchar + ' ' + e.class.to_s.gsub(/[^:]*::/,'') + "\n"
             else
-              ret << indent + pchar + ' ' + e.niceid.to_s + "\n"
+              ret << indent + pchar + ' ' + e.niceid.to_s + (verbose ? " (#{e.label})" : "") + "\n"
             end
           end
           ret
@@ -311,7 +309,6 @@ module CPEE
           (n = self.map{|t| t.first }.uniq).length == 1 ? n.first : nil
         end
 
-        # future use
         def incoming(node)
           tcount = 1
           self.each do |t|
@@ -327,10 +324,6 @@ module CPEE
           num == self.length
         end
 
-        def aaa
-          puts 'rrr'
-        end
-
         def all_loops?
           num = 0
           self.each{|n| num += 1 if n.first == n.last }
@@ -418,13 +411,6 @@ module CPEE
           max
         end
 
-        def segment_by_loops(loops)
-          # supress loops
-          self.delete_if { |t| loops.include?(t) }
-          self.eliminate(loops)
-          loops.extend
-        end  
-
         def find_endnode
           # supress loops
           trcs = self.dup