cpee 2.1.92 → 2.1.95

data/cockpit/themes/presetid/symbols/loop.svg

@@ -0,0 +1,15 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <g class="part-normal">
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+    <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+  </g>
+  <g class="part-start">
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+    <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+  </g>
+  <g class="part-middle" transform="translate(28,0)">
+    <text transform="translate(5,15)" class="label standalone"></text>
+  </g>
+</svg>

data/cockpit/themes/presetid/symbols/loop_end.svg

@@ -0,0 +1,15 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <g class="part-normal">
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+    <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+  </g>
+  <g class="part-start">
+    <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+    <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+    <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+  </g>
+  <g class="part-middle" transform="translate(30,0)">
+    <text transform="translate(5,18)" class="label standalone"></text>
+  </g>
+</svg>

data/cockpit/themes/presetid/symbols/manipulate.svg

@@ -0,0 +1,19 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <g class="part-normal">
+    <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
+  </g>
+  <g class="part-start" clip-path="url(#startclip)">
+    <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
+  </g>
+  <g class="part-end" clip-path="url(#endclip)">
+    <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
+  </g>
+  <g class="part-middle" transform="translate(27,0)">
+    <rect x="0" y="1" width="220" height="28" class="standwithout colorstyle"/>
+    <line x1="0" y1="1" x2="220" y2="1" class="standline markstyle hoverstyle execstyle" />
+    <line x1="0" y1="29" x2="220" y2="29" class="standline markstyle hoverstyle execstyle" />
+    <text transform="translate(0,20)" class="label"></text>
+  </g>
+</svg>

data/cockpit/themes/presetid/symbols/otherwise.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="11" class="standtrans"/>
+  <line x1="9" y1="21" x2="21" y2="9" class="stand markstyle hoverstyle"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="edge"/>
+</svg>

data/cockpit/themes/presetid/symbols/parallel.svg

@@ -0,0 +1,6 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
+  <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
+</svg>
+

data/cockpit/themes/presetid/symbols/parallel_branch.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="white"/>
+  <path class="markstyle hoverstyle stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="edge"/>
+</svg>

data/cockpit/themes/presetid/symbols/parallel_branch_event.svg

@@ -0,0 +1,14 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="3" width="24" height="24" rx="4" class="colorstyle hoverstyle execstyle markstyle stand"/>
+
+  <circle cx="24" cy="15" r="9" class="markstyle execstyle standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="markstyle execstyle standthin" style="stroke-dasharray: 1,2"/>
+  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
+  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
+  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
+
+  <circle cx="55.5" cy="15" r="14" class="colorstyle markstyle hoverstyle execstyle stand"/>
+  <line x1="55.5" y1="11" x2="51.5" y2="18" class="stand"/>
+  <line x1="51.5" y1="18" x2="59.5" y2="18" class="stand"/>
+  <line x1="59.5" y1="18" x2="55.5" y2="11" class="stand"/>
+</svg>

data/cockpit/themes/presetid/symbols/parallel_branch_normal.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="white"/>
+  <path class="markstyle hoverstyle stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="edge"/>
+</svg>

data/cockpit/themes/presetid/symbols/parallel_eventbased_exclusive.svg

@@ -0,0 +1,9 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin colorstyle"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin colorstyle"/>
+  <path
+    d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+    class="stand colorstyle"/>
+</svg>
+

data/cockpit/themes/presetid/symbols/parallel_eventbased_parallel.svg

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin colorstyle"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin colorstyle"/>
+  <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
+</svg>
+

data/cockpit/themes/presetid/symbols/scripts.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
+  <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
+</svg>

data/cockpit/themes/presetid/symbols/start.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="colorstyle markstyle hoverstyle execstyle stand"/>
+</svg>

data/cockpit/themes/presetid/symbols/start_event.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="colorstyle hoverstyle execstyle markstyle stand"/>
+  <rect x="7" y="10" width="16" height="11" class="black" style="fill: none"/>
+  <path d="m 7,10 8,6 8,-6" class="black" style="fill: none"/>
+</svg>

data/cockpit/themes/presetid/symbols/stop.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15.5" cy="15.5" r="14" class="colorstyle hoverstyle execstyle markstyle stand"/>
+  <line x1="12.5" y1="22.5" x2="12.5" y2="8.5" class="stand"/>
+  <line x1="17.5" y1="22.5" x2="17.5" y2="8.5" class="stand"/>
+</svg>

data/cockpit/themes/presetid/symbols/terminate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="standfat"/>
+  <circle cx="15" cy="15" r="9" class="black"/>
+</svg>

data/cockpit/themes/presetid/symbols/wait_for_signal.svg

@@ -0,0 +1,21 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <g class="part-normal">
+    <circle cx="15.5" cy="15" r="14" class="markstyle hoverstyle stand"/>
+    <circle cx="15.5" cy="15" r="11" class="colorstyle markstyle execstyle stand"/>
+    <line x1="15.5" y1="08" x2="09.5" y2="19" class="stand"/>
+    <line x1="09.5" y1="19" x2="21.5" y2="19" class="stand"/>
+    <line x1="21.5" y1="19" x2="15.5" y2="08" class="stand"/>
+  </g>
+  <g class="part-start">
+    <circle cx="15.5" cy="15" r="14" class="markstyle hoverstyle stand"/>
+    <circle cx="15.5" cy="15" r="11" class="colorstyle markstyle execstyle stand"/>
+    <line x1="15.5" y1="08" x2="09.5" y2="19" class="stand"/>
+    <line x1="09.5" y1="19" x2="21.5" y2="19" class="stand"/>
+    <line x1="21.5" y1="19" x2="15.5" y2="08" class="stand"/>
+  </g>
+  <g class="part-middle" transform="translate(32,0)">
+    <text transform="translate(0,20)" class="label"></text>
+  </g>
+  <g class="part-extra" transform="">
+  </g>
+</svg>

data/cockpit/themes/presetid/theme.js

@@ -0,0 +1,16 @@
+WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
+  constructor(adaptor) {
+    super(adaptor);
+    this.compact = true;
+    this.rotated_labels = false;
+    this.elements.call.illustrator.label = function(node) { //{{{
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('id') + ')' } ];
+    }; //}}}
+    this.elements.stop.illustrator.label = function(node) { //{{{
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('id') + ')' } ];
+    }; //}}}
+    this.elements.wait_for_signal.illustrator.label = function(node) { //{{{
+      return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('id') + ')' } ];
+    }; //}}}
+  }
+}

data/cockpit/themes/reduced/rngs/call.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -51,6 +52,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/reduced/rngs/callmanipulate.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -43,7 +44,7 @@
     </element>
   </element>
   <element name="code" rngui:header="Data Handling">
-    <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
+    <element name="signal" rngui:label="Signal after finalize/update">
       <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
     </element>
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -77,6 +78,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/reduced/rngs/loop.rng

@@ -19,4 +19,11 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_iteration" rngui:label="Log per iteration">
+        <data type="boolean" rngui:label="Log per iteration"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/reduced/rngs/manipulate.rng

@@ -16,7 +16,15 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/reduced/rngs/start.rng

@@ -10,6 +10,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <element name="_generic" rngui:header="Process Level Generic Annotations">

data/cockpit/themes/reduced/symbols/arrow.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="execstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+  <path class="colorstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
 </svg>

data/cockpit/themes/reduced/symbols/callmanipulate.svg

@@ -18,6 +18,6 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
   </g>
 </svg>

data/cockpit/themes/reduced/symbols/callmanipulate_sensor.svg

@@ -18,7 +18,8 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
+
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
   </g>

data/cockpit/themes/reduced/symbols/callmanipulate_sensor_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>

data/cockpit/themes/reduced/symbols/callmanipulate_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle hoverstylethin execstylethin colorstyle stand"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <circle cx="29" cy="10" r="7" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>
     <circle cx="29" cy="10" r="5" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>

data/cockpit/themes/reduced/symbols/critical.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3 27 l 12 -24 l 12 24 z"/>
-  <text transform="translate(15,23)" class="small">!</text>
+  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 11 l 0 8 l -2 0 l 0 -8 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 21 l 0 2 l -2 0 l 0 -2 z"/>
 </svg>

data/cockpit/themes/reduced/symbols/delete.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
-  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="colorstyle standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="colorstyle standfat"/>
 </svg>

data/cockpit/themes/reduced/symbols/end.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle standfat"/>
+  <circle cx="15" cy="15" r="13" class="colorstyle standfat" style="stroke-width: 5;"/>
 </svg>

data/cockpit/themes/reduced/symbols/manipulate.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,21)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-start" clip-path="url(#startclip)">
     <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,20.5)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-end" clip-path="url(#endclip)">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>

data/cockpit/themes/reduced/symbols/parallel.svg

@@ -1,5 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
-  <text transform="translate(15.5,23)" class="normallarge">+</text>
+  <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
+  <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
 </svg>
 

data/cockpit/themes/reduced/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
-  <text transform="translate(15,21)" class="normal">s</text>
+  <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
 </svg>

data/cockpit/track.html

@@ -56,11 +56,11 @@
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/track.js"></script>
     <script type="text/javascript" src="js/modifiers.js"></script>
-    <script type="text/javascript" src="js/resources.js"></script>
+    <script type="text/javascript" src="js/extended_columns.js"></script>
     <script type="text/javascript" src="themes/base.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
-    <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
-    <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
+    <link rel="stylesheet" href="css/extended_columns-label.css" type="text/css"/>
+    <link rel="stylesheet" href="css/extended_columns-svg.css" type="text/css" data-include-export="true"/>
     <link rel="stylesheet" href="css/track.css" type="text/css"/>
   </head>
   <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">

data/cpee.gemspec

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

data/lib/cpee/implementation.rb

@@ -117,7 +117,7 @@ module CPEE
       Dir[File.join(opts[:global_executionhandlers],'*','execution.rb')].each do |h|
         require h
       end unless opts[:global_executionhandlers].nil? || opts[:global_executionhandlers].strip == ''
-      Dir[File.join(opts[:executionhandlers],'*','execution.rb')].each do |h|
+      Dir[File.join(opts[:executionhandlers],'**','execution.rb')].each do |h|
         require h
       end unless opts[:executionhandlers].nil? || opts[:executionhandlers].strip == ''
       CPEE::Message::set_workers(opts[:workers])
@@ -316,34 +316,12 @@ module CPEE
 
       doc   = XML::Smart::string(@p[0].value.read)
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-      doc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+      doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
 
       name = doc.find('string(/*/p:attributes/p:info)')
 
-      id, uuid = NewInstance::create(opts,redis,name,doc)
-
-      subscriptions = []
-      (doc.find('/*/sub:subscriptions/sub:subscription') rescue []).each do |s|
-        sub = []
-        unless sub[0] = s.attributes['id']
-          sub[0] = Digest::MD5.hexdigest(Kernel::rand().to_s)
-        end
-
-        unless sub[1] = s.attributes['url']
-          raise "no url"
-        end
-
-        sub[2] = []
-        s.find('sub:topic').each do |t|
-          %w(event vote).each do |type|
-            t.find('sub:' + type).each do |e|
-              sub[2] << File.join(t.attributes['id'],type,e.text)
-            end
-          end
-        end
-
-        CPEE::Persistence::set_handler(id,opts,*sub)
-      end
+      subs = (doc.find('/*/np:subscriptions/np:subscription') rescue []).to_a
+      id, uuid = NewInstance::create(opts,redis,name,subs,doc)
 
       content = {
         :state => 'ready',
@@ -372,7 +350,19 @@ module CPEE
       File.join(*ret.reverse)
     end
 
-    def self::create(opts,redis,name,doc=nil)
+    def self::sub(multi,id,doc,key)
+      doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+      url = doc.find('string(/np:subscription/@url)')
+      multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers",key)
+      multi.set(CPEE::Persistence::obj + ":#{id}/handlers/#{key}/url",url)
+      doc.find('/np:subscription/np:topic/*').each do |e|
+        c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
+        multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{key}",c)
+        multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{c}",key)
+      end
+    end
+
+    def self::create(opts,redis,name,subs,doc=nil)
       doc = XML::Smart::open_unprotected(opts[:properties_init]) if doc.nil?
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
       id       = CPEE::Persistence::new_object(opts)
@@ -399,18 +389,15 @@ module CPEE
         end
         Dir[File.join(opts[:notifications_init],'*','subscription.xml')].each do |f|
           XML::Smart::open_unprotected(f) do |doc|
-            doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
-            key = File.basename(File.dirname(f))
-            url = doc.find('string(/np:subscription/@url)')
-            multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers",key)
-            multi.set(CPEE::Persistence::obj + ":#{id}/handlers/#{key}/url",url)
-            doc.find('/np:subscription/np:topic/*').each do |e|
-              c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
-              multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{key}",c)
-              multi.sadd(CPEE::Persistence::obj + ":#{id}/handlers/#{c}",key)
-            end
+            NewInstance::sub(multi,id,doc,File.basename(File.dirname(f)))
           end rescue nil # all the ones that are not ok, are ignored
         end
+        subs.each do |s|
+          begin
+            NewInstance::sub(multi,id,s.to_doc,s.attributes['id'] || Digest::MD5.hexdigest(Kernel::rand().to_s))
+          end
+        end
+
         multi.set(File.join(instance, 'attributes', 'uuid'), uuid)
         multi.zadd(File.join(instance, 'attributes'), -2, 'uuid')
         multi.set(File.join(instance, 'attributes', 'info'), name)
@@ -426,7 +413,7 @@ module CPEE
       redis = opts[:redis]
       name  = @p[0].value
 
-      id, uuid = NewInstance::create(opts,redis,name)
+      id, uuid = NewInstance::create(opts,redis,name,[])
       content = {
         :state => 'ready',
         :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h

data/server/executionhandlers/ruby/connection.rb

@@ -46,7 +46,11 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
     begin
-      controller.notify("executionhandler/error", :message => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):\s(.*)/)[4] + err.message, :line => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[3], :where => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[1])
+      if err.backtrace[0] !~ /, Line/
+        controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/(Activity a\d+)/,'\1:'), :line => -1, :where => err.backtrace[0].match(/Activity a\d+/)[0])
+      else
+        controller.notify("executionhandler/error", :message => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):\s(.*)/)[4] + err.message, :line => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[3], :where => err.backtrace[0].match(/(.*?)(, Line |:)(\d+):/)[1])
+      end
     rescue => e
       controller.notify("executionhandler/error", :message => err.message)
     end
@@ -217,7 +221,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @label = parameters[:label]
     @anno = parameters.delete(:annotations) rescue nil
     @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
-    @controller.notify("activity/calling", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :annotations => @anno)
+    @controller.notify("activity/calling", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -227,6 +232,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
   def activity_manipulate_handle(parameters) #{{{
     @label = parameters[:label]
+    @anno = parameters.delete(:annotations) rescue nil
+    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
   def activity_result_value # {{{
@@ -291,7 +298,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       nil
     end
 
-    @controller.notify("activity/receiving", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
+    @controller.notify("activity/receiving", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
 
     @guard_files += result
     @guard_files += ret
@@ -426,6 +433,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     recv = 'false' unless recv
     recv = (recv == 'false' || recv == 'null' || recv == 'nil' || recv == false ? false : true)
     @controller.notify("gateway/decide", :ecid => Thread.current.__id__, :instance_uuid => @controller.uuid, :code => code, :condition => recv)
+    @controller.notify("gateway/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
     recv
   end #}}}
   def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil) #{{{

data/server/routing/end.pid

@@ -1 +1 @@
-91247
+2372948

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

@@ -1 +1 @@
-91265
+2372966

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

@@ -0,0 +1 @@
+2372972

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

@@ -0,0 +1 @@
+2372978