cpee 2.0.28 → 2.1.4

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

@@ -1,8 +1,8 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
 
-  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
-  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill 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"/>

data/cockpit/themes/control/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="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <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"/>
+</svg>
+

data/cockpit/themes/control/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="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <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/control/symbols/start.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline hfill rfill stand"/>
 </svg>

data/cockpit/themes/control/theme.js

@@ -506,8 +506,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -1194,7 +1198,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1654,6 +1667,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/closed_loop.svg'
     }//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1666,6 +1697,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{

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

@@ -25,19 +25,28 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+    <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="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Sensor">
-          <element name="sensor">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
-            <element name="extractor_url" rngui:label="Extractor Url">
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='code'>Code</value>
+                <value id='service'>Service</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_params" rngui:label="Extractor Arguments:">
-              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+            <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"/>
@@ -48,7 +57,7 @@
               <data type="string" rngui:label="Service Url"/>
             </element>
             <element name="visualizer_params" rngui:label="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+              <zeroOrMore rngui:label="Create Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>

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

@@ -25,19 +25,28 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+    <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="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Sensor">
-          <element name="sensor">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
-            <element name="extractor_url" rngui:label="Extractor Url">
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='code'>Code</value>
+                <value id='service'>Service</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_params" rngui:label="Extractor Arguments:">
-              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+            <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"/>
@@ -47,8 +56,8 @@
             <element name="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="visualizer_params" rngui:header="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+            <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"/>

data/cockpit/themes/default/rngs/parallel.rng

@@ -2,6 +2,12 @@
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>
+  <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
+    <choice>
+      <value id='last'>After Last Task in Branch</value>
+      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+    </choice>
+  </attribute>
   <element rngui:ignore="true" name="parallel_branch">
     <attribute name="pass">
       <data type="string"/>

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

@@ -0,0 +1,83 @@
+<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="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All changes to data elements in the process 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 individual tasks to define more restricted data probes.">
+
+    <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+      <zeroOrMore rngui:label="Add Probe">
+        <element name="probe">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_type" rngui:label="Extractor Type">
+            <choice>
+              <value id='code'>Code</value>
+              <value id='service'>Service</value>
+            </choice>
+          </element>
+          <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic data'>
+            <text rngui:label="Code"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For intrinsic &amp; discrete 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="aggregator_url" rngui:label="Aggregator Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                    </element>
+                  </zeroOrMore>
+                </element>
+                <element name="aggregator_url" rngui:label="Impact Function Url">
+                  <data type="string" rngui:label="Service Url + Parameters"/>
+                </element>
+              </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/default/symbols/parallel_branch_event.svg

@@ -1,8 +1,8 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
 
-  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
-  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill 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"/>

data/cockpit/themes/default/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="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <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"/>
+</svg>
+

data/cockpit/themes/default/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="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <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/default/symbols/start.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline hfill rfill stand"/>
 </svg>

data/cockpit/themes/default/theme.js

@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -849,7 +853,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1142,7 +1155,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'svg': self.adaptor.theme_dir + 'symbols/start.svg'
     },//}}}
-    'description': null,
+    'description': self.adaptor.theme_dir + 'rngs/start.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
@@ -1276,6 +1289,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1288,6 +1319,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{

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

@@ -25,19 +25,28 @@
         </element>
       </zeroOrMore>
     </element>
-    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+    <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="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Sensor">
-          <element name="sensor">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
-            <element name="extractor_url" rngui:label="Extractor Url">
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='code'>Code</value>
+                <value id='service'>Service</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_params" rngui:label="Extractor Arguments:">
-              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+            <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"/>
@@ -48,7 +57,7 @@
               <data type="string" rngui:label="Service Url"/>
             </element>
             <element name="visualizer_params" rngui:label="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+              <zeroOrMore rngui:label="Create Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>