cpee 2.1.46 → 2.1.47

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2eead695fb08a7abafe739b3f8744a414dc6db340f432ab35eca7984124cc1c7
4
- data.tar.gz: 0afa114ac90eeb460bf2cda3a2f9788b67641b3b0c8112650ffd0b7cd43002a2
3
+ metadata.gz: 866400320b8fcaae94111a6102ed63848b81e73821a9c80c3486cd0f6c6c2cf1
4
+ data.tar.gz: 652db3c2fd8ccfc07674faf956a5fadba3160a15a14a942b1055dc8fb6934784
5
5
  SHA512:
6
- metadata.gz: ebfdc65763faf75217fc7babb78e1e2cc6578ddecf095ad47f1e337e0a53f368a8aa7cf01be04020c3920a0ffc1c66c91a20e5487a6eb3f33c556600484943b8
7
- data.tar.gz: 6d46ee33cfc3ee322c923fbcc5616c703055d5add20e7bc92d86ef7475a9bb67bb412025d5e67bf54dad8c7aeff8fc7b8f3e96507604fb827159d5870271ff46
6
+ metadata.gz: 18a0cb7870437abfbb4b6d4265d742684fb2925e47ddfae61ae1795a07f5cda9c35d74ec7f468951fe820949ee25ba28be86a08d0bbd6aafb958965a76e11a73
7
+ data.tar.gz: 1e7697a8db9a8c57b14abc6cb466e4d6f7c52719284dcf048918341e942f590e0a27c5ab7caf5929b68cf9c91a72b2ea7cd172793c86394078f3220e041e277d
data/Rakefile CHANGED
@@ -28,6 +28,6 @@ end
28
28
  desc "Clean instances"
29
29
  task :clean do
30
30
  Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|
31
- rm_rf i if File.exists?(i)
31
+ rm_rf i if File.exist?(i)
32
32
  end
33
33
  end
@@ -17,6 +17,7 @@ function global_init() {
17
17
  loading = false;
18
18
  subscription = undefined;
19
19
  subscription_state = 'less';
20
+ save['states']= {};
20
21
  save['state']= undefined;
21
22
  save['dsl'] = undefined;
22
23
  save['activity_red_states'] = {}
@@ -292,6 +293,7 @@ function sse() { //{{{
292
293
  }
293
294
  break;
294
295
  case 'state':
296
+ save['states'][data['content']['state']] = Date.parse(data.timestamp);
295
297
  monitor_instance_state_change(data['content']['state']);
296
298
  break;
297
299
  case 'position':
@@ -734,6 +736,13 @@ function monitor_instance_pos_change(content) {// {{{
734
736
 
735
737
 
736
738
  function monitor_instance_state_change(notification) { //{{{
739
+ // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
740
+ // thus, we are having none of it
741
+ if (notification == 'stopping' && save['states']['stopping'] - save['states']['stopped'] < 10)
742
+ notification = 'stopped';
743
+ if (notification == 'stopping' && save['state'] == 'stopped')
744
+ return;
745
+
737
746
  if ($('#trackcolumn').length > 0) {
738
747
  if (notification == "finished" || notification == "abandoned") {
739
748
  parent.closeIFrame(window.location.search);
@@ -743,10 +752,6 @@ function monitor_instance_state_change(notification) { //{{{
743
752
  $("#state button").removeAttr('disabled');
744
753
  }
745
754
 
746
- // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
747
- // thus, we are having none of it
748
- if (notification == 'stopping' && save['state'] == 'stopped')
749
- return;
750
755
  if (notification != save['state']) {
751
756
  save['state'] = notification;
752
757
 
@@ -264,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
264
264
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
265
265
  if(e.button == 0) { // left-click
266
266
  } else if(e.button == 1) { // middle-click
267
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
268
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
269
+ if (vtarget.length > 0) {
270
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
271
+ del_ui_pos(xml_node);
272
+ } else {
273
+ add_ui_pos(xml_node);
274
+ }
275
+ }
267
276
  } else if(e.button == 2) { // right-click
268
277
  contextMenuHandling(svgid,e,child,sibling);
269
278
  }
@@ -264,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
264
264
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
265
265
  if(e.button == 0) { // left-click
266
266
  } else if(e.button == 1) { // middle-click
267
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
268
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
269
+ if (vtarget.length > 0) {
270
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
271
+ del_ui_pos(xml_node);
272
+ } else {
273
+ add_ui_pos(xml_node);
274
+ }
275
+ }
267
276
  } else if(e.button == 2) { // right-click
268
277
  contextMenuHandling(svgid,e,child,sibling);
269
278
  }
@@ -264,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
264
264
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
265
265
  if(e.button == 0) { // left-click
266
266
  } else if(e.button == 1) { // middle-click
267
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
268
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
269
+ if (vtarget.length > 0) {
270
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
271
+ del_ui_pos(xml_node);
272
+ } else {
273
+ add_ui_pos(xml_node);
274
+ }
275
+ }
267
276
  } else if(e.button == 2) { // right-click
268
277
  contextMenuHandling(svgid,e,child,sibling);
269
278
  }
@@ -264,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
264
264
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
265
265
  if(e.button == 0) { // left-click
266
266
  } else if(e.button == 1) { // middle-click
267
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
268
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
269
+ if (vtarget.length > 0) {
270
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
271
+ del_ui_pos(xml_node);
272
+ } else {
273
+ add_ui_pos(xml_node);
274
+ }
275
+ }
267
276
  } else if(e.button == 2) { // right-click
268
277
  contextMenuHandling(svgid,e,child,sibling);
269
278
  }
@@ -240,6 +240,15 @@ function WFAdaptorManifestation(adaptor) {
240
240
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
241
241
  if(e.button == 0) { // left-click
242
242
  } else if(e.button == 1) { // middle-click
243
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
244
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
245
+ if (vtarget.length > 0) {
246
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
247
+ del_ui_pos(xml_node);
248
+ } else {
249
+ add_ui_pos(xml_node);
250
+ }
251
+ }
243
252
  } else if(e.button == 2) { // right-click
244
253
  contextMenuHandling(svgid,e,child,sibling);
245
254
  }
@@ -264,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
264
264
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
265
265
  if(e.button == 0) { // left-click
266
266
  } else if(e.button == 1) { // middle-click
267
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
268
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
269
+ if (vtarget.length > 0) {
270
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
271
+ del_ui_pos(xml_node);
272
+ } else {
273
+ add_ui_pos(xml_node);
274
+ }
275
+ }
267
276
  } else if(e.button == 2) { // right-click
268
277
  contextMenuHandling(svgid,e,child,sibling);
269
278
  }
@@ -264,6 +264,15 @@ function WFAdaptorManifestation(adaptor) {
264
264
  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
265
265
  if(e.button == 0) { // left-click
266
266
  } else if(e.button == 1) { // middle-click
267
+ var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
268
+ var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
269
+ if (vtarget.length > 0) {
270
+ if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
271
+ del_ui_pos(xml_node);
272
+ } else {
273
+ add_ui_pos(xml_node);
274
+ }
275
+ }
267
276
  } else if(e.button == 2) { // right-click
268
277
  contextMenuHandling(svgid,e,child,sibling);
269
278
  }
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.1.46"
3
+ s.version = "2.1.47"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0"
6
6
  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."
@@ -6,17 +6,17 @@ opts[:pid] = Process.pid
6
6
 
7
7
  global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
8
8
  controller = File.join(opts[:executionhandlers], opts[:executionhandler],'controller.rb')
9
- if File.exists? global_controller
9
+ if File.exist? global_controller
10
10
  require global_controller
11
- elsif File.exists? controller
11
+ elsif File.exist? controller
12
12
  require controller
13
13
  end
14
14
 
15
15
  global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
16
16
  connectionhandler = File.join(opts[:executionhandlers], opts[:executionhandler],'connection.rb')
17
- if File.exists? global_connectionhandler
17
+ if File.exist? global_connectionhandler
18
18
  require global_connectionhandler
19
- elsif File.exists? connectionhandler
19
+ elsif File.exist? connectionhandler
20
20
  require connectionhandler
21
21
  end
22
22
 
@@ -0,0 +1 @@
1
+ 10497
@@ -0,0 +1 @@
1
+ 10510
@@ -0,0 +1 @@
1
+ 10513
@@ -0,0 +1 @@
1
+ 10516
@@ -0,0 +1 @@
1
+ 10519
@@ -0,0 +1 @@
1
+ 10522
@@ -0,0 +1 @@
1
+ 10503
@@ -0,0 +1 @@
1
+ 10500
data/tools/cpee CHANGED
@@ -96,7 +96,7 @@ if command == 'ui'
96
96
  s.start
97
97
  end
98
98
  elsif command == 'cpui'
99
- if !File.exists?(p1)
99
+ if !File.exist?(p1)
100
100
  FileUtils.cp_r(cockpit,p1)
101
101
  else
102
102
  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!'
345
345
  end
346
346
  puts
347
347
  elsif command == 'new'
348
- if !File.exists?(p1)
348
+ if !File.exist?(p1)
349
349
  FileUtils.cp_r("#{curpath}/server/",p1)
350
350
  FileUtils.mkdir("#{p1}/archive") rescue nil
351
351
  FileUtils.mkdir("#{p1}/instances") rescue nil
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.46
4
+ version: 2.1.47
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: tools
12
12
  cert_chain: []
13
- date: 2023-03-13 00:00:00.000000000 Z
13
+ date: 2023-03-16 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl
@@ -714,10 +714,17 @@ files:
714
714
  - server/resources/states.xml
715
715
  - server/resources/topics.xml
716
716
  - server/resources/transformation.xml
717
+ - server/routing/end.pid
717
718
  - server/routing/end.rb
718
- - server/routing/forward-events.lock
719
+ - server/routing/forward-events-00.pid
720
+ - server/routing/forward-events-01.pid
721
+ - server/routing/forward-events-02.pid
722
+ - server/routing/forward-events-03.pid
723
+ - server/routing/forward-events-04.pid
719
724
  - server/routing/forward-events.rb
725
+ - server/routing/forward-votes.pid
720
726
  - server/routing/forward-votes.rb
727
+ - server/routing/persist.pid
721
728
  - server/routing/persist.rb
722
729
  - server/server.conf
723
730
  - server/server.pid
@@ -745,7 +752,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
745
752
  - !ruby/object:Gem::Version
746
753
  version: '0'
747
754
  requirements: []
748
- rubygems_version: 3.3.26
755
+ rubygems_version: 3.4.6
749
756
  signing_key:
750
757
  specification_version: 4
751
758
  summary: Preliminary release of cloud process execution engine (cpee.org). If you
File without changes