cpee 2.1.25 → 2.1.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/ui.css +1 -1
  3. data/cockpit/templates/Subprocess.xml +79 -0
  4. data/cockpit/templates/Subprocess.xml.attrs +13 -0
  5. data/cockpit/templates/Track Test.xml +31 -28
  6. data/cockpit/templates/Track Test.xml.attrs +11 -0
  7. data/cockpit/templates/Wait.xml +73 -0
  8. data/cockpit/templates/Wait.xml.attrs +13 -0
  9. data/cockpit/templates/Worklist.xml +47 -18
  10. data/cockpit/templates/instantiate/Take_Perf.xml +13 -10
  11. data/cockpit/templates/instantiate/Take_Sub.xml +4 -8
  12. data/cockpit/templates/instantiate/Take_X.xml +12 -9
  13. data/cockpit/themes/compact/theme.js +4 -2
  14. data/cockpit/themes/control/theme.js +4 -2
  15. data/cockpit/themes/default/theme.js +4 -2
  16. data/cockpit/themes/extended/theme.js +4 -2
  17. data/cockpit/themes/model/theme.js +4 -2
  18. data/cockpit/themes/packed/theme.js +4 -2
  19. data/cockpit/themes/preset/theme.js +4 -2
  20. data/cpee.gemspec +1 -1
  21. data/lib/cpee/fail.rb +23 -0
  22. data/lib/cpee/implementation.rb +34 -18
  23. data/lib/cpee/implementation_callbacks.rb +20 -15
  24. data/lib/cpee/implementation_notifications.rb +22 -17
  25. data/lib/cpee/implementation_properties.rb +65 -60
  26. data/lib/cpee/message.rb +15 -13
  27. data/lib/cpee/persistence.rb +33 -10
  28. data/server/executionhandlers/ruby/connection.rb +7 -7
  29. data/server/executionhandlers/ruby/controller.rb +5 -3
  30. data/server/executionhandlers/ruby/dsl_to_dslx.xsl +40 -20
  31. data/server/executionhandlers/ruby/test.xml +43 -0
  32. data/server/routing/end.pid +1 -0
  33. data/server/routing/forward-events.pid +1 -0
  34. data/server/routing/forward-events.rb +6 -0
  35. data/server/routing/forward-votes.pid +1 -0
  36. data/server/routing/persist.pid +1 -0
  37. data/server/routing/persist.rb +4 -2
  38. data/server/server.conf +1 -1
  39. data/tools/cpee +14 -6
  40. metadata +13 -6
  41. data/cockpit/templates/Coopis 2010.xml.active +0 -1
  42. data/cockpit/templates/Coopis 2010.xml.active-uuid +0 -1
  43. data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active +0 -1
  44. data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active-uuid +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dd74be5656971609e82c88413e57b2e27f791202f4467f13a403872c96a293ed
4
- data.tar.gz: dbea7ed1391528186d367b96b70f1f8c00887d8ec6934ef074041b7a54f03599
3
+ metadata.gz: e5b91153e5d1f79bffd42f93f011cce42a0595f5fe17cfd0b7f6dd5a39852518
4
+ data.tar.gz: 8cfccd832f88ea23ed93d4d5bda91e2b5e9414ca195e797a665911b62b2373f5
5
5
  SHA512:
6
- metadata.gz: f1956162c5fed6a82a83806bf5b1aeefac1849f4509b85060fb673735a7cb3d8275a0c1a479b8863d1820ef8b2c73f0bc5bbc359d94975897cf8a9eb7decde34
7
- data.tar.gz: c6e145b03c672b5c5639e0edb2a5b462d1a3a52668ec6ae0b3f5f7e585ca056c31cece27a45327e484bf347cbcbf6aa6cfa5fc09023d1c4e79a0b122242dfd30
6
+ metadata.gz: b1e149e8b4ae2b28df6a30d2757b29c54aab7d65ca4f51ee7d9c226b36bceb448064439ae6e93995ee0e32a0fba01b6841ab1fb8b88afbefd2483b38c426b798
7
+ data.tar.gz: 75a3f332f847963e76c1c8557cf14af6f9f6f0b61d7722bdc09a9a864d86ae2593a2f4a695c23e1c30a12c1fa86aa0f2ef2858d8acfeeb6653eee14578d8f03a
data/cockpit/css/ui.css CHANGED
@@ -242,4 +242,4 @@ span.vote {
242
242
  overflow: auto;
243
243
  }
244
244
  #disclaimer p { max-width: 82ex; text-align: justify; }
245
- #disclaimer input { margin:0; padding:0; vertical-align:bottom; margin-right: 0.5em; }
245
+ #disclaimer input { margin:0; padding:0; vertical-align:baseline; margin-right: 0.5em; }
@@ -0,0 +1,79 @@
1
+ <?xml version="1.0"?>
2
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
3
+ <executionhandler>ruby</executionhandler>
4
+ <dataelements/>
5
+ <endpoints>
6
+ <timeout>https://cpee.org/services/timeout.php</timeout>
7
+ <subprocess>https://cpee.org/flow/start/url/</subprocess>
8
+ </endpoints>
9
+ <attributes>
10
+ <info>Subprocess</info>
11
+ <creator>Christine Ashcreek</creator>
12
+ <author>Christine Ashcreek</author>
13
+ <modeltype>CPEE</modeltype>
14
+ <guarded>none</guarded>
15
+ <guarded_id/>
16
+ <model_uuid>1fc43528-3e4a-40ee-8503-c0ed7e5d883c</model_uuid>
17
+ <model_version/>
18
+ <theme>extended</theme>
19
+ <design_dir>Templates.dir</design_dir>
20
+ <design_stage>development</design_stage>
21
+ </attributes>
22
+ <description>
23
+ <description xmlns="http://cpee.org/ns/description/1.0">
24
+ <call id="a1" endpoint="subprocess">
25
+ <parameters>
26
+ <label>Sub</label>
27
+ <method>:post</method>
28
+ <arguments>
29
+ <behavior>wait_running</behavior>
30
+ <url>https://cpee.org/design/server/Templates.dir/Wait.xml</url>
31
+ <init>
32
+ <bla>3</bla>
33
+ </init>
34
+ <endpoints/>
35
+ <customization/>
36
+ </arguments>
37
+ </parameters>
38
+ <code>
39
+ <prepare/>
40
+ <finalize output="result">data.test = result</finalize>
41
+ <update output="result"/>
42
+ <rescue output="result"/>
43
+ </code>
44
+ <annotations>
45
+ <_timing>
46
+ <_timing_weight/>
47
+ <_timing_avg/>
48
+ <explanations/>
49
+ </_timing>
50
+ <_context_data_analysis>
51
+ <probes/>
52
+ <ips/>
53
+ </_context_data_analysis>
54
+ <report>
55
+ <url/>
56
+ </report>
57
+ <_notes>
58
+ <_notes_general/>
59
+ </_notes>
60
+ </annotations>
61
+ <documentation>
62
+ <input/>
63
+ <output/>
64
+ <implementation>
65
+ <description/>
66
+ </implementation>
67
+ <code>
68
+ <description/>
69
+ </code>
70
+ </documentation>
71
+ </call>
72
+ </description>
73
+ </description>
74
+ <transformation>
75
+ <description type="copy"/>
76
+ <dataelements type="none"/>
77
+ <endpoints type="none"/>
78
+ </transformation>
79
+ </testset>
@@ -0,0 +1,13 @@
1
+ {
2
+ "info": "Subprocess",
3
+ "creator": "Christine Ashcreek",
4
+ "author": "Christine Ashcreek",
5
+ "modeltype": "CPEE",
6
+ "guarded": "none",
7
+ "guarded_id": "",
8
+ "model_uuid": "1fc43528-3e4a-40ee-8503-c0ed7e5d883c",
9
+ "model_version": "",
10
+ "theme": "extended",
11
+ "design_dir": "Templates.dir",
12
+ "design_stage": "development"
13
+ }
@@ -1,3 +1,4 @@
1
+ <?xml version="1.0"?>
1
2
  <testset xmlns="http://cpee.org/ns/properties/2.0">
2
3
  <executionhandler>ruby</executionhandler>
3
4
  <dataelements>
@@ -6,7 +7,17 @@
6
7
  <endpoints>
7
8
  <start_url>https://cpee.org/flow/start/url/</start_url>
8
9
  </endpoints>
9
- <positions/>
10
+ <attributes>
11
+ <info>Track Test</info>
12
+ <modeltype>CPEE</modeltype>
13
+ <theme>default</theme>
14
+ <customer>pilotfabrik</customer>
15
+ <status>development</status>
16
+ <creator>Christine Ashcreek</creator>
17
+ <author>Christine Ashcreek</author>
18
+ <design_stage>development</design_stage>
19
+ <design_dir>Templates.dir</design_dir>
20
+ </attributes>
10
21
  <description>
11
22
  <description xmlns="http://cpee.org/ns/description/1.0">
12
23
  <loop mode="pre_test" condition="true">
@@ -26,33 +37,36 @@
26
37
  <behavior>wait_running</behavior>
27
38
  <url>https://cpee.org/flow/templates/instantiate/Take_Sub.xml</url>
28
39
  <init>
29
- <time>4</time>
40
+ <time>5</time>
30
41
  </init>
31
42
  <endpoints/>
32
- <stream/>
43
+ <customization/>
33
44
  </arguments>
34
- <stream>
35
- <sensors/>
36
- <aggregators/>
37
- <costs/>
38
- </stream>
39
- <report>
40
- <url/>
41
- </report>
42
45
  </parameters>
43
46
  <annotations>
44
47
  <_timing>
45
- <_timing_wait/>
46
- <_timing_threshold/>
47
- <_timing_min/>
48
- <_timing_max/>
48
+ <_timing_weight/>
49
49
  <_timing_avg/>
50
+ <_context_data_analysis>
51
+ <probes/>
52
+ <ips/>
53
+ </_context_data_analysis>
54
+ <report>
55
+ <url/>
56
+ </report>
57
+ <explanations/>
50
58
  </_timing>
51
59
  <_notes>
52
60
  <_notes_general/>
53
61
  </_notes>
54
62
  </annotations>
55
- <documentation/>
63
+ <documentation>
64
+ <input/>
65
+ <output/>
66
+ <implementation>
67
+ <description/>
68
+ </implementation>
69
+ </documentation>
56
70
  </call>
57
71
  </parallel_branch>
58
72
  <manipulate id="a4" label="">data.i += 1</manipulate>
@@ -73,15 +87,4 @@
73
87
  <dataelements type="none"/>
74
88
  <endpoints type="none"/>
75
89
  </transformation>
76
- <attributes>
77
- <info>Track Test</info>
78
- <modeltype>CPEE</modeltype>
79
- <theme>default</theme>
80
- <customer>pilotfabrik</customer>
81
- <status>development</status>
82
- <creator>Christine Ashcreek</creator>
83
- <author>Christine Ashcreek</author>
84
- <design_stage>development</design_stage>
85
- <design_dir>Templates.dir</design_dir>
86
- </attributes>
87
- </testset>
90
+ </testset>
@@ -0,0 +1,11 @@
1
+ {
2
+ "info": "Track Test",
3
+ "modeltype": "CPEE",
4
+ "theme": "default",
5
+ "customer": "pilotfabrik",
6
+ "status": "development",
7
+ "creator": "Christine Ashcreek",
8
+ "author": "Christine Ashcreek",
9
+ "design_stage": "development",
10
+ "design_dir": "Templates.dir"
11
+ }
@@ -0,0 +1,73 @@
1
+ <?xml version="1.0"?>
2
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
3
+ <executionhandler>ruby</executionhandler>
4
+ <dataelements/>
5
+ <endpoints>
6
+ <timeout>https://cpee.org/services/timeout.php</timeout>
7
+ <subprocess>https://cpee.org/flow/start/url/</subprocess>
8
+ </endpoints>
9
+ <attributes>
10
+ <info>Wait</info>
11
+ <creator>Christine Ashcreek</creator>
12
+ <author>Christine Ashcreek</author>
13
+ <modeltype>CPEE</modeltype>
14
+ <guarded>none</guarded>
15
+ <guarded_id/>
16
+ <model_uuid>c09dad6b-547e-41a9-8f31-95c40e71c607</model_uuid>
17
+ <model_version/>
18
+ <theme>extended</theme>
19
+ <design_dir>Templates.dir</design_dir>
20
+ <design_stage>development</design_stage>
21
+ </attributes>
22
+ <description>
23
+ <description xmlns="http://cpee.org/ns/description/1.0">
24
+ <call id="a1" endpoint="timeout">
25
+ <parameters>
26
+ <label>Wait </label>
27
+ <method>:post</method>
28
+ <arguments>
29
+ <timeout>2</timeout>
30
+ </arguments>
31
+ </parameters>
32
+ <code>
33
+ <prepare/>
34
+ <finalize output="result">data.test = 7</finalize>
35
+ <update output="result"/>
36
+ <rescue output="result"/>
37
+ </code>
38
+ <annotations>
39
+ <_timing>
40
+ <_timing_weight/>
41
+ <_timing_avg/>
42
+ <explanations/>
43
+ </_timing>
44
+ <_context_data_analysis>
45
+ <probes/>
46
+ <ips/>
47
+ </_context_data_analysis>
48
+ <report>
49
+ <url/>
50
+ </report>
51
+ <_notes>
52
+ <_notes_general/>
53
+ </_notes>
54
+ </annotations>
55
+ <documentation>
56
+ <input/>
57
+ <output/>
58
+ <implementation>
59
+ <description/>
60
+ </implementation>
61
+ <code>
62
+ <description/>
63
+ </code>
64
+ </documentation>
65
+ </call>
66
+ </description>
67
+ </description>
68
+ <transformation>
69
+ <description type="copy"/>
70
+ <dataelements type="none"/>
71
+ <endpoints type="none"/>
72
+ </transformation>
73
+ </testset>
@@ -0,0 +1,13 @@
1
+ {
2
+ "info": "Wait",
3
+ "creator": "Christine Ashcreek",
4
+ "author": "Christine Ashcreek",
5
+ "modeltype": "CPEE",
6
+ "guarded": "none",
7
+ "guarded_id": "",
8
+ "model_uuid": "c09dad6b-547e-41a9-8f31-95c40e71c607",
9
+ "model_version": "",
10
+ "theme": "extended",
11
+ "design_dir": "Templates.dir",
12
+ "design_stage": "development"
13
+ }
@@ -1,3 +1,4 @@
1
+ <?xml version="1.0"?>
1
2
  <testset xmlns="http://cpee.org/ns/properties/2.0">
2
3
  <executionhandler>ruby</executionhandler>
3
4
  <dataelements>
@@ -7,7 +8,16 @@
7
8
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
8
9
  <worklist>http://cpee.org:9398</worklist>
9
10
  </endpoints>
10
- <positions/>
11
+ <attributes>
12
+ <info>Worklist</info>
13
+ <modeltype>CPEE</modeltype>
14
+ <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
15
+ <theme>extended</theme>
16
+ <creator>Christine Ashcreek</creator>
17
+ <author>Christine Ashcreek</author>
18
+ <design_stage>development</design_stage>
19
+ <design_dir>Templates.dir</design_dir>
20
+ </attributes>
11
21
  <description>
12
22
  <description xmlns="http://cpee.org/ns/description/1.0">
13
23
  <call id="a1" endpoint="worklist">
@@ -16,19 +26,48 @@
16
26
  <method>:post</method>
17
27
  <arguments>
18
28
  <orgmodel>organisation1</orgmodel>
19
- <domain>Virtual Business 1</domain>
20
- <form>http://cpee.org/~demo/form/form-f.html</form>
21
- <role>Regular</role>
29
+ <domain>VirtualBusiness1</domain>
30
+ <form>https://cpee.org/~demo/form/form-f.html</form>
31
+ <role>Assistant</role>
22
32
  <schaden>55546</schaden>
23
33
  <text>fetzen hin</text>
24
34
  </arguments>
25
35
  </parameters>
26
36
  <code>
27
- <finalize>data.bla = result</finalize>
37
+ <prepare/>
38
+ <finalize output="result">data.bla = result</finalize>
39
+ <update output="result"/>
40
+ <rescue output="result"/>
28
41
  </code>
29
- <annotations/>
30
- <documentation/>
42
+ <annotations>
43
+ <_timing>
44
+ <_timing_weight/>
45
+ <_timing_avg/>
46
+ <explanations/>
47
+ </_timing>
48
+ <_context_data_analysis>
49
+ <probes/>
50
+ <ips/>
51
+ </_context_data_analysis>
52
+ <report>
53
+ <url/>
54
+ </report>
55
+ <_notes>
56
+ <_notes_general/>
57
+ </_notes>
58
+ </annotations>
59
+ <documentation>
60
+ <input/>
61
+ <output/>
62
+ <implementation>
63
+ <description/>
64
+ </implementation>
65
+ <code>
66
+ <description/>
67
+ </code>
68
+ </documentation>
31
69
  </call>
70
+ <stop id="a2"/>
32
71
  </description>
33
72
  </description>
34
73
  <transformation>
@@ -36,14 +75,4 @@
36
75
  <dataelements type="none"/>
37
76
  <endpoints type="none"/>
38
77
  </transformation>
39
- <attributes>
40
- <info>Worklist</info>
41
- <modeltype>CPEE</modeltype>
42
- <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
43
- <theme>extended</theme>
44
- <creator>Christine Ashcreek</creator>
45
- <author>Christine Ashcreek</author>
46
- <design_stage>development</design_stage>
47
- <design_dir>Templates.dir</design_dir>
48
- </attributes>
49
- </testset>
78
+ </testset>
@@ -15,19 +15,22 @@
15
15
  <method>:get</method>
16
16
  <arguments/>
17
17
  </parameters>
18
- <_timing>
19
- <_timing_min/>
20
- <_timing_max/>
21
- <_timing_avg/>
22
- </_timing>
23
- <_notes>
24
- <_notes_general/>
25
- <_attachments/>
26
- </_notes>
27
18
  <code>
28
19
  <finalize output="result"/>
29
20
  <update output="result"/>
30
21
  </code>
22
+ <annotations>
23
+ <_timing>
24
+ <_timing_min/>
25
+ <_timing_max/>
26
+ <_timing_avg/>
27
+ </_timing>
28
+ <_notes>
29
+ <_notes_general/>
30
+ <_attachments/>
31
+ </_notes>
32
+ </annotations>
33
+ <documentation/>
31
34
  </call>
32
35
  </description>
33
36
  </description>
@@ -43,4 +46,4 @@
43
46
  <customer>pilotfabrik</customer>
44
47
  <status>development</status>
45
48
  </attributes>
46
- </testset>
49
+ </testset>
@@ -19,14 +19,6 @@
19
19
  <endpoints/>
20
20
  <stream/>
21
21
  </arguments>
22
- <stream>
23
- <sensors/>
24
- <aggregators/>
25
- <costs/>
26
- </stream>
27
- <report>
28
- <url/>
29
- </report>
30
22
  </parameters>
31
23
  <annotations>
32
24
  <_timing>
@@ -39,7 +31,11 @@
39
31
  <_notes>
40
32
  <_notes_general/>
41
33
  </_notes>
34
+ <report>
35
+ <url/>
36
+ </report>
42
37
  </annotations>
38
+ <documentation/>
43
39
  </call>
44
40
  </description>
45
41
  </description>
@@ -17,19 +17,22 @@
17
17
  <timeout>!data.time</timeout>
18
18
  </arguments>
19
19
  </parameters>
20
- <_timing>
21
- <_timing_min/>
22
- <_timing_max/>
23
- <_timing_avg/>
24
- </_timing>
25
- <_notes>
26
- <_notes_general/>
27
- <_attachments/>
28
- </_notes>
29
20
  <code>
30
21
  <finalize output="result">data.duration = data.time</finalize>
31
22
  <update output="result"/>
32
23
  </code>
24
+ <annotations>
25
+ <_timing>
26
+ <_timing_min/>
27
+ <_timing_max/>
28
+ <_timing_avg/>
29
+ </_timing>
30
+ <_notes>
31
+ <_notes_general/>
32
+ <_attachments/>
33
+ </_notes>
34
+ </annotations>
35
+ <documentation/>
33
36
  </call>
34
37
  </description>
35
38
  </description>
@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
311
311
  },
312
312
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
313
313
  'resolve_symbol': function(node) {
314
- if($('code', node).length > 0) {
314
+ if($('> code', node).length > 0) {
315
315
  return 'callmanipulate';
316
316
  } else {
317
317
  return 'call';
@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
499
499
  'endnodes': 'this',
500
500
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
501
501
  'resolve_symbol': function(node) {
502
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
502
+ if($(node).children(':not(parallel_branch)').length > 0) {
503
+ return 'parallel_complex';
504
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
503
505
  return 'parallel_simple';
504
506
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
505
507
  return 'parallel_event_all';
@@ -329,7 +329,7 @@ function WFAdaptorManifestation(adaptor) {
329
329
  },
330
330
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
331
331
  'resolve_symbol': function(node) {
332
- if($('code', node).length > 0) {
332
+ if($('> code', node).length > 0) {
333
333
  return 'callmanipulate';
334
334
  } else {
335
335
  return 'call';
@@ -524,7 +524,9 @@ function WFAdaptorManifestation(adaptor) {
524
524
  'endnodes': 'this',
525
525
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
526
526
  'resolve_symbol': function(node) {
527
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
527
+ if($(node).children(':not(parallel_branch)').length > 0) {
528
+ return 'parallel_complex';
529
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
528
530
  return 'parallel_simple';
529
531
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
530
532
  return 'parallel_event_all';
@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
311
311
  },
312
312
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
313
313
  'resolve_symbol': function(node) {
314
- if($('code', node).length > 0) {
314
+ if($('> code', node).length > 0) {
315
315
  return 'callmanipulate';
316
316
  } else {
317
317
  return 'call';
@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
499
499
  'endnodes': 'this',
500
500
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
501
501
  'resolve_symbol': function(node) {
502
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
502
+ if($(node).children(':not(parallel_branch)').length > 0) {
503
+ return 'parallel_complex';
504
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
503
505
  return 'parallel_simple';
504
506
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
505
507
  return 'parallel_event_all';
@@ -329,7 +329,7 @@ function WFAdaptorManifestation(adaptor) {
329
329
  },
330
330
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
331
331
  'resolve_symbol': function(node) {
332
- if($('code', node).length > 0) {
332
+ if($('> code', node).length > 0) {
333
333
  return 'callmanipulate';
334
334
  } else {
335
335
  return 'call';
@@ -524,7 +524,9 @@ function WFAdaptorManifestation(adaptor) {
524
524
  'endnodes': 'this',
525
525
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
526
526
  'resolve_symbol': function(node) {
527
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
527
+ if($(node).children(':not(parallel_branch)').length > 0) {
528
+ return 'parallel_complex';
529
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
528
530
  return 'parallel_simple';
529
531
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
530
532
  return 'parallel_event_all';
@@ -292,7 +292,7 @@ function WFAdaptorManifestation(adaptor) {
292
292
  },
293
293
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
294
294
  'resolve_symbol': function(node) {
295
- if($('code', node).length > 0) {
295
+ if($('> code', node).length > 0) {
296
296
  return 'callmanipulate';
297
297
  } else {
298
298
  return 'call';
@@ -480,7 +480,9 @@ function WFAdaptorManifestation(adaptor) {
480
480
  'endnodes': 'this',
481
481
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
482
482
  'resolve_symbol': function(node) {
483
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
483
+ if($(node).children(':not(parallel_branch)').length > 0) {
484
+ return 'parallel_complex';
485
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
484
486
  return 'parallel_simple';
485
487
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
486
488
  return 'parallel_event_all';
@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
311
311
  },
312
312
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
313
313
  'resolve_symbol': function(node) {
314
- if($('code', node).length > 0) {
314
+ if($('> code', node).length > 0) {
315
315
  return 'callmanipulate';
316
316
  } else {
317
317
  return 'call';
@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
499
499
  'endnodes': 'this',
500
500
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
501
501
  'resolve_symbol': function(node) {
502
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
502
+ if($(node).children(':not(parallel_branch)').length > 0) {
503
+ return 'parallel_complex';
504
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
503
505
  return 'parallel_simple';
504
506
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
505
507
  return 'parallel_event_all';
@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
311
311
  },
312
312
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
313
313
  'resolve_symbol': function(node) {
314
- if($('code', node).length > 0) {
314
+ if($('> code', node).length > 0) {
315
315
  return 'callmanipulate';
316
316
  } else {
317
317
  return 'call';
@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
499
499
  'endnodes': 'this',
500
500
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
501
501
  'resolve_symbol': function(node) {
502
- if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
502
+ if($(node).children(':not(parallel_branch)').length > 0) {
503
+ return 'parallel_complex';
504
+ } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
503
505
  return 'parallel_simple';
504
506
  } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
505
507
  return 'parallel_event_all';
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.25"
3
+ s.version = "2.1.30"
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."