cpee 2.1.45 → 2.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 310a80c81a71084a7728c434c6e6e94f87f6af6f5f335385d7ed894bac4ae969
-  data.tar.gz: 8f154ce48422441b0cb2fe74e6a4c3f49ca55e650bef9d9e5f89b3b0b01becef
+  metadata.gz: 866400320b8fcaae94111a6102ed63848b81e73821a9c80c3486cd0f6c6c2cf1
+  data.tar.gz: 652db3c2fd8ccfc07674faf956a5fadba3160a15a14a942b1055dc8fb6934784
 SHA512:
-  metadata.gz: f839d65b84a85fce540360accafd66641a39481354e237e874d18e43d1c7b2193b644430f7f481ea49bf101886768e2b3d732b644d17d359d030d380a6f37d40
-  data.tar.gz: d13397de40eb2e07287e760399b9d9107bdf2ee4cdc290a222f027e5fd4c2c68e8b09bd170aa1c7d76f4a353da9196666f329addc68410e7c95462c2308553ce
+  metadata.gz: 18a0cb7870437abfbb4b6d4265d742684fb2925e47ddfae61ae1795a07f5cda9c35d74ec7f468951fe820949ee25ba28be86a08d0bbd6aafb958965a76e11a73
+  data.tar.gz: 1e7697a8db9a8c57b14abc6cb466e4d6f7c52719284dcf048918341e942f590e0a27c5ab7caf5929b68cf9c91a72b2ea7cd172793c86394078f3220e041e277d

data/Rakefile

@@ -28,6 +28,6 @@ end
 desc "Clean instances"
 task :clean do
   Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|
-    rm_rf i if File.exists?(i)
+    rm_rf i if File.exist?(i)
   end
 end

data/cockpit/js/instance.js

@@ -17,6 +17,7 @@ function global_init() {
   loading = false;
   subscription = undefined;
   subscription_state = 'less';
+  save['states']= {};
   save['state']= undefined;
   save['dsl'] = undefined;
   save['activity_red_states'] = {}
@@ -292,6 +293,7 @@ function sse() { //{{{
             }
             break;
           case 'state':
+            save['states'][data['content']['state']] = Date.parse(data.timestamp);
             monitor_instance_state_change(data['content']['state']);
             break;
           case 'position':
@@ -734,6 +736,13 @@ function monitor_instance_pos_change(content) {// {{{
 
 
 function monitor_instance_state_change(notification) { //{{{
+  // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
+  // thus, we are having none of it
+  if (notification == 'stopping' && save['states']['stopping'] - save['states']['stopped'] < 10)
+    notification = 'stopped';
+  if (notification == 'stopping' && save['state'] == 'stopped')
+    return;
+
   if ($('#trackcolumn').length > 0) {
     if (notification == "finished" || notification == "abandoned") {
       parent.closeIFrame(window.location.search);
@@ -743,10 +752,6 @@ function monitor_instance_state_change(notification) { //{{{
     $("#state button").removeAttr('disabled');
   }
 
-  // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
-  // thus, we are having none of it
-  if (notification == 'stopping' && save['state'] == 'stopped')
-    return;
   if (notification != save['state']) {
     save['state'] = notification;
 

data/cockpit/themes/compact/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -260,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cockpit/themes/control/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -260,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cockpit/themes/default/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -260,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cockpit/themes/extended/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -260,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cockpit/themes/model/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -236,6 +240,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cockpit/themes/packed/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -260,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cockpit/themes/preset/theme.js

@@ -183,6 +183,8 @@ function WFAdaptorManifestation(adaptor) {
         'function_call': function(selector,target,selected){
           del_ui_pos(target)
           self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
         },
         'menu_icon': icon,
         'type': undefined,
@@ -203,6 +205,8 @@ function WFAdaptorManifestation(adaptor) {
               var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
             });
           },
           'menu_icon': icond,
@@ -260,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          del_ui_pos(xml_node);
+        } else {
+          add_ui_pos(xml_node);
+        }
+      }
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.45"
+  s.version          = "2.1.47"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/server/executionhandlers/ruby/backend/run

@@ -6,17 +6,17 @@ opts[:pid] = Process.pid
 
 global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
 controller        = File.join(opts[:executionhandlers],       opts[:executionhandler],'controller.rb')
-if File.exists? global_controller
+if File.exist? global_controller
   require global_controller
-elsif File.exists? controller
+elsif File.exist? controller
   require controller
 end
 
 global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
 connectionhandler        = File.join(opts[:executionhandlers],       opts[:executionhandler],'connection.rb')
-if File.exists? global_connectionhandler
+if File.exist? global_connectionhandler
   require global_connectionhandler
-elsif File.exists? connectionhandler
+elsif File.exist? connectionhandler
   require connectionhandler
 end
 

data/server/routing/end.pid

@@ -0,0 +1 @@
+10497

data/server/routing/forward-events-00.pid

@@ -0,0 +1 @@
+10510

data/server/routing/forward-events-01.pid

@@ -0,0 +1 @@
+10513

data/server/routing/forward-events-02.pid

@@ -0,0 +1 @@
+10516

data/server/routing/forward-events-03.pid

@@ -0,0 +1 @@
+10519

data/server/routing/forward-events-04.pid

@@ -0,0 +1 @@
+10522

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+10503

data/server/routing/persist.pid

@@ -0,0 +1 @@
+10500

data/tools/cpee

@@ -96,7 +96,7 @@ if command == 'ui'
     s.start
   end
 elsif command == 'cpui'
-  if !File.exists?(p1)
+  if !File.exist?(p1)
     FileUtils.cp_r(cockpit,p1)
   else
     FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')).delete_if{|e| e =~ /\.json/ || e=~ /legacy/ },p1,remove_destination: true)
@@ -345,7 +345,7 @@ elsif command == 'delete!'
   end
   puts
 elsif command == 'new'
-  if !File.exists?(p1)
+  if !File.exist?(p1)
     FileUtils.cp_r("#{curpath}/server/",p1)
     FileUtils.mkdir("#{p1}/archive") rescue nil
     FileUtils.mkdir("#{p1}/instances") rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.45
+  version: 2.1.47
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -714,10 +714,17 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
+- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events.lock
+- server/routing/forward-events-00.pid
+- server/routing/forward-events-01.pid
+- server/routing/forward-events-02.pid
+- server/routing/forward-events-03.pid
+- server/routing/forward-events-04.pid
 - server/routing/forward-events.rb
+- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
+- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
 - server/server.pid
@@ -745,7 +752,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee.org). If you