cpee 2.1.6 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a2b6910315c8913216a368e40556013da8a33e5887adb75729a52ead89daba
-  data.tar.gz: 93b34b46c2e9db0586ce251a51e388f668b128cf497cb1ba95920cbe5424e09b
+  metadata.gz: efeba53ef2a09db39df28177cc7238d5df7c14277815e0a3f79ada2f7860222d
+  data.tar.gz: 8dd7c732a2067bc8e98ca9c71282baeb76d1e429f66b232cf6f24eccddf188ea
 SHA512:
-  metadata.gz: f6ed4c4157ebb113589f14c1ab020c4199b30b3e673547b48522cf7cc901a4cbfb70b3ffeb7c21f942df2e151d474a5f7662f64ed1fff4ac60005424e403e83f
-  data.tar.gz: 87d605938e321c920c969aaf525e6fb7213e9eeef18ef99884175e5d75d14e25f793f1953d55b79dccce61e8270c5d222061c9d10c75fc18d4af9df3726df23d
+  metadata.gz: e04e0dc7f1c15874fafb119045594a564c5f956a3609800d7c18717a9e8da5365d86db978c72404c231b2a32421da5f1f8d03a6ae5a516aea7fcb8ba06ee619c
+  data.tar.gz: 5d629666c2a58c1f1545b8222b243ab5f05ca9cc30629979daaa1a286188270d3699ea195176e943fc2cb45ca2a9fd28f350b9ca663fbdfa924f335a539a59f1

data/cockpit/css/ui.css

@@ -135,7 +135,7 @@ ui-tabbed ui-tabbar ui-behind button {
 #areainstance div.section              { vertical-align: middle; height: 100%; }
 #areainstance div.section:nth-child(1) { flex: 0 0 auto;                                                  padding: 0 0.5em 0 0; white-space: nowrap; }
 #areainstance div.section:nth-child(2) { flex: 0 0 auto; border-left: 1px solid var(--x-ui-border-color); padding: 0 0.5em;     white-space: nowrap; }
-#areainstance div.section:nth-child(3) { flex: 1 1 auto; border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; white-space: nowrap; }
+#areainstance div.section:nth-child(3) { flex: 1 1 auto; border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; }
 
 #areainstance div.section:nth-child(1) > div:nth-child(2)             { white-space: normal; text-align: right; }
 
@@ -148,12 +148,11 @@ ui-tabbed ui-tabbar ui-behind button {
 
 #areainstance div.section:nth-child(2) button                       { white-space: normal; width: 6em; height: 5.7em; vertical-align: middle; margin: 0; padding: 0; }
 
-#areainstance div.section:nth-child(3)                                { overflow-y: scroll; }
-#areainstance div.section:nth-child(3) strong                         { margin:0; padding:0; white-space: normal; font-size: 1em; }
-#areainstance div.section:nth-child(3) > div:not(:first-child)        { padding-top: 0.5em; }
-#areainstance div.section:nth-child(3) > div                          { padding-bottom: 0.2em; }
+#areainstance div.section:nth-child(3)                                { overflow-y: scroll; overflow-x: hidden; display: flex; flex-direction: column; flex-wrap: wrap; justify-content: flex-start; align-content: flex-start; }
+#areainstance div.section:nth-child(3) strong                         { margin:0; padding:0; white-space: normal; font-size: 0.7em; }
+#areainstance div.section:nth-child(3) > div                          { padding-bottom: 0.2em; flex: 0 0 auto; padding-right: 1em; }
 #areainstance div.section:nth-child(3) select                         { margin-left: 1em;  }
-#areainstance div.section:nth-child(3) div.additional                 { margin-left: 1em;  }
+#areainstance div.section:nth-child(3) div.additional                 { margin: 0 1em; font-size: 0.9em; }
 
 #areaexecution input { padding: 0; margin:0; }
 #areaexecution table.x-ui-compact { width: 100%; }

data/cockpit/edit.html

@@ -54,6 +54,7 @@
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/edit.js"></script>
+    <script type="text/javascript" src="js/modifiers.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
     <style>
@@ -91,14 +92,13 @@
        </p>
 
        <p>
-         This demonstrator was created in Austria. All liability is excluded to the extent
+         This demonstrator is hosted in Austria. All liability is excluded to the extent
          permitted by law including any implied terms. Any interpretation of its
          content, claims or disputes (of whatever nature and not limited to contractual
          issues) shall be subject to the exclusive jurisdiction of the Austrian Courts
          under Austrian law.
        </p>
 
-
        <p>
          All actions performed while using this demonstrator will be logged, including
          the IP address of the user.
@@ -166,7 +166,7 @@
               <template id="item">
                 <div>
                   <div class='title'><strong></strong></div>
-                  <div class='select'><select/></div>
+                  <div class='select'><select></select></div>
                   <div class='additional'></div>
                 </div>
               </template>

data/cockpit/graph.html

@@ -54,6 +54,7 @@
     <script type="text/javascript" src="js/instance.js"></script>
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
+    <script type="text/javascript" src="js/modifiers.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
   </head>
   <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">

data/cockpit/index.html

@@ -53,6 +53,7 @@
     <script type="text/javascript" src="js/instance.js"></script>
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
+    <script type="text/javascript" src="js/modifiers.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
     <style>
@@ -90,14 +91,13 @@
        </p>
 
        <p>
-         This demonstrator was created in Austria. All liability is excluded to the extent
+         This demonstrator is hosted in Austria. All liability is excluded to the extent
          permitted by law including any implied terms. Any interpretation of its
          content, claims or disputes (of whatever nature and not limited to contractual
          issues) shall be subject to the exclusive jurisdiction of the Austrian Courts
          under Austrian law.
        </p>
 
-
        <p>
          All actions performed while using this demonstrator will be logged, including
          the IP address of the user.
@@ -167,7 +167,7 @@
               <template id="item">
                 <div>
                   <div class='title'><strong></strong></div>
-                  <div class='select'><select/></div>
+                  <div class='select'><select></select></div>
                   <div class='additional'></div>
                 </div>
               </template>

data/cockpit/js/edit.js

@@ -4,6 +4,13 @@ document.addEventListener('graph:changed', function (e) {
 document.addEventListener('parameters:changed', function (e) {
   $("button[name=save]").prop("disabled",false);
 }, false);
+document.addEventListener('modifiers:changed', function (e) {
+  $("button[name=save]").prop("disabled",false);
+}, false);
+
+function leading_zeros(dt) {
+  return (dt < 10 ? '0' : '') + dt;
+}
 
 $(document).ready(function() {
   $("button[name=save]").click(function(){
@@ -19,7 +26,7 @@ $(document).ready(function() {
           $("button[name=save]").prop("disabled",true);
           $("#lastsavedline").removeClass('hidden');
           var dt = new Date();
-          var time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
+          var time = leading_zeros(dt.getHours()) + ":" + leading_zeros(dt.getMinutes()) + ":" + leading_zeros(dt.getSeconds());
           $("#lastsaved").text(time);
         },
         error: function() {

data/cockpit/js/instance.js

@@ -1,5 +1,5 @@
 var es;
-var suspended_monitoring = false;
+var suspended_redrawing = false;
 var myid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
 var paths = '#dat_details input, #dat_details textarea, #dat_details select, #dat_details button, #dat_details [contenteditable], #dat_dataelements input, #dat_dataelements textarea, #dat_dataelements select, #dat_dataelements button, #dat_dataelements [contenteditable], #dat_endpoints input, #dat_endpoints textarea, #dat_endpoints select, #dat_endpoints button, #dat_endpoints [contenteditable], #dat_attributes input, #dat_attributes textarea, #dat_attributes select, #dat_attributes button, #dat_attributes [contenteditable]';
 var loading = false;
@@ -13,7 +13,7 @@ var save = {};
 var node_state = {};
 
 function global_init() {
-  suspended_monitoring = false;
+  suspended_redrawing = false;
   loading = false;
   subscription = undefined;
   subscription_state = 'less';
@@ -30,6 +30,7 @@ function global_init() {
   save['instance_pos'] = [];
   save['modifiers'] = {};
   save['modifiers_active'] = {};
+  save['modifiers_additional'] = {};
   node_state = {};
 }
 
@@ -279,10 +280,8 @@ function sse() { //{{{
             break;
           case 'attributes':
             monitor_instance_values("attributes");
-            if (!suspended_monitoring) { // or else it would load twice, because dsl changes also trigger
-              if (save['graph_theme'] != data.content.values.theme) {
-                monitor_graph_change(true);
-              }
+            if (save['graph_theme'] != data.content.values.theme) {
+              monitor_graph_change(true);
             }
             break;
           case 'task':
@@ -446,7 +445,7 @@ function monitor_instance_values(val) {// {{{
         });
       } else if(val == "attributes") {
         if ($('#modifiers > div').length == 0) {
-          modifiers_display().then(modifiers_select);
+          modifiers_display().then(function(){ modifiers_select(); });
         } else {
           modifiers_select();
         }
@@ -481,7 +480,11 @@ function adaptor_update() { //{{{
   });
 } //}}}
 function adaptor_init(url,theme,dslx) { //{{{
+  // while inside and svgs are reloaded, do nothing here
+  if (suspended_redrawing) { return; }
   if (save['graph_theme'] != theme) {
+    // while inside and svgs are reloaded, do nothing here
+    suspended_redrawing = true;
     save['graph_theme'] = theme;
     save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
       manifestation.endpoints = save.endpoints_list;
@@ -569,6 +572,9 @@ function adaptor_init(url,theme,dslx) { //{{{
       adaptor_update();
       monitor_instance_pos();
       $('#dat_details').empty();
+
+      // while inside and svgs are reloaded, do nothing here
+      suspended_redrawing = false;
     });
   } else {
     save['graph_adaptor'].update(function(graphrealization){
@@ -579,7 +585,6 @@ function adaptor_init(url,theme,dslx) { //{{{
       format_instance_pos();
     });
   }
-  suspended_monitoring = false;
 } //}}}
 
 function monitor_graph_change(force) { //{{{
@@ -920,7 +925,6 @@ function save_svgfile() {// {{{
 }// }}}
 async function set_testset(testset,exec) {// {{{
   var url = $('body').attr('current-instance');
-  suspended_monitoring = true;
 
   var promises = [];
 
@@ -1371,113 +1375,6 @@ function append_to_log(what,type,message) {//{{{
   }
 }//}}}
 
-async function modifiers_display() {
-  let promises = [];
-  let rep = $('body').attr('current-resources');
-  $('#modifiers > div').remove();
-
-  promises.push(
-    $.ajax({
-      url: rep + 'modifiers/'
-    }).then(async function(res) {
-      let ipromises = [];
-      $('resource',res).each(function(_,r) {
-        ipromises.push(
-          $.ajax({
-            url: rep + 'modifiers/' + $(r).text()
-          }).then(async function(ses){
-            let clone = document.importNode(document.querySelector('#modifiers template').content,true);
-            let t = $(r).text();
-            $('> div',clone).attr('data-resource',t);
-            $('div.title *',clone).text(decodeURIComponent(t));
-
-            let cpromises = [];
-            $('resource',ses).each(function(_,s) {
-              let opt = $('<option/>');
-              opt.text(decodeURIComponent($(s).text()));
-              $('div.select select',clone).append(opt);
-
-              cpromises.push(
-                $.ajax({
-                  url: rep + 'modifiers/' + $(r).text() + '/' + $(s).text() + '/condition.json'
-                }).then(function(tes){
-                  save['modifiers'][$(r).text() + '/' + $(s).text()] = tes;
-                })
-              );
-
-            });
-            $(clone).insertBefore($('#modifiers template'));
-
-            await Promise.all(cpromises);
-          })
-        );
-      });
-      await Promise.all(ipromises);
-    })
-  );
-  await Promise.all(promises);
-}
-
-function modifiers_select(e) {
-  let atts = {}
-  let attr = save['attributes'].save();
-  $('> attributes > *',attr).each(function(_,s){
-    atts[s.nodeName] = $(s).text();
-  });
-  $('#modifiers div[data-resource]').each(function(_,r){
-    $('select option',r).each(function(_,s){
-      let where = $(r).attr('data-resource') + '/' + encodeURIComponent($(s).text());
-      let cond = save['modifiers'][where];
-      let success = true;
-      for (x in cond) {
-        if (cond[x] != atts[x]) { success = false; }
-      }
-      if (success) {
-        save['modifiers_active'][$(r).attr('data-resource')] = $(s).text();
-        $('select',r).val($(s).text());
-      }
-    });
-  });
-}
-
-function modifiers_update_patch(url,now) {
-  $.ajax({
-    url: url + '/' + now + '/patch.xml',
-    success: function(res) {
-      set_testset(res,false);
-    }
-  });
-}
-function modifiers_update_unpatch(url,last,now) {
-  $.ajax({
-    url: url + '/' + last + '/unpatch.xml',
-    success: function(res) {
-      set_testset(res,false).then(function() {
-        modifiers_update_patch(url,now);
-      });
-    },
-    error: function() {
-      modifiers_update_patch(url,now);
-    }
-  });
-}
-
-function modifiers_update(e) {
-  // when change path
-  // unpach from what changed
-  // show ui
-  let rep = $('body').attr('current-resources');
-  let top = $(e.target).parents('div[data-resource]').attr('data-resource');
-  let last = save['modifiers_active'][top];
-  let now = $(e.target).val();
-
-  if (last) {
-    modifiers_update_unpatch(rep + 'modifiers/' + top,last,now);
-  } else {
-    modifiers_update_patch(rep + 'modifiers/' + top,now);
-  }
-}
-
 function report_failure(){}
 
 function ui_pos(e,bl) {

data/cockpit/js/modifiers.js

@@ -0,0 +1,190 @@
+var modifiers_changed = new Event("modifiers:changed", {"bubbles":true, "cancelable":false});
+
+$(document).ready(function() {
+  var timer;
+
+  $(document).on('input','#modifiers div.additional input, #modifiers div.additional textarea, #modifiers div.additional [contenteditable]',function(e){
+    clearTimeout(timer);
+    timer = setTimeout(function(){ do_mod_save(e.target) }, 5000);
+  });
+  $(document).on('change','#modifiers div.additional select',function(e){
+    clearTimeout(timer);
+    do_mod_save(e.target);
+  });
+  $(document).on('blur','#modifiers div.additional input, #modifiers div.additional textarea, #modifiers div.additional [contenteditable]',function(e){
+    clearTimeout(timer);
+    do_mod_save(e.target);
+  });
+  $(document).on('keypress','#modifiers div.additional input',function(e){
+    if (e.keyCode == 13) {
+      clearTimeout(timer);
+      do_mod_save(e.target);
+    }
+  });
+  $(document).on('keypress','#modifiers div.additional [contenteditable]',function(e){
+    if (e.keyCode == 13) {
+      document.execCommand('insertText', false, '\n');
+      return false;
+    }
+  });
+  $(document).on('relaxngui_remove', '#modifiers div.additional', function(e){
+    clearTimeout(timer);
+    do_mod_save(e.target);
+  });
+  $(document).on('relaxngui_move', '#modifiers div.additional', function(e){
+    clearTimeout(timer);
+    do_mod_save(e.target);
+  });
+});
+
+function do_mod_save(target) {
+  let div = $(target).parents('div[data-resource]');
+  let top = div.attr('data-resource');
+  let doc = save['modifiers_additional'][top].save();
+  let rep = $('body').attr('current-resources');
+  let now = $('div.select select',div).val();
+
+  var tset = $X('<testset xmlns="http://cpee.org/ns/properties/2.0"/>');
+      tset.append(doc.documentElement);
+
+  set_testset(tset,false);
+  document.dispatchEvent(modifiers_changed);
+}
+
+async function modifiers_display() {
+  let promises = [];
+  let rep = $('body').attr('current-resources');
+  $('#modifiers > div').remove();
+
+  promises.push(
+    $.ajax({
+      url: rep + 'modifiers/'
+    }).then(async function(res) {
+      let ipromises = [];
+      $('resource',res).each(function(_,r) {
+        ipromises.push(
+          $.ajax({
+            url: rep + 'modifiers/' + $(r).text()
+          }).then(async function(ses){
+            let clone = document.importNode(document.querySelector('#modifiers template').content,true);
+            let t = $(r).text();
+            $('> div',clone).attr('data-resource',t);
+            $('div.title *',clone).text(decodeURIComponent(t).replace(/^\d*_?/,''));
+
+            let cpromises = [];
+            $('resource',ses).each(function(_,s) {
+              let opt = $('<option value=""/>');
+              opt.text(decodeURIComponent($(s).text()).replace(/^\d*_?/,''));
+              opt.attr('value',$(s).text());
+              $('div.select select',clone).append(opt);
+
+              cpromises.push(
+                $.ajax({
+                  url: rep + 'modifiers/' + $(r).text() + '/' + $(s).text() + '/condition.json'
+                }).then(function(tes){
+                  save['modifiers'][$(r).text() + '/' + $(s).text()] = tes;
+                })
+              );
+
+            });
+            $(clone).insertBefore($('#modifiers template'));
+
+            await Promise.all(cpromises);
+          })
+        );
+      });
+      await Promise.all(ipromises);
+    })
+  );
+  await Promise.all(promises);
+}
+
+function modifiers_display_ui(url,top,it,notchanged) {
+  if (notchanged) {
+    if (save['modifiers_additional'][top]) {
+      let attr = save['attributes'].save();
+      save['modifiers_additional'][top].content(attr);
+    }
+  } else {
+    $('#modifiers div[data-resource]').each(function(_,r){
+      if ($(r).attr('data-resource') == top) {
+        $('div.additional',r).empty();
+      }
+    });
+    $.ajax({
+      url: url + top + '/' + it + '/ui.rng',
+      success: function(rng) {
+        $('#modifiers div[data-resource]').each(function(_,r){
+          if ($(r).attr('data-resource') == top) {
+            save['modifiers_additional'][top] = new RelaxNGui(rng, $('div.additional',r));
+            let attr = save['attributes'].save();
+            save['modifiers_additional'][top].content(attr);
+          }
+        });
+      },
+      error: function() {}
+    });
+  }
+}
+
+function modifiers_select() {
+  let atts = {}
+  let attr = save['attributes'].save();
+  let rep = $('body').attr('current-resources');
+  $('> attributes > *',attr).each(function(_,s){
+    atts[s.nodeName] = $(s).text();
+  });
+  $('#modifiers div[data-resource]').each(function(_,r){
+    $('select option',r).each(function(_,s){
+      let where = $(r).attr('data-resource') + '/' + $(s).attr('value');
+      let cond = save['modifiers'][where];
+      let success = true;
+      for (x in cond) {
+        if (cond[x] != atts[x]) { success = false; }
+      }
+      if (success) {
+        let top = $(r).attr('data-resource');
+        let it = $(s).attr('value');
+        $('select',r).val(it);
+        modifiers_display_ui(rep + 'modifiers/',top,it,save['modifiers_active'][top] == it);
+        save['modifiers_active'][top] = it;
+      }
+    });
+  });
+}
+
+function modifiers_update_patch(url,top,now) {
+  $.ajax({
+    url: url + top + '/' + now + '/patch.xml',
+    success: function(res) {
+      set_testset(res,false);
+      document.dispatchEvent(modifiers_changed);
+    }
+  });
+}
+function modifiers_update_unpatch(url,top,last,now) {
+  $.ajax({
+    url: url + top + '/' + last + '/unpatch.xml',
+    success: function(res) {
+      set_testset(res,false).then(function() {
+        modifiers_update_patch(url,top,now);
+      });
+    },
+    error: function() {
+      modifiers_update_patch(url,top,now);
+    }
+  });
+}
+
+function modifiers_update(e) {
+  let rep = $('body').attr('current-resources');
+  let top = $(e.target).parents('div[data-resource]').attr('data-resource');
+  let last = save['modifiers_active'][top];
+  let now = $(e.target).val();
+
+  if (last) {
+    modifiers_update_unpatch(rep + 'modifiers/',top,last,now);
+  } else {
+    modifiers_update_patch(rep + 'modifiers/',top,now);
+  }
+}

data/cockpit/model.html

@@ -54,6 +54,7 @@
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/model.js"></script>
+    <script type="text/javascript" src="js/modifiers.js"></script>
     <script type="text/javascript" src="js/edit.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="css/model.css" type="text/css"/>
@@ -93,14 +94,13 @@
        </p>
 
        <p>
-         This demonstrator was created in Austria. All liability is excluded to the extent
+         This demonstrator is hosted in Austria. All liability is excluded to the extent
          permitted by law including any implied terms. Any interpretation of its
          content, claims or disputes (of whatever nature and not limited to contractual
          issues) shall be subject to the exclusive jurisdiction of the Austrian Courts
          under Austrian law.
        </p>
 
-
        <p>
          All actions performed while using this demonstrator will be logged, including
          the IP address of the user.

data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active

@@ -0,0 +1 @@
+https://cpee.org/flow/engine/613

data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active-uuid

@@ -0,0 +1 @@
+ffbc55c8-0759-42f8-955e-30ebf9c086a6

data/cockpit/track.html

@@ -55,6 +55,7 @@
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/track.js"></script>
+    <script type="text/javascript" src="js/modifiers.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="css/track.css" type="text/css"/>
   </head>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.6"
+  s.version          = "2.1.11"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/lib/cpee/redis.rb

@@ -33,18 +33,25 @@ module CPEE
       end
     else # we always assume file socket if redis is startet locally
       opts[:redis_dyn] = Proc.new { Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i) }
+      tried = false
       begin
         opts[:redis] = opts[:redis_dyn].call
         opts[:redis].dbsize
       rescue
-        rcmd = opts[:redis_cmd]
-        rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])
-        rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
-        rcmd.gsub! /#redis_db_name#/, opts[:redis_db_name]
-        rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
-        res = system rcmd
-        if res
+        res = unless tried
+          rcmd = opts[:redis_cmd]
+          rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])
+          rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
+          rcmd.gsub! /#redis_db_name#/, opts[:redis_db_name]
+          rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
           puts 'starting redis ... it will keep running, just to let you know ...'
+          system rcmd
+        else
+          true
+        end
+        if res
+          tried = true
+          puts 'waiting for successful start ...'
           sleep 1
           retry
         else

data/server/routing/end.pid

@@ -1 +1 @@
-742413
+42643

data/server/routing/forward-events.pid

@@ -1 +1 @@
-742401
+42631

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-742405
+42635

data/server/routing/persist.pid

@@ -1 +1 @@
-742409
+42639

data/tools/cpee

@@ -162,6 +162,7 @@ elsif command == 'archive'
     names << File.basename(p2)
   end
   names.each do |name|
+    print "Working on: " + name.to_s + "\r"
     res = Typhoeus.get(File.join(base,name.to_s,'/'))
     if res.success?
       if res.headers['Content-Type'] =~ /^(text|application)\/xml/
@@ -193,6 +194,7 @@ elsif command == 'archive'
       end
     end
   end
+  puts
 elsif command == 'abandon'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
@@ -215,6 +217,7 @@ elsif command == 'abandon'
     names << File.basename(p1)
   end
   names.each do |name|
+    print "Working on: " + name.to_s + "\r"
     res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
     if res1.success?
       if res1.response_body == 'ready' || res1.response_body == 'stopped'
@@ -222,6 +225,7 @@ elsif command == 'abandon'
       end
     end
   end
+  puts
 elsif command == 'start'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
@@ -256,7 +260,31 @@ elsif command == 'start'
     end
   end
 elsif command == 'delete!'
-  Typhoeus.delete(File.join(p1,'/'))
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1)
+  end
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    Typhoeus.delete(File.join(base,name.to_s,'/'))
+  end
+  puts
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.cp_r("#{curpath}/server/",p1)

data/tools/cpee.sic

@@ -0,0 +1,306 @@
+#!/usr/bin/ruby
+curpath = __dir__
+require 'rubygems'
+require 'optparse'
+require 'fileutils'
+require 'webrick'
+require 'typhoeus'
+require 'xml/smart'
+require 'zip'
+require 'pp'
+
+def wrap(s, width=78, indent=18)
+	lines = []
+	line, s = s[0..indent-2], s[indent..-1]
+  s.split(/\n/).each do |ss|
+    ss.split(/[ \t]+/).each do |word|
+      if line.size + word.size >= width
+        lines << line
+        line = (" " * (indent)) + word
+      else
+        line << " " << word
+      end
+    end
+    lines << line if line
+    line = (" " * (indent-1))
+  end
+	return lines.join "\n"
+end
+
+ARGV.options { |opt|
+  opt.summary_indent = ' ' * 2
+  opt.summary_width = 15
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] convert | ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
+  opt.on("Options:")
+  opt.on("--help", "-h", "This text") { puts opt; exit }
+	opt.on("")
+  opt.on(wrap("[archive DIR URL] save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200\ncpee archive ./archive http://localhost:9298/*"))
+	opt.on("")
+  opt.on(wrap("[abandon URL]     running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
+	opt.on("")
+  opt.on(wrap("[start URL]       stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1\ncpee start http://localhost:9298/1-200\ncpee start http://localhost:9298/*"))
+	opt.on("")
+  opt.on(wrap("[delete! URL]     DANGER ZONE. Vanishes forever. Not in archive. Examples:\ncpee delete! http://localhost:9298/1/"))
+	opt.on("")
+  opt.on(wrap("[new DIR]         scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
+	opt.on("")
+  opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
+	opt.on("")
+  opt.on(wrap("[ui]              starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
+	opt.on("")
+  opt.on(wrap("[convert]         converts all testsets in the current directory to cpee2"))
+  opt.parse!
+}
+if (ARGV.length == 0) ||
+   (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
+   (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
+   (ARGV.length == 3  && ARGV[0] != 'archive') ||
+   (ARGV.length >  3)
+  puts ARGV.options
+  exit
+end
+command = ARGV[0]
+p1      = ARGV[1]
+p2      = ARGV[2]
+cockpit = "#{curpath}/../cockpit/"
+
+def js_libs(cockpit)
+  res = Typhoeus.get('https://cpee.org/js_libs/js_libs.zip')
+  if res.success?
+    File.write(File.join(cockpit,'js_libs.zip'),res.response_body)
+    Zip::File.open(File.join(cockpit,'js_libs.zip')) do |zip_file|
+      zip_file.each do |entry|
+        case entry.ftype
+          when :directory
+            Dir.mkdir(File.join(cockpit,entry.name)) rescue nil
+          when :file
+            File.write(File.join(cockpit,entry.name),entry.get_input_stream.read)
+          when :symlink
+            FileUtils.ln_s(File.join('.',entry.get_input_stream.read),File.join(cockpit,entry.name), force: true)
+        end
+      end
+    end
+    true
+  else
+    puts 'Internet access required to download javascript libs from "http://cpee.org/js_libs/js_libs.zip".'
+    false
+  end
+end
+
+if command == 'ui'
+  if js_libs(cockpit)
+    s = WEBrick::HTTPServer.new(:Port => 8080,  :DocumentRoot => cockpit)
+    trap("INT"){ s.shutdown }
+    s.start
+  end
+elsif command == 'cpui'
+    if !File.exists?(p1)
+      FileUtils.cp_r(cockpit,p1)
+    else
+      FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')),p1,remove_destination: true)
+      puts "Directory already exists, updating ..."
+    end
+    js_libs(p1)
+elsif command == 'convert'
+  Dir['*.xml'].each do |f|
+    XML::Smart.modify(f) do |doc|
+      doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+      doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
+      doc.register_namespace 'x', 'http://cpee.org/ns/properties/2.0'
+      if doc.root.qname.name == 'testset'
+        doc.root.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
+        doc.root.namespace = nil
+
+        doc.find('//x:handlerwrapper').each do |e|
+          if e.text == 'DefaultHandlerWrapper'
+            doc.root.prepend('x:executionhandler','ruby')
+          end
+        end rescue nil
+        doc.find('//x:handlerwrapper').delete_all!
+        doc.find('//x:start_url').each do |e|
+          e.text = 'https://cpee.org/flow/start/url/'
+        end rescue nil
+        doc.find('//x:start_git').each do |e|
+          e.text = 'https://cpee.org/flow/start/git/'
+        end rescue nil
+        doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
+          if e.parent.qname.name != 'code'
+            n = e.parent
+            if (x = n.find('d:code')).any?
+              x.first.add(e)
+            else
+              n.add('d:code').add(e)
+            end
+          end
+        end rescue nil
+
+        doc.find('//p:*').each do |e|
+          e.namespaces.delete_all!
+        end rescue nil
+      end
+    end
+  end
+elsif command == 'archive'
+  p2 = File.join(p2,'*') if p2 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p2)
+  names = []
+  if File.basename(p2) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p2) == '*'
+    res = Typhoeus.get(File.join(base,'/'))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p2)
+  end
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    res = Typhoeus.get(File.join(base,name.to_s,'/'))
+    if res.success?
+      if res.headers['Content-Type'] =~ /^(text|application)\/xml/
+        XML::Smart.string(res.response_body) do |doc|
+          if doc.root.qname.to_s == "instances"
+            doc.root.children.each do |i|
+              if ["finished","abandoned"].include?(i.attributes['state']) || (["ready"].include?(i.attributes['state']) && Time.parse(i.attributes['changed']).to_i < Time.now-(60*60*24))
+                prop = Typhoeus.get(File.join(base,name.to_s,i.attributes['id'],'properties','/'))
+                if prop.success?
+                  File.write(File.join(p1,i.attributes['uuid'] + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
+                  Typhoeus.delete(File.join(base,name.to_s,i.attributes['id'],'/'))
+                end
+              end
+            end
+          elsif doc.root.qname.to_s == "info"
+            prop = Typhoeus.get(File.join(base,name.to_s,'properties','/'))
+            if prop.success?
+              xprop = XML::Smart::string(prop.response_body)
+              xprop.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
+              if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)")) || (["ready"].include?(xprop.find("string(/p:properties/p:state)")) && Time.parse(xprop.find("string(/p:properties/p:state/@changed)")) < Time.now-(60*60*12))
+                uuid = xprop.find("string(/p:properties/p:attributes/p:uuid)")
+                id = name.to_s
+                File.write(File.join(p1,uuid + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
+                Typhoeus.delete(File.join(base,name.to_s,'/'))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+  puts
+elsif command == 'abandon'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1)
+  end
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res1.success?
+      if res1.response_body == 'ready' || res1.response_body == 'stopped'
+        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+      end
+    end
+  end
+  puts
+elsif command == 'start'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1)
+  end
+  names.each do |name|
+    res = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res.success?
+      case res.response_body
+        when "stopped" then
+          keep_alive = Typhoeus.get(File.join(base,name.to_s,'properties','attributes','keep_alive','/'))
+          if keep_alive.success?
+            Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=running")
+          end
+      end
+    end
+  end
+elsif command == 'delete!'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'))
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1)
+  end
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    Typhoeus.delete(File.join(base,name.to_s,'/'))
+  end
+  puts
+elsif command == 'new'
+  if !File.exists?(p1)
+    FileUtils.cp_r("#{curpath}/server/",p1)
+    FileUtils.mkdir("#{p1}/archive") rescue nil
+    FileUtils.mkdir("#{p1}/instances") rescue nil
+    FileUtils.mkdir("#{p1}/resources") rescue nil
+    FileUtils.mkdir("#{p1}/executionhandler") rescue nil
+    Dir["#{curpath}/../systemd/*.service"].each do |f|
+      nam =  File.basename f
+      cont = File.read(f)
+      cont.gsub!(/{CPEEUSER}/,`whoami`.strip)
+      cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
+      cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
+      File.write("#{p1}/#{nam}",cont)
+    end
+  else
+    puts 'Directory already exists.'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.11
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -139,6 +139,7 @@ files:
 - cockpit/js/edit.js
 - cockpit/js/instance.js
 - cockpit/js/model.js
+- cockpit/js/modifiers.js
 - cockpit/js/parameters.js
 - cockpit/js/replay.js
 - cockpit/js/track.js
@@ -201,6 +202,8 @@ files:
 - cockpit/templates/Track Test.xml
 - cockpit/templates/UR-VUE 2020 Manual Adjust.xml
 - cockpit/templates/UR-VUE 2020 Solution Baseline.xml
+- cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active
+- cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active-uuid
 - cockpit/templates/UR-VUE 2020 Solution NN.xml
 - cockpit/templates/UR-VUE 2020 Solution View.xml
 - cockpit/templates/UR-VUE 2020.xml
@@ -640,6 +643,7 @@ files:
 - server/server.conf
 - server/server.rb
 - tools/cpee
+- tools/cpee.sic
 - tools/server/cpee
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init