cpee 2.1.91 → 2.1.93

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/{compact/symbols/end.svg → presetid/symbols/terminate.svg}

@@ -1,3 +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

@@ -11,6 +11,20 @@
     <element name="label" rngui:label="Label">
       <data type="string" rngui:label="Short description of the task"/>
     </element>
+    <element name="color" rngui:label="Task Color">
+      <choice rngui:type='color'>
+        <value>#ffffff</value>
+        <value>#d4e1f1</value>
+        <value>#d8f0dd</value>
+        <value>#ffffcc</value>
+        <value>#f2d8b8</value>
+        <value>#eeb3ac</value>
+        <value>#e4c3e4</value>
+        <value>#ded0c5</value>
+        <value>#bcbbbd</value>
+        <value>#f57aa9</value>
+      </choice>
+    </element>
     <element name="method" rngui:label="Method">
       <choice>
         <value>:post</value>

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

@@ -11,6 +11,20 @@
     <element name="label" rngui:label="Label">
       <data type="string" rngui:label="Short description of the task"/>
     </element>
+    <element name="color" rngui:label="Task Color">
+      <choice rngui:type='color'>
+        <value>#ffffff</value>
+        <value>#d4e1f1</value>
+        <value>#d8f0dd</value>
+        <value>#ffffcc</value>
+        <value>#f2d8b8</value>
+        <value>#eeb3ac</value>
+        <value>#e4c3e4</value>
+        <value>#ded0c5</value>
+        <value>#bcbbbd</value>
+        <value>#f57aa9</value>
+      </choice>
+    </element>
     <element name="method" rngui:label="Method">
       <choice>
         <value>:post</value>
@@ -29,7 +43,10 @@
       </zeroOrMore>
     </element>
   </element>
-  <element name="code" rngui:header="Output Handling">
+  <element name="code" rngui:header="Data Handling">
+    <element name="signal" rngui:label="Signal after data manipulation (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">
       <text rngui:label="Script that is executed, before a service call"/>
     </element>

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

@@ -5,10 +5,13 @@
       <value>inclusive</value>
     </choice>
   </attribute>
+  <attribute name="label" rngui:label="Label">
+    <data type="string" rngui:label="Label"/>
+  </attribute>
   <element rngui:ignore="true" name="alternative">
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="otherwise"/>
-</element>
+</element>

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

@@ -5,5 +5,19 @@
   <attribute name="label" rngui:label="Label">
     <data type="string" rngui:label="Short description of the task"/>
   </attribute>
+  <attribute name="color" rngui:label="Task Color">
+    <choice rngui:type='color'>
+      <value>#ffffff</value>
+      <value>#d4e1f1</value>
+      <value>#d8f0dd</value>
+      <value>#ffffcc</value>
+      <value>#f2d8b8</value>
+      <value>#eeb3ac</value>
+      <value>#e4c3e4</value>
+      <value>#ded0c5</value>
+      <value>#bcbbbd</value>
+      <value>#f57aa9</value>
+    </choice>
+  </attribute>
   <text rngui:label="Script that is executed"/>
-</element>
+</element>

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

@@ -1,131 +1,145 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-    <element name="_generic" rngui:header="Process Level Generic Annotations">
-      <zeroOrMore rngui:label="Create Annotation Pair">
-        <element rngui:label="Name" rngui:labeltype="xml">
-          <anyName/>
-          <data type="string" rngui:label="Value"/>
-        </element>
-      </zeroOrMore>
-    </element>
+  <attribute name="color" rngui:label="Default Color">
+    <choice rngui:type='color'>
+      <value>#ffffff</value>
+      <value>#d4e1f1</value>
+      <value>#d8f0dd</value>
+      <value>#ffffcc</value>
+      <value>#f2d8b8</value>
+      <value>#eeb3ac</value>
+      <value>#e4c3e4</value>
+      <value>#ded0c5</value>
+      <value>#bcbbbd</value>
+      <value>#f57aa9</value>
+    </choice>
+  </attribute>
+  <element name="_generic" rngui:header="Process Level Generic Annotations">
+    <zeroOrMore rngui:label="Create Annotation Pair">
+      <element rngui:label="Name" rngui:labeltype="xml">
+        <anyName/>
+        <data type="string" rngui:label="Value"/>
+      </element>
+    </zeroOrMore>
+  </element>
 
-    <element name="_shifting" rngui:header="Log Time Shifting">
-      <optional>
-        <element name="_shifting_factor" rngui:label="Multiplication Factor">
-          <data type="string" rngui:label="e.g.: 2 hours"/>
-        </element>
-      </optional>
-      <optional>
-        <element name="_shifting_start" rngui:label="Starting Point">
-          <data type="string" rngui:label="e.g.: monday, 5pm"/>
-        </element>
-      </optional>
-      <optional>
-        <element name="_shifting_modifier" rngui:label="Random +/- Starting Shift">
-          <data type="float" rngui:label="in seconds"/>
-        </element>
-      </optional>
-    </element>
+  <element name="_shifting" rngui:header="Log Time Shifting">
+    <optional>
+      <element name="_shifting_factor" rngui:label="Multiplication Factor">
+        <data type="string" rngui:label="e.g.: 2 hours"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="_shifting_start" rngui:label="Starting Point">
+        <data type="string" rngui:label="e.g.: monday, 5pm"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="_shifting_modifier" rngui:label="Random +/- Starting Shift">
+        <data type="float" rngui:label="in seconds"/>
+      </element>
+    </optional>
+  </element>
 
-    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+  <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
 
-      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
-        <zeroOrMore rngui:label="Add Probe">
-          <element name="probe">
-            <element name="id" rngui:label="ID">
-              <data type="string" rngui:label="ID"/>
-            </element>
-            <element name="source" rngui:label="Source">
-              <data type="string" rngui:label="Where does the sensor value come from?"/>
-            </element>
-            <element name="extractor_type" rngui:label="Extractor Type">
-              <choice>
-                <value rngui:label='Intrinsic'>intrinsic</value>
-                <value rngui:label='Extrinsic'>extrinsic</value>
-                <value rngui:label='Separate'>separate</value>
-              </choice>
-            </element>
-            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
-              <text rngui:label="Code"/>
-            </element>
-            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
-              <zeroOrMore rngui:label="Create Argument Pairs">
-                <element rngui:label="Name">
-                  <anyName/>
-                  <data type="string" rngui:label="Value / Json"/>
-                </element>
-              </zeroOrMore>
-            </element>
-            <element name="visualizer_url" rngui:label="Visualizer Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="visualizer_params" rngui:label="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Argument Pairs">
-                <element rngui:label="Name">
-                  <anyName/>
-                  <data type="string" rngui:label="Value / Json"/>
-                </element>
-              </zeroOrMore>
-            </element>
+    <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
+      <zeroOrMore rngui:label="Add Probe">
+        <element name="probe">
+          <element name="id" rngui:label="ID">
+            <data type="string" rngui:label="ID"/>
           </element>
-        </zeroOrMore>
-      </element>
+          <element name="source" rngui:label="Source">
+            <data type="string" rngui:label="Where does the sensor value come from?"/>
+          </element>
+          <element name="extractor_type" rngui:label="Extractor Type">
+            <choice>
+              <value rngui:label='Intrinsic'>intrinsic</value>
+              <value rngui:label='Extrinsic'>extrinsic</value>
+              <value rngui:label='Separate'>separate</value>
+            </choice>
+          </element>
+          <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
+            <text rngui:label="Code"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
+            <data type="string" rngui:label="Service Url"/>
+          </element>
+          <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+            <zeroOrMore rngui:label="Create Argument Pairs">
+              <element rngui:label="Name">
+                <anyName/>
+                <data type="string" rngui:label="Value / Json"/>
+              </element>
+            </zeroOrMore>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Service Url"/>
+          </element>
+          <element name="visualizer_params" rngui:label="Visualizer Arguments">
+            <zeroOrMore rngui:label="Create Argument Pairs">
+              <element rngui:label="Name">
+                <anyName/>
+                <data type="string" rngui:label="Value / Json"/>
+              </element>
+            </zeroOrMore>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
 
-      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Impact Profile">
-          <element name="ip">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="target" rngui:label="Target Value">
-              <data type="string" rngui:label="Value"/>
-            </element>
-            <element name="ifs" rngui:header="Impact Factors">
-              <zeroOrMore rngui:label="Add Impact Factor">
-                <element name="if">
-                  <element name="ivs" rngui:header="Impact Values">
-                    <zeroOrMore rngui:label="Add Impact Value ">
-                      <element name="iv">
-                        <element name="extractor_url" rngui:label="Extractor Url">
-                          <data type="string" rngui:label="Service Url + Parameters"/>
-                        </element>
-                        <element name="extractor_params" rngui:header="Extractor Arguments">
-                          <zeroOrMore rngui:label="Create Extractor Argument Pairs">
-                            <element rngui:label="Name">
-                              <anyName/>
-                              <data type="string" rngui:label="Value / Json"/>
-                            </element>
-                          </zeroOrMore>
-                        </element>
-                        <element name="aggregator_url" rngui:label="Aggregator Url">
-                          <data type="string" rngui:label="Service Url + Parameters"/>
-                        </element>
-                        <element name="aggregator_params" rngui:header="Extractor Arguments">
-                          <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
-                            <element rngui:label="Name">
-                              <anyName/>
-                              <data type="string" rngui:label="Value / Json"/>
-                            </element>
-                          </zeroOrMore>
-                        </element>
+    <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+      <zeroOrMore rngui:label="Add Impact Profile">
+        <element name="ip">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="target" rngui:label="Target Value">
+            <data type="string" rngui:label="Value"/>
+          </element>
+          <element name="ifs" rngui:header="Impact Factors">
+            <zeroOrMore rngui:label="Add Impact Factor">
+              <element name="if">
+                <element name="ivs" rngui:header="Impact Values">
+                  <zeroOrMore rngui:label="Add Impact Value ">
+                    <element name="iv">
+                      <element name="extractor_url" rngui:label="Extractor Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                      <element name="extractor_params" rngui:header="Extractor Arguments">
+                        <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                          <element rngui:label="Name">
+                            <anyName/>
+                            <data type="string" rngui:label="Value / Json"/>
+                          </element>
+                        </zeroOrMore>
                       </element>
-                    </zeroOrMore>
-                  </element>
-                  <element name="aggregator_url" rngui:label="Impact Function Url">
-                    <data type="string" rngui:label="Service Url + Parameters"/>
-                  </element>
+                      <element name="aggregator_url" rngui:label="Aggregator Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                      <element name="aggregator_params" rngui:header="Extractor Arguments">
+                        <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
+                          <element rngui:label="Name">
+                            <anyName/>
+                            <data type="string" rngui:label="Value / Json"/>
+                          </element>
+                        </zeroOrMore>
+                      </element>
+                    </element>
+                  </zeroOrMore>
+                </element>
+                <element name="aggregator_url" rngui:label="Impact Function Url">
+                  <data type="string" rngui:label="Service Url + Parameters"/>
                 </element>
-              </zeroOrMore>
-            </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url + Parameters"/>
-            </element>
+              </element>
+            </zeroOrMore>
           </element>
-        </zeroOrMore>
-      </element>
-
+          <element name="vfunc_url" rngui:label="Violation Function Url">
+            <data type="string" rngui:label="Service Url + Parameters"/>
+          </element>
+        </element>
+      </zeroOrMore>
     </element>
 
+  </element>
+
 </element>

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

@@ -0,0 +1,8 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="wait_for_signal" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <element name="label" rngui:label="Label">
+    <data type="string" rngui:label="What do we wait for? (data changes in a parallel task)"/>
+  </element>
+</element>

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

@@ -1,5 +1,15 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
-  <path class="cline hfill 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="ourline"/>
+  <g class="part-normal">
+    <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"/>
+  </g>
+  <g class="part-start">
+    <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"/>
+  </g>
+  <g class="part-middle" transform="translate(30,0)">
+    <text transform="translate(0,20)" class="label standalone"></text>
+  </g>
 </svg>

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

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="rfill 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>