cpee 2.1.111 → 2.1.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2328b64e63f8cb6aa07f437e6eb74db8b887f9a19213dedca0b85a87d7ab78a9
-  data.tar.gz: e8b3d0b931d7c189c000bba2078b35f4a387e7ef256bcab8fd71d6d0253e7d60
+  metadata.gz: 3859cfffb2b5b418a0c0fdd564f305cbc7d1784292186a836e7df668f6725c49
+  data.tar.gz: e280aad1800114b180814cd041ece98c25874d3212643bd32dff908e02851113
 SHA512:
-  metadata.gz: 5cc21448cdaa794df412a1102a34a59f1d8c27cf75378596331821c0780984fe613a5214a5e854d9ae06037a8ba3260f4629fd9f66d122acdd58248fdde828cd
-  data.tar.gz: e1962692f65c3b65a3abcc195255705a630cecc53b00c33a852f5afb0bb0e9bf45add649cc63c9e1ebcba59d0bbf2391e4afbb9b9a39a9922962d5a9fb193290
+  metadata.gz: e13bcfff5e5f761ef221a3b65696d349a64eb4d350367b852b180c11521006fd17b4e111c912cea377da6a2ba6f334405394bdbd5c623d222a9642770e38a07a
+  data.tar.gz: 31ca360fae18519aa006cca38f81213a69e50ecb31b0aee2c2a11f3793ce006704b8fc0301f0c8df8ef6514aaf2a62d0a8b15efe520ee76cf05a5a87b436e316

data/cockpit/js/wfadaptor.js

@@ -14,8 +14,6 @@
   <http://www.gnu.org/licenses/>.
 */
 
-var high;
-
 // TODO: changes in svg-script:
 // 1) drawing functions
 // 2) creation of svg-container (Bug: arrows on lines)
@@ -195,6 +193,13 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
 
   this.update = function(doit){ doit(self); };
 
+  this.draw_element = function(type,id,label) {
+    let pos = {'row': 1,'col': 0};
+    let block = { 'max': {'row': pos.row, 'col': pos.col}, 'endnodes': [], 'svg': $X('<g class="group" xmlns="http://www.w3.org/2000/svg"/>') };
+    illustrator.draw.draw_symbol(type, id, label, pos.row, pos.row, pos.row, pos.col, block.svg, false, {}, {})
+    self.illustrator.set_svg(block);
+  }
+
   this.redraw = function(){
     description.redraw();
   }
@@ -282,8 +287,13 @@ function WfIllustrator(wf_adaptor) { // View  {{{
   this.set_svg = function(graph) { // {{{
     self.svg.container.append(graph.svg);
     let bb = graph.svg[0].getBBox();
+
+    let w = self.dim.get_x_plus(0,graph.max.row,graph.max.col);
+    if (w == 0) { w = bb.x + bb.width + self.width_shift; }
+    // the alternative is bb.x + bb.width + self.width_shift, but this is bad when clipped elements
+
     self.svg.container.attr('height', bb.y + bb.height + self.height_shift); // small border on the bottom
-    self.svg.container.attr('width',  bb.x + bb.width + self.width_shift);  // small border on the right
+    self.svg.container.attr('width', w);  // small border on the right
     self.svg.container.attr('data-pos-matrix', JSON.stringify(self.dim.symbols));
     self.svg.container.attr('data-con-list', JSON.stringify(self.dim.connections));
   } // }}}

data/cockpit/only_llm.html

@@ -221,8 +221,8 @@
           <div id='llm_params' class="multi">
             <label id="llmlabel" for="llms">Choose LLM:</label>
             <select name="llms" id="llms">
-              <option value="gemini-2.0-flash" selected>gemini 2 Flash</option>
-              <option value="gemini-2.5-flash-lite">gemini 2.5 Flash Lite</option>
+              <!--<option value="gemini-2.0-flash" selected>gemini 2 Flash</option>-->
+              <option value="gemini-2.5-flash-lite" selected>gemini 2.5 Flash Lite</option>
               <option value="gemini-2.5-flash">gemini 2.5 Flash</option>
               <option value="gemini-2.5-pro">gemini 2.5 Pro</option>
               <option value="gpt-4">gpt 4</option>

data/cockpit/themes/base.js

@@ -152,6 +152,21 @@ function WFAdaptorManifestationBase(adaptor) {
       }
     }
   } //}}}
+  var markHandling = this.markHandling = function(svgid) { //{{{
+    if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      var vt = vtarget.parents('g.element[element-id]');
+          vt.toggleClass('marked');
+      if (vt.hasClass('marked')) {
+        localStorage.setItem('marked',self.marked_text());
+        localStorage.setItem('marked_from',myid);
+      } else {
+        localStorage.removeItem('marked');
+        localStorage.removeItem('marked_from');
+      }
+    }
+  } //}}}
 
   var contextMenuHandling_clean_icon = this.contextMenuHandling_clean_icon = function(icon) { //{{{
     icon = icon.clone();
@@ -257,27 +272,45 @@ function WFAdaptorManifestationBase(adaptor) {
       });
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
-      var icon = contextMenuHandling_clean_icon(self.elements.call.illustrator.svg);
-      icon.find('.part-normal').addClass('passive');
+      let exec_icon = contextMenuHandling_clean_icon(self.elements.call.illustrator.svg);
+      let mark_icon = self.resources.mark;
+      exec_icon.find('.part-normal').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
           menu['Position'] = [{
-            'label': 'No Execution from here',
+            'label': 'No Execution from here (SHIFT-Click)',
             'function_call': del_ui_pos,
-            'menu_icon': icon,
+            'menu_icon': exec_icon,
             'type': undefined,
             'params': xml_node
           }];
         } else {
           menu['Position'] = [{
-            'label': 'Execute from here',
+            'label': 'Execute from here (SHIFT-Click)',
             'function_call': add_ui_pos,
-            'menu_icon': icon,
+            'menu_icon': exec_icon,
             'type': undefined,
             'params': xml_node
           }];
         }
+        if (vtarget.parents('g.element.marked').length > 0) {
+          menu['Position'].push({
+            'label': 'Unmark for copy/move (' + ($.pressCmd() ? '⌘-Click' : 'CTRL-Click') + ')',
+            'function_call': markHandling,
+            'menu_icon': mark_icon,
+            'type': undefined,
+            'params': [svgid]
+          });
+        } else {
+          menu['Position'].push({
+            'label': 'Mark for copy/move (' + ($.pressCmd() ? '⌘-Click' : 'CTRL-Click') + ')',
+            'function_call': markHandling,
+            'menu_icon': mark_icon,
+            'type': undefined,
+            'params': [svgid]
+          });
+        }
       }
     }
     new CustomMenu(e).contextmenu(menu);
@@ -314,19 +347,7 @@ function WFAdaptorManifestationBase(adaptor) {
     }
 
     if (e && (e.ctrlKey || e.metaKey)) {
-      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
-      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-      if (vtarget.length > 0) {
-        var vt = vtarget.parents('g.element[element-id]');
-            vt.toggleClass('marked');
-        if (vt.hasClass('marked')) {
-          localStorage.setItem('marked',self.marked_text());
-          localStorage.setItem('marked_from',myid);
-        } else {
-          localStorage.removeItem('marked');
-          localStorage.removeItem('marked_from');
-        }
-      }
+      markHandling(svgid);
     } else if (e && (e.shiftKey)) {
       positionHandling(svgid);
     } else {
@@ -367,6 +388,7 @@ function WFAdaptorManifestationBase(adaptor) {
   // Other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
   this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
+  this.resources.mark =  self.adaptor.theme_dir + 'symbols/mark.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

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

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/dataflow/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/default/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

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

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -186,6 +186,11 @@
         <text rngui:wrap="true" rngui:label="Notes"/>
       </element>
     </element>
+    <element name="_resources" rngui:header="Resources" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+          <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
+    </element>
   </element>
 
   <element name="documentation" rngui:header="Documentation">
@@ -215,23 +220,4 @@
       </element>
     </element>
   </element>
-  <element name="resources" rngui:header="Resources">
-    <zeroOrMore rngui:label="Create Resources">
-      <element name='resource' rngui:label="Resource" rngui:labeltype="xml">
-        <data type="string" rngui:label="Name"/>
-      </element>
-    </zeroOrMore>
-     <attribute name="allocated_to" rngui:label="allocated_to" rngui:default="not_allocated">
-        <data type="string" rngui:readonly="true"/>
-      </attribute>
-  </element>
-  <element name="expectedready" rngui:label="Expected Ready">
-    <data name="expectedready" type="decimal" rngui:readonly="true"/>
-  </element>
-  <element name="plannedstart" rngui:label="Planned Start Time">
-    <data name="plannedstart" type="decimal" rngui:readonly="true"/>
-  </element>
-  <element name="plannedend" rngui:label="Planned End Time">
-    <data name="plannedend" type="decimal" rngui:readonly="true"/>
-  </element>
 </element>

data/cockpit/themes/felix/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

data/cockpit/themes/model/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/packed/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/preset/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/presetaltid/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/presetid/symbols/mark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

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

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

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

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

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

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g class="marked">
+    <g class="markstyle" transform="translate(12,15) scale(2,2)">
+      <circle cx="2" cy="0" r="7"/>
+      <path d="m -1 0 l 2 2 l 4 -4" class="standline"/>
+    </g>
+  </g>
+</svg>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.111"
+  s.version          = "2.1.113"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.148'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.149'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.4'
   s.add_runtime_dependency 'net-ssh', '~> 7.3'

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -123,6 +123,8 @@
           </xsl:for-each>
         </xsl:otherwise>
       </xsl:choose>
+      <xsl:text>, </xsl:text>
+      <xsl:value-of select="@abandon"/>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='stop'">

data/tools/server/resources/properties.init

@@ -26,7 +26,12 @@
   <positions/>
   <dataelements/>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <user>https-post://cpee.org/services/timeout-user.php</user>
+    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
+    <subprocess>https-post://{cpee.org}/flow/start/url/</subprocess>
+    <timeout>https-post://cpee.org/services/timeout.php</timeout>
+    <send>https-post://cpee.org/ing/correlators/message/send/</send>
+    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
   </endpoints>
   <attributes>
     <info/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.111
+  version: 2.1.113
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -34,7 +34,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.148
+        version: 1.99.149
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.148
+        version: 1.99.149
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -381,6 +381,7 @@ files:
 - cockpit/themes/control/symbols/loop.svg
 - cockpit/themes/control/symbols/loop_end.svg
 - cockpit/themes/control/symbols/manipulate.svg
+- cockpit/themes/control/symbols/mark.svg
 - cockpit/themes/control/symbols/otherwise.svg
 - cockpit/themes/control/symbols/parallel.svg
 - cockpit/themes/control/symbols/parallel_branch.svg
@@ -442,6 +443,7 @@ files:
 - cockpit/themes/dataflow/symbols/loop.svg
 - cockpit/themes/dataflow/symbols/loop_end.svg
 - cockpit/themes/dataflow/symbols/manipulate.svg
+- cockpit/themes/dataflow/symbols/mark.svg
 - cockpit/themes/dataflow/symbols/otherwise.svg
 - cockpit/themes/dataflow/symbols/parallel.svg
 - cockpit/themes/dataflow/symbols/parallel_branch.svg
@@ -503,6 +505,7 @@ files:
 - cockpit/themes/default/symbols/loop.svg
 - cockpit/themes/default/symbols/loop_end.svg
 - cockpit/themes/default/symbols/manipulate.svg
+- cockpit/themes/default/symbols/mark.svg
 - cockpit/themes/default/symbols/otherwise.svg
 - cockpit/themes/default/symbols/parallel.svg
 - cockpit/themes/default/symbols/parallel_branch.svg
@@ -564,6 +567,7 @@ files:
 - cockpit/themes/extended/symbols/loop.svg
 - cockpit/themes/extended/symbols/loop_end.svg
 - cockpit/themes/extended/symbols/manipulate.svg
+- cockpit/themes/extended/symbols/mark.svg
 - cockpit/themes/extended/symbols/otherwise.svg
 - cockpit/themes/extended/symbols/parallel.svg
 - cockpit/themes/extended/symbols/parallel_branch.svg
@@ -624,6 +628,7 @@ files:
 - cockpit/themes/felix/symbols/loop.svg
 - cockpit/themes/felix/symbols/loop_end.svg
 - cockpit/themes/felix/symbols/manipulate.svg
+- cockpit/themes/felix/symbols/mark.svg
 - cockpit/themes/felix/symbols/otherwise.svg
 - cockpit/themes/felix/symbols/parallel.svg
 - cockpit/themes/felix/symbols/parallel_branch.svg
@@ -680,6 +685,7 @@ files:
 - cockpit/themes/model/symbols/loop.svg
 - cockpit/themes/model/symbols/loop_end.svg
 - cockpit/themes/model/symbols/manipulate.svg
+- cockpit/themes/model/symbols/mark.svg
 - cockpit/themes/model/symbols/otherwise.svg
 - cockpit/themes/model/symbols/parallel.svg
 - cockpit/themes/model/symbols/parallel_branch.svg
@@ -741,6 +747,7 @@ files:
 - cockpit/themes/packed/symbols/loop.svg
 - cockpit/themes/packed/symbols/loop_end.svg
 - cockpit/themes/packed/symbols/manipulate.svg
+- cockpit/themes/packed/symbols/mark.svg
 - cockpit/themes/packed/symbols/otherwise.svg
 - cockpit/themes/packed/symbols/parallel.svg
 - cockpit/themes/packed/symbols/parallel_branch.svg
@@ -802,6 +809,7 @@ files:
 - cockpit/themes/preset/symbols/loop.svg
 - cockpit/themes/preset/symbols/loop_end.svg
 - cockpit/themes/preset/symbols/manipulate.svg
+- cockpit/themes/preset/symbols/mark.svg
 - cockpit/themes/preset/symbols/otherwise.svg
 - cockpit/themes/preset/symbols/parallel.svg
 - cockpit/themes/preset/symbols/parallel_branch.svg
@@ -863,6 +871,7 @@ files:
 - cockpit/themes/presetaltid/symbols/loop.svg
 - cockpit/themes/presetaltid/symbols/loop_end.svg
 - cockpit/themes/presetaltid/symbols/manipulate.svg
+- cockpit/themes/presetaltid/symbols/mark.svg
 - cockpit/themes/presetaltid/symbols/otherwise.svg
 - cockpit/themes/presetaltid/symbols/parallel.svg
 - cockpit/themes/presetaltid/symbols/parallel_branch.svg
@@ -924,6 +933,7 @@ files:
 - cockpit/themes/presetid/symbols/loop.svg
 - cockpit/themes/presetid/symbols/loop_end.svg
 - cockpit/themes/presetid/symbols/manipulate.svg
+- cockpit/themes/presetid/symbols/mark.svg
 - cockpit/themes/presetid/symbols/otherwise.svg
 - cockpit/themes/presetid/symbols/parallel.svg
 - cockpit/themes/presetid/symbols/parallel_branch.svg
@@ -985,6 +995,7 @@ files:
 - cockpit/themes/reduced/symbols/loop.svg
 - cockpit/themes/reduced/symbols/loop_end.svg
 - cockpit/themes/reduced/symbols/manipulate.svg
+- cockpit/themes/reduced/symbols/mark.svg
 - cockpit/themes/reduced/symbols/otherwise.svg
 - cockpit/themes/reduced/symbols/parallel.svg
 - cockpit/themes/reduced/symbols/parallel_branch.svg