cpee 1.5.16 → 1.5.21

data/cockpit/themes/default/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($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
@@ -538,7 +552,7 @@ function WFAdaptorManifestation(adaptor) {
       var childs = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -578,13 +592,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -625,7 +644,7 @@ function WFAdaptorManifestation(adaptor) {
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -665,13 +684,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -717,7 +741,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Manipulate',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -741,13 +765,17 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
       if(node.parent('parallel').length > node.parent('parallel_branch').length) {
         childs.push({'label': 'Parallel Branch',
                      'function_call': func,
@@ -796,6 +824,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,
@@ -807,7 +848,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Manipulate',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -822,11 +863,11 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Parallel Branch',
+        {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
-         'type': 'parallel_branch',
-         'params': [self.adaptor.description.elements.parallel_branch, node]}
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
       if(node.get(0).tagName != 'parallel')
         childs.push({'label': 'Parallel',
@@ -872,10 +913,9 @@ function WFAdaptorManifestation(adaptor) {
     'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
-      var childs = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      childs =  [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -920,7 +960,7 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
          'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
+         'params': [self.adaptor.description.elements.critical, node]}
       ];
       if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
         return [{'label': 'Alternative',
@@ -933,12 +973,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,
@@ -965,7 +1000,7 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1005,13 +1040,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -1075,7 +1115,7 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1086,7 +1126,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Script Task',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -1106,22 +1146,22 @@ 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(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {

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

@@ -0,0 +1 @@
+../../default/rngs/alternative.rng

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

@@ -0,0 +1,111 @@
+<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="Properties">
+    <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="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+        <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="Service Url"/>
+            </element>
+            <element name="extractor_arg" rngui:label="Extractor Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+            <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 rngui:label='Name'>
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Aggregator">
+          <element name="aggregator">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="aggregator_url" rngui:label="Aggregator Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="aggregator_arg" rngui:label="Aggregator Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="costs" rngui:header="Costs" rngui:fold="closed">
+        <zeroOrMore rngui:label="Create Cost Factor">
+          <element name='cost_factor'>
+            <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="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vfunc_arg" rngui:label="Violation Function Argument">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vcost" rngui:label="Violation Cost">
+              <data type="string" rngui:label="Value"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+    </element>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <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" rngui:fold="closed">
+      <element name="_notes_general" rngui:label='General'>
+        <text rngui:wrap='true' rngui:label='Notes'/>
+      </element>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,134 @@
+<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="Properties">
+    <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="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+        <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="Service Url"/>
+            </element>
+            <element name="extractor_arg" rngui:label="Extractor Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+            <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 rngui:label='Name'>
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Aggregator">
+          <element name="aggregator">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="aggregator_url" rngui:label="Aggregator Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="aggregator_arg" rngui:label="Aggregator Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="costs" rngui:header="Costs" rngui:fold="closed">
+        <zeroOrMore rngui:label="Create Cost Factor">
+          <element name='cost_factor'>
+            <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="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vfunc_arg" rngui:label="Violation Function Argument">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vcost" rngui:label="Violation Cost">
+              <data type="string" rngui:label="Value"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+    </element>
+  </element>
+  <element name="code" rngui:header="Implementation">
+    <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>
+    <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold='closed_conditional'>
+      <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" rngui:fold='closed_conditional'>
+      <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="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold='closed_conditional'>
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label='Script that is executed, if a service call fails'/>
+    </element>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <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" rngui:fold="closed">
+      <element name="_notes_general" rngui:label='General'>
+        <text rngui:wrap='true' rngui:label='Notes'/>
+      </element>
+    </element>
+  </element>
+</element>