cpee 1.5.19 → 1.5.20

data/cockpit/themes/extended/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="hfill rfill cline stand"/>
+  <text transform="translate(15,21)" class="normal">s</text>
+</svg>

data/cockpit/themes/extended/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="stand"/>
+</svg>

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

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="hfill rfill cline 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/extended/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/extended/theme.js

@@ -132,6 +132,13 @@ function WFAdaptorManifestation(adaptor) {
           menu['Insert into'] = group;
           copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
         }
+        if (self.elements[xml_node.get(0).tagName].permissible_children_expert) {
+          group = self.elements[xml_node.get(0).tagName].permissible_children_expert(xml_node,'into');
+          if(group.length > 0) {
+            menu['Insert into (Experts Only!)'] = group;
+            copyOrMove(menu['Insert into (Experts Only!)'],group,xml_node,self.adaptor.description.insert_first_into);
+          }
+        }
       }
       if (sibling) {
         group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
@@ -139,6 +146,13 @@ function WFAdaptorManifestation(adaptor) {
           menu['Insert after'] = group;
           copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
         }
+        if (self.elements[xml_node.parent().get(0).tagName].permissible_children_expert) {
+          group = self.elements[xml_node.parent().get(0).tagName].permissible_children_expert(xml_node,'after');
+          if(group.length > 0) {
+            menu['Insert after (Experts Only!)'] = group;
+            copyOrMove(menu['Insert after (Experts Only!)'],group,xml_node,self.adaptor.description.insert_after);
+          }
+        }
       }
 
       if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
@@ -146,10 +160,10 @@ function WFAdaptorManifestation(adaptor) {
         icon.children('.rfill').addClass('menu');
         menu['Delete'] = [{
           'label': 'Remove Element',
-          'function_call': self.adaptor.description.remove,
+          'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
           'menu_icon': icon,
           'type': undefined,
-          'params': [null, xml_node]
+          'params': [null, xml_node, self.selected()]
         }];
       }
       if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
@@ -854,6 +868,19 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
+      var childs =  [
+        {'label': 'Parallel Branch',
+         'function_call': func,
+         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'type': 'parallel_branch',
+         'params': [self.adaptor.description.elements.parallel_branch, node]},
+      ];
+      return childs;
+    }, //}}}
+    'permissible_children_expert': function(node,mode) { //{{{
+      var func = null;
+      if (mode.match(/into/)) { func = self.adaptor.description.insert_first_into }
+      else { func = self.adaptor.description.insert_after }
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': func,
@@ -880,11 +907,6 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Parallel Branch',
-         'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
-         'type': 'parallel_branch',
-         'params': [self.adaptor.description.elements.parallel_branch, node]},
         {'label': 'Stop',
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
@@ -995,12 +1017,7 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        var xml_node = self.adaptor.description.get_node_by_svg_id(node);
-        if(xml_node.get(0).parentNode.tagName == 'parallel') {
-          self.events.mousedown(node,e,true,false);
-        } else {
-          self.events.mousedown(node,e,true,true);
-        }
+        self.events.mousedown(node,e,true,true);
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -1174,11 +1191,6 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Terminate',
-         'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
-         'type': 'terminate',
-         'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),

data/cockpit/themes/labels/rngs/alternative.rng

@@ -0,0 +1,25 @@
+<element rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label='Min in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label='Max in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label='Avg in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,81 @@
+<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="endpoint" rngui:label="Endpoint">
+    <data type="string"/>
+  </attribute>
+  <element name='parameters' rngui:header="Parameters">
+    <element name="label" rngui:label="Label">
+      <data type="string" rngui:label="Short description of the task"/>
+    </element>
+    <element name="method" rngui:label="Method">
+      <choice>
+        <value>:post</value>
+        <value>:get</value>
+        <value>:put</value>
+        <value>:delete</value>
+      </choice>
+    </element>
+    <element name="arguments" rngui:header="Arguments">
+      <zeroOrMore rngui:label="Create Argument Pair">
+        <element rngui:label='Name' rngui:labeltype='xml'>
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="sensors" rngui:header="Sensors">
+      <zeroOrMore rngui:label="Add Sensor">
+        <element name="sensor">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="extractor_arg" rngui:label="Extractor Argument">
+            <data type="string" rngui:label="Path"/>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <zeroOrMore rngui:label="Create Argument Pair">
+              <element rngui:label='Name'>
+                <anyName/>
+                <data type="string" rngui:label="Value"/>
+              </element>
+            </zeroOrMore>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+  <element name="_timing" rngui:header="Timing">
+    <element name="_timing_min" rngui:label='Min in min'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_max" rngui:label='Max in min'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_avg" rngui:label='Avg in min'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+  </element>
+  <element name="_notes" rngui:header="Notes">
+    <element name="_notes_general" rngui:label='General'>
+      <text rngui:wrap='true' rngui:label='Notes'/>
+    </element>
+    <element name="_attachments">
+      <zeroOrMore rngui:label="Create Attachment">
+        <element name='_attachment' rngui:label='Attachment'>
+          <attribute name="label" rngui:label="Note">
+            <data type="string"/>
+          </attribute>
+          <data type="string" rngui:label="Url"/>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,101 @@
+<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="endpoint" rngui:label="Endpoint">
+    <data type="string"/>
+  </attribute>
+  <element name='parameters' rngui:header="Parameters">
+    <element name="label" rngui:label="Label">
+      <data type="string" rngui:label="Short description of the task"/>
+    </element>
+    <element name="method" rngui:label="Method">
+      <choice>
+        <value>:post</value>
+        <value>:get</value>
+        <value>:put</value>
+        <value>:delete</value>
+      </choice>
+    </element>
+    <element name="arguments" rngui:header="Arguments">
+      <zeroOrMore rngui:label="Create Argument Pair">
+        <element rngui:label='Name' rngui:labeltype='xml'>
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="sensors" rngui:header="Sensors">
+      <zeroOrMore rngui:label="Add Sensor">
+        <element name="sensor">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="extractor_arg" rngui:label="Extractor Argument">
+            <data type="string" rngui:label="Path"/>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <zeroOrMore rngui:label="Create Argument Pair">
+              <element rngui:label='Name'>
+                <anyName/>
+                <data type="string" rngui:label="Value"/>
+              </element>
+            </zeroOrMore>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+  <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
+    <element name="url" rngui:label='HTML Snippet'>
+      <data type="string" rngui:label="url to report snippet"/>
+    </element>
+  </element>
+  <element name="finalize" rngui:header="Finalize" rngui:label="Code">
+    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+    <text rngui:label='Script that is executed, when a service returns data'/>
+  </element>
+  <element name="update" rngui:header="Update" rngui:label="Code">
+    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+    <text rngui:label='Script that is executed, when a service sends intermediate data'/>
+  </element>
+  <element name="_timing" rngui:header="Timing">
+    <element name="_timing_min" rngui:label='Min in min'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_max" rngui:label='Max in min'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+    <element name="_timing_avg" rngui:label='Avg in min'>
+      <data type='float' rngui:label='Minutes'/>
+    </element>
+  </element>
+  <element name="_notes" rngui:header="Notes">
+    <element name="_notes_general" rngui:label='General'>
+      <text rngui:wrap='true' rngui:label='Notes'/>
+    </element>
+    <element name="_notes_output" rngui:label='Output'>
+      <text rngui:wrap='true' rngui:label='Notes'/>
+    </element>
+    <element name="_attachments">
+      <zeroOrMore rngui:label="Create Attachment">
+        <element name='_attachment' rngui:label='Attachment'>
+          <attribute name="label" rngui:label="Note">
+            <data type="string"/>
+          </attribute>
+          <data type="string" rngui:label="Url"/>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,12 @@
+<element rngui:version="1.2" name="choose" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="mode" rngui:label="Mode" rngui:default="exclusive">
+    <choice>
+      <value>exclusive</value>
+      <value>inclusive</value>
+    </choice>
+  </attribute>
+  <element rngui:ignore="true" name="alternative">
+    <attribute name="condition"><data type="string"/></attribute>
+  </element>
+  <element rngui:ignore="true" name="otherwise"/>
+</element>

data/cockpit/themes/labels/rngs/critical.rng

@@ -0,0 +1,5 @@
+<element rngui:version="1.2" name="critical" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="sid" rngui:label="SID" rngui:default="section" rngui:hint="Identical SID's shared by between differnt 'critical' elements define mutual exclusive areas.">
+    <data type="string"/>
+  </attribute>
+</element>

data/cockpit/themes/labels/rngs/escape.rng

@@ -0,0 +1 @@
+<element rngui:version="1.2" name="escape" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org"/>

data/cockpit/themes/labels/rngs/finalize.rng

@@ -0,0 +1,6 @@
+<element name="finalize" rngui:version="1.2" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <text rngui:label='Script that is executed, when a service returns data'/>
+</element>

data/cockpit/themes/labels/rngs/group.rng

@@ -0,0 +1,3 @@
+<element name="group" rngui:version="1.2" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <text rngui:label='A group of tasks, that belongs together'/>
+</element>

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

@@ -0,0 +1,22 @@
+<element rngui:version="1.2" name="loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="mode" rngui:label="Mode" rngui:default="pre_test">
+    <choice>
+      <value>pre_test</value>
+      <value>post_test</value>
+    </choice>
+  </attribute>
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label='Min times'>
+      <data type='nonNegativeInteger' rngui:label='Times'/>
+    </element>
+    <element name="_probability_max" rngui:label='Max times'>
+      <data type='nonNegativeInteger' rngui:label='Times'/>
+    </element>
+    <element name="_probability_avg" rngui:label='Avg times'>
+      <data type='nonNegativeInteger' rngui:label='Times'/>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,9 @@
+<element rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="label" rngui:label="Label">
+    <data type="string" rngui:label="Short description of the task"/>
+  </attribute>
+  <text rngui:label='Script that is executed'/>
+</element>

data/cockpit/themes/labels/rngs/otherwise.rng

@@ -0,0 +1,22 @@
+<element rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label='Min in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label='Max in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label='Avg in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,13 @@
+<element rngui:version="1.2" name="parallel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
+    <data type="integer"/>
+  </attribute>
+  <element rngui:ignore="true" name="parallel_branch">
+    <attribute name="pass"><data type="string"/></attribute>
+    <attribute name="local"><data type="string"/></attribute>
+  </element>
+  <element rngui:ignore="true" name="parallel_branch">
+    <attribute name="pass"><data type="string"/></attribute>
+    <attribute name="local"><data type="string"/></attribute>
+  </element>
+</element>

data/cockpit/themes/labels/rngs/parallel_branch.rng

@@ -0,0 +1,8 @@
+<element rngui:version="1.2" name="parallel_branch" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="pass" rngui:label="Pass to branch">
+    <data type="string" rngui:label="Data element passed to the local scope, thus not affected by global changes ..."/>
+  </attribute>
+  <attribute name="local" rngui:label="Local scope">
+    <data type="string" rngui:label="Name of the passed data element in the local scope ..."/>
+  </attribute>
+</element>