cpee 1.5.24 → 2.0.1

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

@@ -0,0 +1,9 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" 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>
+  <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/extended/rngs/otherwise.rng

@@ -0,0 +1,22 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <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/extended/rngs/parallel.rng

@@ -0,0 +1,21 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <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/extended/rngs/parallel_branch.rng

@@ -0,0 +1,8 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel_branch" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <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>

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

@@ -1,24 +1,23 @@
-<element rngui:version="1.2" name="code" rngui:header="Implementation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <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 xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="code" rngui:header="Implementation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <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'>
+  <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'/>
+    <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'>
+  <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'/>
+    <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'>
+  <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'/>
+    <text rngui:label="Script that is executed, if a service call fails"/>
   </element>
-</element>
-
+</element>

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

@@ -0,0 +1,5 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="stop" 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>

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

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

data/cockpit/themes/extended/theme.js

@@ -15,11 +15,7 @@ function WFAdaptorManifestation(adaptor) {
       $('#relaxngworker').empty();
       var rngw = new RelaxNGui(base,$('#relaxngworker'),self.adaptor.description.context_eval);
       var nnew = $(rngw.save().documentElement);
-          nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
-      var ntxt = nnew.serializeXML();
-      ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
-
-      return($X(ntxt));
+      return(nnew);
     } else {
       if (opts && opts == 'clone') {
         base = base.clone();
@@ -65,11 +61,16 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
-      save['details'].content(node);
+      var nn = $X($(node).serializeXML());
+          nn.removeAttr('svg-id');
+          nn.removeAttr('svg-type');
+          nn.removeAttr('svg-subtype');
+          nn.removeAttr('svg-label');
+      save['details'].content(nn);
       format_visual_forms();
     }
   }; //}}}
@@ -264,33 +265,18 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var rep = $('body').attr('current-resources');
         var ep = self.endpoints[$(node).attr('endpoint')];
-        var avg = $('_timing_avg',$(node).children('annotations')).text();
+        var wait = $('_timing_wait',$(node).children('annotations')).text();
+        var threshold = $('_timing_threshold',$(node).children('annotations')).text();
         var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
         var ret = [ { column: 'ID', value: $(node).attr('id') } ];
         if (lab != '') {
           ret.unshift( { column: 'Label', value: lab } );
         }
-        if (ep != undefined) {
-          var lnd = $(node).attr('endpoint');
-          ret.push({ column: 'Resource', value: lnd });
-          if (save['endpoints_cache'][lnd] && save['endpoints_cache'][lnd].properties) {
-            var prop = save['endpoints_cache'][lnd].properties;
-            if (prop.resource) {
-              if (prop.resource == 'exclusive' && prop.lock) {
-                ret.push({ column: 'RP', value: prop.resource + ' (' + prop.lock + ')' });
-              } else {
-                ret.push({ column: 'RP', value: prop.resource });
-              }
-            }
-            if (prop.alternatives) {
-              ret.push({ column: 'R#', value: prop.alternatives.length + 1});
-            } else {
-              ret.push({ column: 'R#', value: '1' });
-            }
-          }
+        if (wait != '') {
+          ret.push({ column: 'Wait', value: 'ω = ' + wait });
         }
-        if (avg != '') {
-          ret.push({ column: 'Average', value: avg + 'min' });
+        if (threshold != '') {
+          ret.push({ column: 'Threshold', value: 'κ = ' + threshold });
         }
         return ret;
       },

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

@@ -1 +1 @@
-../../default/rngs/alternative.rng
+../../preset/rngs/alternative.rng

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

@@ -1,4 +1,4 @@
-<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">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="call" 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>
@@ -10,53 +10,53 @@
       <value id="subprocess">Subprocess</value>
     </choice>
   </attribute>
-  <element name='parameters' rngui:header="Properties">
+  <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="arguments"/>
     <element name="input" rngui:header="Input Arguments">
       <zeroOrMore rngui:label="Create Argument">
-        <element name='item' rngui:label='Description'>
+        <element name="item" rngui:label="Description">
           <attribute name="label" rngui:label="Name">
             <data type="string"/>
           </attribute>
-          <text rngui:wrap='true' rngui:label='What does it do?'/>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
         </element>
       </zeroOrMore>
     </element>
     <element name="output" rngui:header="Output Elements">
       <zeroOrMore rngui:label="Create Element">
-        <element name='item' rngui:label='Description'>
+        <element name="item" rngui:label="Description">
           <attribute name="label" rngui:label="Name">
             <data type="string"/>
           </attribute>
-          <text rngui:wrap='true' rngui:label='What does it do?'/>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
         </element>
       </zeroOrMore>
     </element>
   </element>
   <element name="implementation" rngui:header="Implementation">
     <element name="description" rngui:label="Description">
-      <text rngui:wrap='true' rngui:label='What is supposed to happen?'/>
+      <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
     </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 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 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 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 name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
       </element>
     </element>
   </element>
-</element>
+</element>

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

@@ -1,4 +1,4 @@
-<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">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="call" 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>
@@ -10,58 +10,58 @@
       <value id="subprocess">Subprocess</value>
     </choice>
   </attribute>
-  <element name='parameters' rngui:header="Properties">
+  <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="arguments"/>
     <element name="input" rngui:header="Input Arguments">
       <zeroOrMore rngui:label="Create Argument">
-        <element name='item' rngui:label='Description'>
+        <element name="item" rngui:label="Description">
           <attribute name="label" rngui:label="Name">
             <data type="string"/>
           </attribute>
-          <text rngui:wrap='true' rngui:label='What does it do?'/>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
         </element>
       </zeroOrMore>
     </element>
     <element name="output" rngui:header="Output Elements">
       <zeroOrMore rngui:label="Create Element">
-        <element name='item' rngui:label='Description'>
+        <element name="item" rngui:label="Description">
           <attribute name="label" rngui:label="Name">
             <data type="string"/>
           </attribute>
-          <text rngui:wrap='true' rngui:label='What does it do?'/>
+          <text rngui:wrap="true" rngui:label="What does it do?"/>
         </element>
       </zeroOrMore>
     </element>
   </element>
   <element name="implementation" rngui:header="Implementation">
     <element name="description" rngui:label="Description">
-      <text rngui:wrap='true' rngui:label='What is supposed to happen?'/>
+      <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
     </element>
   </element>
   <element name="code" rngui:header="Output Transformation">
     <element name="description" rngui:label="Description">
-      <text rngui:wrap='true' rngui:label='Which output elements are important? How to transform them?'/>
+      <text rngui:wrap="true" rngui:label="Which output elements are important? How to transform them?"/>
     </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 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 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 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 name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
       </element>
     </element>
   </element>
-</element>
+</element>

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

@@ -1 +1 @@
-../../default/rngs/choose.rng
+../../preset/rngs/choose.rng

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

@@ -1 +1 @@
-../../default/rngs/critical.rng
+../../preset/rngs/critical.rng

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

@@ -1 +1 @@
-../../default/rngs/escape.rng
+../../preset/rngs/escape.rng

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

@@ -1 +1 @@
-../../default/rngs/group.rng
+../../preset/rngs/group.rng

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

@@ -1 +1 @@
-../../default/rngs/loop.rng
+../../preset/rngs/loop.rng

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

@@ -1 +1 @@
-../../default/rngs/manipulate.rng
+../../preset/rngs/manipulate.rng

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

@@ -1 +1 @@
-../../default/rngs/otherwise.rng
+../../preset/rngs/otherwise.rng

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

@@ -1 +1 @@
-../../default/rngs/parallel.rng
+../../preset/rngs/parallel.rng

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

@@ -1 +1 @@
-../../default/rngs/parallel_branch.rng
+../../preset/rngs/parallel_branch.rng

data/cockpit/themes/model/rngs/scripts.rng

@@ -1,8 +1,7 @@
-<element rngui:version="1.2" name="code" rngui:header="Output Transformation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="code" rngui:header="Output Transformation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
   <element name="code" rngui:header="Output Transformation">
     <element name="description" rngui:label="Description">
-      <text rngui:wrap='true' rngui:label='Which output elements are important? How to transform them?'/>
+      <text rngui:wrap="true" rngui:label="Which output elements are important? How to transform them?"/>
     </element>
   </element>
-</element>
-
+</element>

data/cockpit/themes/model/rngs/stop.rng

@@ -1 +1 @@
-../../default/rngs/stop.rng
+../../preset/rngs/stop.rng

data/cockpit/themes/model/rngs/terminate.rng

@@ -1 +1 @@
-../../default/rngs/terminate.rng
+../../preset/rngs/terminate.rng

data/cockpit/themes/model/theme.js

@@ -15,11 +15,7 @@ function WFAdaptorManifestation(adaptor) {
       $('#relaxngworker').empty();
       var rngw = new RelaxNGui(base,$('#relaxngworker'),self.adaptor.description.context_eval);
       var nnew = $(rngw.save().documentElement);
-          nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
-      var ntxt = nnew.serializeXML();
-      ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
-
-      return($X(ntxt));
+      return(nnew);
     } else {
       if (opts && opts == 'clone') {
         base = base.clone();
@@ -65,11 +61,16 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
-      save['details'].content(node);
+      var nn = $X($(node).serializeXML());
+          nn.removeAttr('svg-id');
+          nn.removeAttr('svg-type');
+          nn.removeAttr('svg-subtype');
+          nn.removeAttr('svg-label');
+      save['details'].content(nn);
       format_visual_forms();
     }
   }; //}}}

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

@@ -0,0 +1,25 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <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>