cpee 2.0.28 → 2.0.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 (45) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/wfadaptor.css +11 -0
  3. data/cockpit/js/instance.js +5 -0
  4. data/cockpit/themes/compact/rngs/parallel.rng +6 -0
  5. data/cockpit/themes/compact/symbols/parallel_branch_event.svg +2 -2
  6. data/cockpit/themes/compact/symbols/parallel_eventbased_exclusive.svg +9 -0
  7. data/cockpit/themes/compact/symbols/parallel_eventbased_parallel.svg +8 -0
  8. data/cockpit/themes/compact/theme.js +45 -2
  9. data/cockpit/themes/control/rngs/parallel.rng +6 -0
  10. data/cockpit/themes/control/symbols/parallel_branch_event.svg +2 -2
  11. data/cockpit/themes/control/symbols/parallel_eventbased_exclusive.svg +9 -0
  12. data/cockpit/themes/control/symbols/parallel_eventbased_parallel.svg +8 -0
  13. data/cockpit/themes/control/theme.js +45 -2
  14. data/cockpit/themes/default/rngs/parallel.rng +6 -0
  15. data/cockpit/themes/default/symbols/parallel_branch_event.svg +2 -2
  16. data/cockpit/themes/default/symbols/parallel_eventbased_exclusive.svg +9 -0
  17. data/cockpit/themes/default/symbols/parallel_eventbased_parallel.svg +8 -0
  18. data/cockpit/themes/default/theme.js +45 -2
  19. data/cockpit/themes/extended/rngs/parallel.rng +6 -0
  20. data/cockpit/themes/extended/symbols/parallel_branch_event.svg +2 -2
  21. data/cockpit/themes/extended/symbols/parallel_eventbased_exclusive.svg +9 -0
  22. data/cockpit/themes/extended/symbols/parallel_eventbased_parallel.svg +8 -0
  23. data/cockpit/themes/extended/theme.js +45 -2
  24. data/cockpit/themes/model/symbols/parallel_branch_event.svg +2 -2
  25. data/cockpit/themes/model/symbols/parallel_eventbased_exclusive.svg +9 -0
  26. data/cockpit/themes/model/symbols/parallel_eventbased_parallel.svg +8 -0
  27. data/cockpit/themes/model/theme.js +45 -2
  28. data/cockpit/themes/packed/rngs/parallel.rng +6 -0
  29. data/cockpit/themes/packed/symbols/parallel_branch_event.svg +2 -2
  30. data/cockpit/themes/packed/symbols/parallel_eventbased_exclusive.svg +9 -0
  31. data/cockpit/themes/packed/symbols/parallel_eventbased_parallel.svg +8 -0
  32. data/cockpit/themes/packed/theme.js +45 -2
  33. data/cockpit/themes/preset/rngs/parallel.rng +6 -0
  34. data/cockpit/themes/preset/symbols/parallel_branch_event.svg +2 -2
  35. data/cockpit/themes/preset/symbols/parallel_eventbased_exclusive.svg +9 -0
  36. data/cockpit/themes/preset/symbols/parallel_eventbased_parallel.svg +8 -0
  37. data/cockpit/themes/preset/theme.js +45 -2
  38. data/cpee.gemspec +2 -2
  39. data/server/resources/transformation_dslx.xsl +4 -0
  40. data/server/routing/end.pid +1 -1
  41. data/server/routing/forward-events.pid +1 -1
  42. data/server/routing/forward-votes.pid +1 -1
  43. data/server/routing/persist.pid +1 -1
  44. data/server/server.pid +1 -1
  45. metadata +18 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 446d47727cd6450b4206d4ec787bbf052fef6ca9684535e8b4710aefe35f1e04
4
- data.tar.gz: 984c42f0438d5bacfab15a20358bf549be38ab73928265656eb978c8c22fce28
3
+ metadata.gz: 276ee2c99e9c250bbeb3ebab71df773fde372df10b0fd09a898755c57e479fc0
4
+ data.tar.gz: 4db83c7f5dbe7f146536e9e58ec9107e9646a7f092d69f4d459ea11b70b44cef
5
5
  SHA512:
6
- metadata.gz: b24734fdd7d03290bdfafc2cb1362e531216b069ea4e7e8c77ca6a668f79bbd9bf9c3e4648bb9583eab7ef3a2e07deecbb29f5e76966d18ebdc1a56ff1b1ce40
7
- data.tar.gz: 4366443cc3fe3f3bbdc7beb4179b8c1573111ff22fd515bcb815ad80ddf3c44f35ba2a96fb82dff54a73a983348461e7bc5653c8827661cc9ec317ebe85cdcbe
6
+ metadata.gz: 1bcb337d06fb1acd06b14e0225d8151844cc8cfcd7331ece1f55a23491d532d8ba3a86b9b56d864005580fb8c35a0df4a65d8bb0814ba43417fd8a6b550791d7
7
+ data.tar.gz: c341d05b1845e20a8abbdebc5d7fd49a5e9736a71b135c602836168881434568d2cc153c7c9b56397ae443a24c842955af75699c403275d47260b7963f816073
@@ -108,6 +108,17 @@ svg .stand {
108
108
  stroke-opacity:1;
109
109
  stroke-dasharray:none;
110
110
  }
111
+ svg .standthin {
112
+ fill: var(--wfadaptor-background);
113
+ fill-opacity:1;
114
+ stroke: var(--wfadaptor-base);
115
+ stroke-width:1.0;
116
+ stroke-linecap:round;
117
+ stroke-linejoin:round;
118
+ stroke-miterlimit:4;
119
+ stroke-opacity:1;
120
+ stroke-dasharray:none;
121
+ }
111
122
  svg .standfat {
112
123
  fill: var(--wfadaptor-background);
113
124
  fill-opacity:1;
@@ -105,6 +105,11 @@ function cockpit() { //{{{
105
105
  $('#templates').append($("<div class='menuitem'></div>").text(this.name.replace(/\.xml/,'')));
106
106
  }
107
107
  });
108
+ },
109
+ error: function() {
110
+ $("button[name=loadtestset]").attr('disabled','disabled');
111
+ },
112
+ complete: function() {
108
113
  var q = $.parseQuerySimple();
109
114
  if (q.min || q.min == "") {
110
115
  uidash_toggle_vis_tab($('#instance'));
@@ -2,6 +2,12 @@
2
2
  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
3
3
  <data type="integer"/>
4
4
  </attribute>
5
+ <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
6
+ <choice>
7
+ <value id='last'>After Last Task in Branch</value>
8
+ <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
9
+ </choice>
10
+ </attribute>
5
11
  <element rngui:ignore="true" name="parallel_branch">
6
12
  <attribute name="pass">
7
13
  <data type="string"/>
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
481
481
  'endnodes': 'this',
482
482
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
483
483
  'resolve_symbol': function(node) {
484
- if($(node).attr('wait') == '-1') {
484
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
485
485
  return 'parallel_simple';
486
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
487
+ return 'parallel_event_all';
488
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
489
+ return 'parallel_event_one';
486
490
  } else {
487
491
  return 'parallel_complex';
488
492
  }
@@ -848,7 +852,16 @@ function WFAdaptorManifestation(adaptor) {
848
852
  'col_shift': function(node) {
849
853
  return true;
850
854
  },
851
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
855
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
856
+ 'resolve_symbol': function(node) {
857
+ if($(node).attr('cancel') == 'last') {
858
+ return 'parallel_start';
859
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
860
+ return 'parallel_eventbased_exclusive';
861
+ } else {
862
+ return 'parallel_eventbased_parallel';
863
+ }
864
+ },
852
865
  },//}}}
853
866
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
854
867
  'permissible_children': function(node,mode) { //{{{
@@ -1275,6 +1288,24 @@ function WFAdaptorManifestation(adaptor) {
1275
1288
  'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
1276
1289
  },//}}}
1277
1290
  }; /*}}}*/
1291
+ this.elements.parallel_start = { /*{{{*/
1292
+ 'parent': 'parallel',
1293
+ 'illustrator': {//{{{
1294
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1295
+ }//}}}
1296
+ }; /*}}}*/
1297
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1298
+ 'parent': 'parallel',
1299
+ 'illustrator': {//{{{
1300
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1301
+ }//}}}
1302
+ }; /*}}}*/
1303
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1304
+ 'parent': 'parallel',
1305
+ 'illustrator': {//{{{
1306
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1307
+ }//}}}
1308
+ }; /*}}}*/
1278
1309
  this.elements.parallel_simple = { /*{{{*/
1279
1310
  'parent': 'parallel_finish',
1280
1311
  'illustrator': {//{{{
@@ -1287,6 +1318,18 @@ function WFAdaptorManifestation(adaptor) {
1287
1318
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1288
1319
  },//}}}
1289
1320
  }; /*}}}*/
1321
+ this.elements.parallel_event_all = { /*{{{*/
1322
+ 'parent': 'parallel_finish',
1323
+ 'illustrator': {//{{{
1324
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1325
+ }//}}}
1326
+ }; /*}}}*/
1327
+ this.elements.parallel_event_one = { /*{{{*/
1328
+ 'parent': 'parallel_finish',
1329
+ 'illustrator': {//{{{
1330
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1331
+ }//}}}
1332
+ }; /*}}}*/
1290
1333
  this.elements.parallel_branch_normal = { /*{{{*/
1291
1334
  'parent': 'parallel_branch',
1292
1335
  'illustrator': {//{{{
@@ -2,6 +2,12 @@
2
2
  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
3
3
  <data type="integer"/>
4
4
  </attribute>
5
+ <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
6
+ <choice>
7
+ <value id='last'>After Last Task in Branch</value>
8
+ <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
9
+ </choice>
10
+ </attribute>
5
11
  <element rngui:ignore="true" name="parallel_branch">
6
12
  <attribute name="pass">
7
13
  <data type="string"/>
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -506,8 +506,12 @@ function WFAdaptorManifestation(adaptor) {
506
506
  'endnodes': 'this',
507
507
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
508
508
  'resolve_symbol': function(node) {
509
- if($(node).attr('wait') == '-1') {
509
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
510
510
  return 'parallel_simple';
511
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
512
+ return 'parallel_event_all';
513
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
514
+ return 'parallel_event_one';
511
515
  } else {
512
516
  return 'parallel_complex';
513
517
  }
@@ -1194,7 +1198,16 @@ function WFAdaptorManifestation(adaptor) {
1194
1198
  'col_shift': function(node) {
1195
1199
  return true;
1196
1200
  },
1197
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1201
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
1202
+ 'resolve_symbol': function(node) {
1203
+ if($(node).attr('cancel') == 'last') {
1204
+ return 'parallel_start';
1205
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
1206
+ return 'parallel_eventbased_exclusive';
1207
+ } else {
1208
+ return 'parallel_eventbased_parallel';
1209
+ }
1210
+ },
1198
1211
  },//}}}
1199
1212
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
1200
1213
  'permissible_children': function(node,mode) { //{{{
@@ -1654,6 +1667,24 @@ function WFAdaptorManifestation(adaptor) {
1654
1667
  'svg': self.adaptor.theme_dir + 'symbols/closed_loop.svg'
1655
1668
  }//}}}
1656
1669
  }; /*}}}*/
1670
+ this.elements.parallel_start = { /*{{{*/
1671
+ 'parent': 'parallel',
1672
+ 'illustrator': {//{{{
1673
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1674
+ }//}}}
1675
+ }; /*}}}*/
1676
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1677
+ 'parent': 'parallel',
1678
+ 'illustrator': {//{{{
1679
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1680
+ }//}}}
1681
+ }; /*}}}*/
1682
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1683
+ 'parent': 'parallel',
1684
+ 'illustrator': {//{{{
1685
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1686
+ }//}}}
1687
+ }; /*}}}*/
1657
1688
  this.elements.parallel_simple = { /*{{{*/
1658
1689
  'parent': 'parallel_finish',
1659
1690
  'illustrator': {//{{{
@@ -1666,6 +1697,18 @@ function WFAdaptorManifestation(adaptor) {
1666
1697
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1667
1698
  },//}}}
1668
1699
  }; /*}}}*/
1700
+ this.elements.parallel_event_all = { /*{{{*/
1701
+ 'parent': 'parallel_finish',
1702
+ 'illustrator': {//{{{
1703
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1704
+ }//}}}
1705
+ }; /*}}}*/
1706
+ this.elements.parallel_event_one = { /*{{{*/
1707
+ 'parent': 'parallel_finish',
1708
+ 'illustrator': {//{{{
1709
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1710
+ }//}}}
1711
+ }; /*}}}*/
1669
1712
  this.elements.parallel_branch_normal = { /*{{{*/
1670
1713
  'parent': 'parallel_branch',
1671
1714
  'illustrator': {//{{{
@@ -2,6 +2,12 @@
2
2
  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
3
3
  <data type="integer"/>
4
4
  </attribute>
5
+ <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
6
+ <choice>
7
+ <value id='last'>After Last Task in Branch</value>
8
+ <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
9
+ </choice>
10
+ </attribute>
5
11
  <element rngui:ignore="true" name="parallel_branch">
6
12
  <attribute name="pass">
7
13
  <data type="string"/>
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
481
481
  'endnodes': 'this',
482
482
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
483
483
  'resolve_symbol': function(node) {
484
- if($(node).attr('wait') == '-1') {
484
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
485
485
  return 'parallel_simple';
486
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
487
+ return 'parallel_event_all';
488
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
489
+ return 'parallel_event_one';
486
490
  } else {
487
491
  return 'parallel_complex';
488
492
  }
@@ -849,7 +853,16 @@ function WFAdaptorManifestation(adaptor) {
849
853
  'col_shift': function(node) {
850
854
  return true;
851
855
  },
852
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
856
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
857
+ 'resolve_symbol': function(node) {
858
+ if($(node).attr('cancel') == 'last') {
859
+ return 'parallel_start';
860
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
861
+ return 'parallel_eventbased_exclusive';
862
+ } else {
863
+ return 'parallel_eventbased_parallel';
864
+ }
865
+ },
853
866
  },//}}}
854
867
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
855
868
  'permissible_children': function(node,mode) { //{{{
@@ -1276,6 +1289,24 @@ function WFAdaptorManifestation(adaptor) {
1276
1289
  'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
1277
1290
  },//}}}
1278
1291
  }; /*}}}*/
1292
+ this.elements.parallel_start = { /*{{{*/
1293
+ 'parent': 'parallel',
1294
+ 'illustrator': {//{{{
1295
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1296
+ }//}}}
1297
+ }; /*}}}*/
1298
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1299
+ 'parent': 'parallel',
1300
+ 'illustrator': {//{{{
1301
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1302
+ }//}}}
1303
+ }; /*}}}*/
1304
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1305
+ 'parent': 'parallel',
1306
+ 'illustrator': {//{{{
1307
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1308
+ }//}}}
1309
+ }; /*}}}*/
1279
1310
  this.elements.parallel_simple = { /*{{{*/
1280
1311
  'parent': 'parallel_finish',
1281
1312
  'illustrator': {//{{{
@@ -1288,6 +1319,18 @@ function WFAdaptorManifestation(adaptor) {
1288
1319
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1289
1320
  },//}}}
1290
1321
  }; /*}}}*/
1322
+ this.elements.parallel_event_all = { /*{{{*/
1323
+ 'parent': 'parallel_finish',
1324
+ 'illustrator': {//{{{
1325
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1326
+ }//}}}
1327
+ }; /*}}}*/
1328
+ this.elements.parallel_event_one = { /*{{{*/
1329
+ 'parent': 'parallel_finish',
1330
+ 'illustrator': {//{{{
1331
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1332
+ }//}}}
1333
+ }; /*}}}*/
1291
1334
  this.elements.parallel_branch_normal = { /*{{{*/
1292
1335
  'parent': 'parallel_branch',
1293
1336
  'illustrator': {//{{{
@@ -2,6 +2,12 @@
2
2
  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
3
3
  <data type="integer"/>
4
4
  </attribute>
5
+ <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
6
+ <choice>
7
+ <value id='last'>After Last Task in Branch</value>
8
+ <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
9
+ </choice>
10
+ </attribute>
5
11
  <element rngui:ignore="true" name="parallel_branch">
6
12
  <attribute name="pass">
7
13
  <data type="string"/>
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -506,8 +506,12 @@ function WFAdaptorManifestation(adaptor) {
506
506
  'endnodes': 'this',
507
507
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
508
508
  'resolve_symbol': function(node) {
509
- if($(node).attr('wait') == '-1') {
509
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
510
510
  return 'parallel_simple';
511
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
512
+ return 'parallel_event_all';
513
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
514
+ return 'parallel_event_one';
511
515
  } else {
512
516
  return 'parallel_complex';
513
517
  }
@@ -882,7 +886,16 @@ function WFAdaptorManifestation(adaptor) {
882
886
  'col_shift': function(node) {
883
887
  return true;
884
888
  },
885
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
889
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
890
+ 'resolve_symbol': function(node) {
891
+ if($(node).attr('cancel') == 'last') {
892
+ return 'parallel_start';
893
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
894
+ return 'parallel_eventbased_exclusive';
895
+ } else {
896
+ return 'parallel_eventbased_parallel';
897
+ }
898
+ },
886
899
  },//}}}
887
900
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
888
901
  'permissible_children': function(node,mode) { //{{{
@@ -1314,6 +1327,24 @@ function WFAdaptorManifestation(adaptor) {
1314
1327
  'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
1315
1328
  },//}}}
1316
1329
  }; /*}}}*/
1330
+ this.elements.parallel_start = { /*{{{*/
1331
+ 'parent': 'parallel',
1332
+ 'illustrator': {//{{{
1333
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1334
+ }//}}}
1335
+ }; /*}}}*/
1336
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1337
+ 'parent': 'parallel',
1338
+ 'illustrator': {//{{{
1339
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1340
+ }//}}}
1341
+ }; /*}}}*/
1342
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1343
+ 'parent': 'parallel',
1344
+ 'illustrator': {//{{{
1345
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1346
+ }//}}}
1347
+ }; /*}}}*/
1317
1348
  this.elements.parallel_simple = { /*{{{*/
1318
1349
  'parent': 'parallel_finish',
1319
1350
  'illustrator': {//{{{
@@ -1326,6 +1357,18 @@ function WFAdaptorManifestation(adaptor) {
1326
1357
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1327
1358
  },//}}}
1328
1359
  }; /*}}}*/
1360
+ this.elements.parallel_event_all = { /*{{{*/
1361
+ 'parent': 'parallel_finish',
1362
+ 'illustrator': {//{{{
1363
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1364
+ }//}}}
1365
+ }; /*}}}*/
1366
+ this.elements.parallel_event_one = { /*{{{*/
1367
+ 'parent': 'parallel_finish',
1368
+ 'illustrator': {//{{{
1369
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1370
+ }//}}}
1371
+ }; /*}}}*/
1329
1372
  this.elements.parallel_branch_normal = { /*{{{*/
1330
1373
  'parent': 'parallel_branch',
1331
1374
  'illustrator': {//{{{
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -462,8 +462,12 @@ function WFAdaptorManifestation(adaptor) {
462
462
  'endnodes': 'this',
463
463
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
464
464
  'resolve_symbol': function(node) {
465
- if($(node).attr('wait') == '-1') {
465
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
466
466
  return 'parallel_simple';
467
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
468
+ return 'parallel_event_all';
469
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
470
+ return 'parallel_event_one';
467
471
  } else {
468
472
  return 'parallel_complex';
469
473
  }
@@ -830,7 +834,16 @@ function WFAdaptorManifestation(adaptor) {
830
834
  'col_shift': function(node) {
831
835
  return true;
832
836
  },
833
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
837
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
838
+ 'resolve_symbol': function(node) {
839
+ if($(node).attr('cancel') == 'last') {
840
+ return 'parallel_start';
841
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
842
+ return 'parallel_eventbased_exclusive';
843
+ } else {
844
+ return 'parallel_eventbased_parallel';
845
+ }
846
+ },
834
847
  },//}}}
835
848
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
836
849
  'permissible_children': function(node,mode) { //{{{
@@ -1257,6 +1270,24 @@ function WFAdaptorManifestation(adaptor) {
1257
1270
  'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
1258
1271
  },//}}}
1259
1272
  }; /*}}}*/
1273
+ this.elements.parallel_start = { /*{{{*/
1274
+ 'parent': 'parallel',
1275
+ 'illustrator': {//{{{
1276
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1277
+ }//}}}
1278
+ }; /*}}}*/
1279
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1280
+ 'parent': 'parallel',
1281
+ 'illustrator': {//{{{
1282
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1283
+ }//}}}
1284
+ }; /*}}}*/
1285
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1286
+ 'parent': 'parallel',
1287
+ 'illustrator': {//{{{
1288
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1289
+ }//}}}
1290
+ }; /*}}}*/
1260
1291
  this.elements.parallel_simple = { /*{{{*/
1261
1292
  'parent': 'parallel_finish',
1262
1293
  'illustrator': {//{{{
@@ -1269,6 +1300,18 @@ function WFAdaptorManifestation(adaptor) {
1269
1300
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1270
1301
  },//}}}
1271
1302
  }; /*}}}*/
1303
+ this.elements.parallel_event_all = { /*{{{*/
1304
+ 'parent': 'parallel_finish',
1305
+ 'illustrator': {//{{{
1306
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1307
+ }//}}}
1308
+ }; /*}}}*/
1309
+ this.elements.parallel_event_one = { /*{{{*/
1310
+ 'parent': 'parallel_finish',
1311
+ 'illustrator': {//{{{
1312
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1313
+ }//}}}
1314
+ }; /*}}}*/
1272
1315
  this.elements.parallel_branch_normal = { /*{{{*/
1273
1316
  'parent': 'parallel_branch',
1274
1317
  'illustrator': {//{{{
@@ -2,6 +2,12 @@
2
2
  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
3
3
  <data type="integer"/>
4
4
  </attribute>
5
+ <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
6
+ <choice>
7
+ <value id='last'>After Last Task in Branch</value>
8
+ <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
9
+ </choice>
10
+ </attribute>
5
11
  <element rngui:ignore="true" name="parallel_branch">
6
12
  <attribute name="pass">
7
13
  <data type="string"/>
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
481
481
  'endnodes': 'this',
482
482
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
483
483
  'resolve_symbol': function(node) {
484
- if($(node).attr('wait') == '-1') {
484
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
485
485
  return 'parallel_simple';
486
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
487
+ return 'parallel_event_all';
488
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
489
+ return 'parallel_event_one';
486
490
  } else {
487
491
  return 'parallel_complex';
488
492
  }
@@ -848,7 +852,16 @@ function WFAdaptorManifestation(adaptor) {
848
852
  'col_shift': function(node) {
849
853
  return true;
850
854
  },
851
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
855
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
856
+ 'resolve_symbol': function(node) {
857
+ if($(node).attr('cancel') == 'last') {
858
+ return 'parallel_start';
859
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
860
+ return 'parallel_eventbased_exclusive';
861
+ } else {
862
+ return 'parallel_eventbased_parallel';
863
+ }
864
+ },
852
865
  },//}}}
853
866
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
854
867
  'permissible_children': function(node,mode) { //{{{
@@ -1275,6 +1288,24 @@ function WFAdaptorManifestation(adaptor) {
1275
1288
  'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
1276
1289
  },//}}}
1277
1290
  }; /*}}}*/
1291
+ this.elements.parallel_start = { /*{{{*/
1292
+ 'parent': 'parallel',
1293
+ 'illustrator': {//{{{
1294
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1295
+ }//}}}
1296
+ }; /*}}}*/
1297
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1298
+ 'parent': 'parallel',
1299
+ 'illustrator': {//{{{
1300
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1301
+ }//}}}
1302
+ }; /*}}}*/
1303
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1304
+ 'parent': 'parallel',
1305
+ 'illustrator': {//{{{
1306
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1307
+ }//}}}
1308
+ }; /*}}}*/
1278
1309
  this.elements.parallel_simple = { /*{{{*/
1279
1310
  'parent': 'parallel_finish',
1280
1311
  'illustrator': {//{{{
@@ -1287,6 +1318,18 @@ function WFAdaptorManifestation(adaptor) {
1287
1318
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1288
1319
  },//}}}
1289
1320
  }; /*}}}*/
1321
+ this.elements.parallel_event_all = { /*{{{*/
1322
+ 'parent': 'parallel_finish',
1323
+ 'illustrator': {//{{{
1324
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1325
+ }//}}}
1326
+ }; /*}}}*/
1327
+ this.elements.parallel_event_one = { /*{{{*/
1328
+ 'parent': 'parallel_finish',
1329
+ 'illustrator': {//{{{
1330
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1331
+ }//}}}
1332
+ }; /*}}}*/
1290
1333
  this.elements.parallel_branch_normal = { /*{{{*/
1291
1334
  'parent': 'parallel_branch',
1292
1335
  'illustrator': {//{{{
@@ -2,6 +2,12 @@
2
2
  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
3
3
  <data type="integer"/>
4
4
  </attribute>
5
+ <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
6
+ <choice>
7
+ <value id='last'>After Last Task in Branch</value>
8
+ <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
9
+ </choice>
10
+ </attribute>
5
11
  <element rngui:ignore="true" name="parallel_branch">
6
12
  <attribute name="pass">
7
13
  <data type="string"/>
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
3
3
 
4
- <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
5
- <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
4
+ <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
5
+ <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
6
6
  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
7
7
  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
8
8
  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <path
6
+ d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
7
+ class="stand"/>
8
+ </svg>
9
+
@@ -0,0 +1,8 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
4
+ <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
5
+ <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
6
+ <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
7
+ </svg>
8
+
@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
481
481
  'endnodes': 'this',
482
482
  'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
483
483
  'resolve_symbol': function(node) {
484
- if($(node).attr('wait') == '-1') {
484
+ if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
485
485
  return 'parallel_simple';
486
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
487
+ return 'parallel_event_all';
488
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
489
+ return 'parallel_event_one';
486
490
  } else {
487
491
  return 'parallel_complex';
488
492
  }
@@ -849,7 +853,16 @@ function WFAdaptorManifestation(adaptor) {
849
853
  'col_shift': function(node) {
850
854
  return true;
851
855
  },
852
- 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
856
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
857
+ 'resolve_symbol': function(node) {
858
+ if($(node).attr('cancel') == 'last') {
859
+ return 'parallel_start';
860
+ } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
861
+ return 'parallel_eventbased_exclusive';
862
+ } else {
863
+ return 'parallel_eventbased_parallel';
864
+ }
865
+ },
853
866
  },//}}}
854
867
  'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
855
868
  'permissible_children': function(node,mode) { //{{{
@@ -1276,6 +1289,24 @@ function WFAdaptorManifestation(adaptor) {
1276
1289
  'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
1277
1290
  },//}}}
1278
1291
  }; /*}}}*/
1292
+ this.elements.parallel_start = { /*{{{*/
1293
+ 'parent': 'parallel',
1294
+ 'illustrator': {//{{{
1295
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
1296
+ }//}}}
1297
+ }; /*}}}*/
1298
+ this.elements.parallel_eventbased_exclusive = { /*{{{*/
1299
+ 'parent': 'parallel',
1300
+ 'illustrator': {//{{{
1301
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1302
+ }//}}}
1303
+ }; /*}}}*/
1304
+ this.elements.parallel_eventbased_parallel = { /*{{{*/
1305
+ 'parent': 'parallel',
1306
+ 'illustrator': {//{{{
1307
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1308
+ }//}}}
1309
+ }; /*}}}*/
1279
1310
  this.elements.parallel_simple = { /*{{{*/
1280
1311
  'parent': 'parallel_finish',
1281
1312
  'illustrator': {//{{{
@@ -1288,6 +1319,18 @@ function WFAdaptorManifestation(adaptor) {
1288
1319
  'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
1289
1320
  },//}}}
1290
1321
  }; /*}}}*/
1322
+ this.elements.parallel_event_all = { /*{{{*/
1323
+ 'parent': 'parallel_finish',
1324
+ 'illustrator': {//{{{
1325
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
1326
+ }//}}}
1327
+ }; /*}}}*/
1328
+ this.elements.parallel_event_one = { /*{{{*/
1329
+ 'parent': 'parallel_finish',
1330
+ 'illustrator': {//{{{
1331
+ 'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
1332
+ }//}}}
1333
+ }; /*}}}*/
1291
1334
  this.elements.parallel_branch_normal = { /*{{{*/
1292
1335
  'parent': 'parallel_branch',
1293
1336
  'illustrator': {//{{{
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.0.28"
3
+ s.version = "2.0.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."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
22
22
  s.homepage = 'http://cpee.org/'
23
23
 
24
24
  s.add_runtime_dependency 'riddl', '~> 0.108'
25
- s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.90'
25
+ s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.98'
26
26
  s.add_runtime_dependency 'highline', '~> 2.0'
27
27
  s.add_runtime_dependency 'json', '~>2.1'
28
28
  s.add_runtime_dependency 'redis', '~> 4.1'
@@ -114,6 +114,10 @@
114
114
  <xsl:if test="@wait">
115
115
  <xsl:text> :wait =&gt; </xsl:text>
116
116
  <xsl:value-of select="@wait"/>
117
+ <xsl:if test="@cancel">
118
+ <xsl:text>, :cancel =&gt; :</xsl:text>
119
+ <xsl:value-of select="@cancel"/>
120
+ </xsl:if>
117
121
  </xsl:if>
118
122
  <xsl:text> do</xsl:text>
119
123
  <xsl:call-template name="print-newline"/>
@@ -1 +1 @@
1
- 592867
1
+ 3009845
@@ -1 +1 @@
1
- 592855
1
+ 3009833
@@ -1 +1 @@
1
- 592859
1
+ 3009837
@@ -1 +1 @@
1
- 592863
1
+ 3009841
data/server/server.pid CHANGED
@@ -1 +1 @@
1
- 592827
1
+ 3009809
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.0.28
4
+ version: 2.0.30
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: 2021-05-03 00:00:00.000000000 Z
13
+ date: 2021-05-11 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl
@@ -35,7 +35,7 @@ dependencies:
35
35
  version: '1.99'
36
36
  - - ">="
37
37
  - !ruby/object:Gem::Version
38
- version: 1.99.90
38
+ version: 1.99.98
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
45
45
  version: '1.99'
46
46
  - - ">="
47
47
  - !ruby/object:Gem::Version
48
- version: 1.99.90
48
+ version: 1.99.98
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: highline
51
51
  requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,8 @@ files:
251
251
  - cockpit/themes/compact/symbols/parallel_branch_compact.svg
252
252
  - cockpit/themes/compact/symbols/parallel_branch_event.svg
253
253
  - cockpit/themes/compact/symbols/parallel_branch_normal.svg
254
+ - cockpit/themes/compact/symbols/parallel_eventbased_exclusive.svg
255
+ - cockpit/themes/compact/symbols/parallel_eventbased_parallel.svg
254
256
  - cockpit/themes/compact/symbols/scripts.svg
255
257
  - cockpit/themes/compact/symbols/start.svg
256
258
  - cockpit/themes/compact/symbols/stop.svg
@@ -299,6 +301,8 @@ files:
299
301
  - cockpit/themes/control/symbols/parallel_branch_compact.svg
300
302
  - cockpit/themes/control/symbols/parallel_branch_event.svg
301
303
  - cockpit/themes/control/symbols/parallel_branch_normal.svg
304
+ - cockpit/themes/control/symbols/parallel_eventbased_exclusive.svg
305
+ - cockpit/themes/control/symbols/parallel_eventbased_parallel.svg
302
306
  - cockpit/themes/control/symbols/scripts.svg
303
307
  - cockpit/themes/control/symbols/start.svg
304
308
  - cockpit/themes/control/symbols/stop.svg
@@ -347,6 +351,8 @@ files:
347
351
  - cockpit/themes/default/symbols/parallel_branch_compact.svg
348
352
  - cockpit/themes/default/symbols/parallel_branch_event.svg
349
353
  - cockpit/themes/default/symbols/parallel_branch_normal.svg
354
+ - cockpit/themes/default/symbols/parallel_eventbased_exclusive.svg
355
+ - cockpit/themes/default/symbols/parallel_eventbased_parallel.svg
350
356
  - cockpit/themes/default/symbols/scripts.svg
351
357
  - cockpit/themes/default/symbols/start.svg
352
358
  - cockpit/themes/default/symbols/stop.svg
@@ -395,6 +401,8 @@ files:
395
401
  - cockpit/themes/extended/symbols/parallel_branch_compact.svg
396
402
  - cockpit/themes/extended/symbols/parallel_branch_event.svg
397
403
  - cockpit/themes/extended/symbols/parallel_branch_normal.svg
404
+ - cockpit/themes/extended/symbols/parallel_eventbased_exclusive.svg
405
+ - cockpit/themes/extended/symbols/parallel_eventbased_parallel.svg
398
406
  - cockpit/themes/extended/symbols/scripts.svg
399
407
  - cockpit/themes/extended/symbols/start.svg
400
408
  - cockpit/themes/extended/symbols/stop.svg
@@ -439,6 +447,8 @@ files:
439
447
  - cockpit/themes/model/symbols/parallel_branch_compact.svg
440
448
  - cockpit/themes/model/symbols/parallel_branch_event.svg
441
449
  - cockpit/themes/model/symbols/parallel_branch_normal.svg
450
+ - cockpit/themes/model/symbols/parallel_eventbased_exclusive.svg
451
+ - cockpit/themes/model/symbols/parallel_eventbased_parallel.svg
442
452
  - cockpit/themes/model/symbols/scripts.svg
443
453
  - cockpit/themes/model/symbols/start.svg
444
454
  - cockpit/themes/model/symbols/stop.svg
@@ -487,6 +497,8 @@ files:
487
497
  - cockpit/themes/packed/symbols/parallel_branch_compact.svg
488
498
  - cockpit/themes/packed/symbols/parallel_branch_event.svg
489
499
  - cockpit/themes/packed/symbols/parallel_branch_normal.svg
500
+ - cockpit/themes/packed/symbols/parallel_eventbased_exclusive.svg
501
+ - cockpit/themes/packed/symbols/parallel_eventbased_parallel.svg
490
502
  - cockpit/themes/packed/symbols/scripts.svg
491
503
  - cockpit/themes/packed/symbols/start.svg
492
504
  - cockpit/themes/packed/symbols/stop.svg
@@ -535,6 +547,8 @@ files:
535
547
  - cockpit/themes/preset/symbols/parallel_branch_compact.svg
536
548
  - cockpit/themes/preset/symbols/parallel_branch_event.svg
537
549
  - cockpit/themes/preset/symbols/parallel_branch_normal.svg
550
+ - cockpit/themes/preset/symbols/parallel_eventbased_exclusive.svg
551
+ - cockpit/themes/preset/symbols/parallel_eventbased_parallel.svg
538
552
  - cockpit/themes/preset/symbols/scripts.svg
539
553
  - cockpit/themes/preset/symbols/start.svg
540
554
  - cockpit/themes/preset/symbols/stop.svg