cpee 2.1.9 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d53dc72e24a3fb020406bdc895b053ea57e66e0c8fd2c31494ac45d821186bb8
-  data.tar.gz: fe2f6c47d2cec87e99d233867e86de7c4d86d02c2ceff30e31abcd418f5ce506
+  metadata.gz: a36325365a950ed863e1d8f225d3d9c0fe955c03d9e8d54ef5a3b92366bffeea
+  data.tar.gz: 2579cb64ec6d53369b89f9ae2bd296422d5a9aafb527cfe4d7b4397702e15571
 SHA512:
-  metadata.gz: d63332228480551be2515cc616524dbdc1d3f02605ad7774341ee2bc6f5138f2cb15d9ef0c44708ec78c4f697c16b3be4c1359919726089f3fce3d4181578692
-  data.tar.gz: 5633233f63f21712876b602c5997bce33ea5f80eb6733803f7228fe3f927a53156c6b4950a79c5062957c8fe4df759aba94d6ba6954d38c0832cfe0e8b7feff2
+  metadata.gz: 198bfa6332b16087dd108170166e4d91b92e82bb51e9853d72ad1fd2e152a3a5bee856c138a91598f63881a49897dbfed16fa4193732e1d55f7a5484476aa6fd
+  data.tar.gz: a068a5abf6abb788b8759ced41339db138b4775d0ca2c1be4f89e1d191205379632c8c36069b799f6475f04f57b53aac2f646aad8265e2ab6182733200780535

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,10 +148,9 @@ 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)                                { 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:not(:first-child)        { padding-top: 0.2em; }
-#areainstance div.section:nth-child(3) > div                          { padding-bottom: 0em; }
+#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: 0 1em; font-size: 0.9em; }
 
@@ -243,4 +242,4 @@ span.vote {
   overflow: auto;
 }
 #disclaimer p { max-width: 80ex; text-align: justify; }
-#disclaimer input { margin:0; padding:0; vertical-align:baseline; margin-right: 0.5em; }
+#disclaimer input { margin:0; padding:0; vertical-align:bottom; margin-right: 0.5em; }

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';
@@ -280,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':
@@ -482,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;
@@ -570,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){
@@ -580,7 +585,6 @@ function adaptor_init(url,theme,dslx) { //{{{
       format_instance_pos();
     });
   }
-  suspended_monitoring = false;
 } //}}}
 
 function monitor_graph_change(force) { //{{{
@@ -921,7 +925,6 @@ function save_svgfile() {// {{{
 }// }}}
 async function set_testset(testset,exec) {// {{{
   var url = $('body').attr('current-instance');
-  suspended_monitoring = true;
 
   var promises = [];
 

data/cockpit/js/modifiers.js

@@ -42,7 +42,7 @@ function do_mod_save(target) {
   let top = div.attr('data-resource');
   let doc = save['modifiers_additional'][top].save();
   let rep = $('body').attr('current-resources');
-  let now = encodeURIComponent($('div.select select',div).val());
+  let now = $('div.select select',div).val();
 
   var tset = $X('<testset xmlns="http://cpee.org/ns/properties/2.0"/>');
       tset.append(doc.documentElement);
@@ -69,12 +69,13 @@ async function modifiers_display() {
             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));
+            $('div.title *',clone).text(decodeURIComponent(t).replace(/^\d*_?/,''));
 
             let cpromises = [];
             $('resource',ses).each(function(_,s) {
-              let opt = $('<option/>');
-              opt.text(decodeURIComponent($(s).text()));
+              let opt = $('<option value=""/>');
+              opt.text(decodeURIComponent($(s).text()).replace(/^\d*_?/,''));
+              opt.attr('value',$(s).text());
               $('div.select select',clone).append(opt);
 
               cpromises.push(
@@ -120,7 +121,8 @@ function modifiers_display_ui(url,top,it,notchanged) {
             save['modifiers_additional'][top].content(attr);
           }
         });
-      }
+      },
+      error: function() {}
     });
   }
 }
@@ -134,7 +136,7 @@ function modifiers_select() {
   });
   $('#modifiers div[data-resource]').each(function(_,r){
     $('select option',r).each(function(_,s){
-      let where = $(r).attr('data-resource') + '/' + encodeURIComponent($(s).text());
+      let where = $(r).attr('data-resource') + '/' + $(s).attr('value');
       let cond = save['modifiers'][where];
       let success = true;
       for (x in cond) {
@@ -142,8 +144,8 @@ function modifiers_select() {
       }
       if (success) {
         let top = $(r).attr('data-resource');
-        let it = encodeURIComponent($(s).text());
-        $('select',r).val($(s).text());
+        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;
       }

data/cockpit/templates/Worklist.xml

@@ -12,15 +12,15 @@
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="worklist">
         <parameters>
-          <label>"OK OR NOT OK"</label>
+          <label>OK OR NOT OK</label>
           <method>:post</method>
           <arguments>
-            <orgmodel>"organisation1"</orgmodel>
-            <domain>"Virtual Business 1"</domain>
-            <form>"http://cpee.org/~demo/form/form-f.html"</form>
-            <role>"Regular"</role>
-            <schaden>"55546"</schaden>
-            <text>"fetzen hin"</text>
+            <orgmodel>organisation1</orgmodel>
+            <domain>Virtual Business 1</domain>
+            <form>http://cpee.org/~demo/form/form-f.html</form>
+            <role>Regular</role>
+            <schaden>55546</schaden>
+            <text>fetzen hin</text>
           </arguments>
         </parameters>
         <code>
@@ -44,4 +44,4 @@
     <design_stage>development</design_stage>
     <design_dir>Templates.dir</design_dir>
   </attributes>
-</testset>
+</testset>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.9"
+  s.version          = "2.1.13"
   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."
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
   s.add_runtime_dependency 'rubyzip', '~>2'
+  s.add_runtime_dependency 'charlock_holmes', '~>0'
 end

data/lib/cpee/implementation.rb

@@ -77,7 +77,7 @@ module CPEE
     opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
     opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
 
-    CPEE::redis_connect opts
+    CPEE::redis_connect opts, 'Server Main'
 
     opts[:sse_keepalive_frequency]    ||= 10
     opts[:sse_connections]            = {}
@@ -252,7 +252,7 @@ module CPEE
       end
 
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
-      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s))
+      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))
       @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", uuid)
 
       Riddl::Parameter::Simple.new("id", id.to_s)

data/lib/cpee/implementation_notifications.rb

@@ -179,7 +179,7 @@ module CPEE
     end #}}}
 
     def self::sse_distributor(opts) #{{{
-      conn = opts[:redis_dyn].call
+      conn = opts[:redis_dyn].call "Server SSE"
       conn.psubscribe('forward:*','event:state/change') do |on|
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'

data/lib/cpee/redis.rb

@@ -15,42 +15,43 @@
 require 'redis'
 
 module CPEE
-  def self::redis_connect(opts)
+  def self::redis_connect(opts,name=nil)
     if opts[:redis_cmd].nil?
       begin
         if opts[:redis_path]
-          opts[:redis_dyn] = Proc.new { Redis.new(path: opts[:redis_path], db: opts[:redis_db]) }
+          opts[:redis_dyn] = Proc.new { |name| Redis.new(path: opts[:redis_path], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
         elsif opts[:redis_url]
-          opts[:redis_dyn] = Proc.new { Redis.new(url: opts[:redis_url], db: opts[:redis_db]) }
+          opts[:redis_dyn] = Proc.new { |name| Redis.new(url: opts[:redis_url], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
         else
           raise
         end
-        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
       rescue
         puts 'can not connect to redis. check if it is running and cpee is configured correctly ...'
         exit
       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) }
+      opts[:redis_dyn] = Proc.new { |name| Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i, id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
       tried = false
       begin
-        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
-      rescue
-        res = if tried
+      rescue => e
+        puts e
+        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 'starting redis ... it will keep running, just to let you know ...'
           puts 'waiting for successful start ...'
           sleep 1
           retry

data/server/executionhandlers/ruby/connection.rb

@@ -12,6 +12,8 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+require 'charlock_holmes'
+
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
     controller = arguments[0]
@@ -101,7 +103,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance_id)
     params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
     params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
-    params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
+    params << Riddl::Header.new("CPEE-CALLBACK",File.join(@controller.instance_url,'callbacks',callback,'/'))
     params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
     params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
     params << Riddl::Header.new("CPEE-LABEL",@label||'')
@@ -239,6 +241,14 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     result
   end
 
+  def detected_encoding(text)
+    CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
+  end
+
+  def convert_to_utf8(text)
+    CharlockHolmes::Converter.convert(text, detected_encoding(text), "UTF-8")
+  end
+
   def structurize_result(result)
     result.map do |r|
       if r.is_a? Riddl::Parameter::Simple

data/server/executionhandlers/ruby/controller.rb

@@ -33,7 +33,7 @@ def ⭐(a); ParaStruct.new(a); end
 
 class Controller
   def initialize(id,dir,opts)
-    CPEE::redis_connect(opts)
+    CPEE::redis_connect(opts,"Instance #{id}")
 
     @redis = opts[:redis]
     @votes = []
@@ -52,7 +52,7 @@ class Controller
     @loop_guard = {}
 
     @callback_keys = {}
-    @psredis = @opts[:redis_dyn].call
+    @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
 
     Thread.new do
       @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
@@ -96,10 +96,10 @@ class Controller
     @opts[:host]
   end
   def base_url
-    @opts[:url]
+    File.join(@opts[:url],'/')
   end
   def instance_url
-    File.join(@opts[:url].to_s,@id.to_s)
+    File.join(@opts[:url].to_s,@id.to_s,'/')
   end
   def instance_id
     @id
@@ -163,7 +163,7 @@ class Controller
 
     if votes.length > 0
       @votes += votes
-      psredis = @opts[:redis_dyn].call
+      psredis = @opts[:redis_dyn].call "Instance #{@id} Vote"
       collect = []
       psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s] }.flatten) do |on|
         on.message do |what, message|

data/server/routing/end.rb

@@ -30,8 +30,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing End'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing End Sub'
   end
 
   run do

data/server/routing/forward-events.rb

@@ -30,8 +30,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Forward Events'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Events Sub'
   end
 
   run do

data/server/routing/forward-votes.rb

@@ -56,8 +56,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Forward Votes'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Votes Sub'
   end
 
   run do
@@ -84,11 +84,11 @@ Daemonite.new do |opts|
               opts[:redis].publish("forward:#{instance}/#{subscription_key}",mess)
             else
               client = Riddl::Client.new(url)
-              callback = m['instance-url'] + '/callbacks/' + subscription_key
+              callback = File.join(m['instance-url'],'/callbacks/',subscription_key,'/')
               status, result, headers = (client.post [
-                Riddl::Header.new("CPEE-BASE",m['cpee']),
+                Riddl::Header.new("CPEE-BASE",File.join(m['cpee'],'/')),
                 Riddl::Header.new("CPEE-INSTANCE",m['instance']),
-                Riddl::Header.new("CPEE-INSTANCE-URL",m['instance-url']),
+                Riddl::Header.new("CPEE-INSTANCE-URL",File.join(m['instance-url'],'/')),
                 Riddl::Header.new("CPEE-INSTANCE-UUID",m['instance-uuid']),
                 Riddl::Header.new("CPEE-CALLBACK",callback),
                 Riddl::Header.new("CPEE-CALLBACK-ID",subscription_key),

data/server/routing/persist.rb

@@ -45,8 +45,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Persist'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Persist Sub'
   end
 
   run do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.13
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -102,6 +102,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -632,18 +646,13 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events.pid
 - server/routing/forward-events.rb
-- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
-- server/routing/persist.pid
 - server/routing/persist.rb
 - 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

data/server/routing/end.pid

@@ -1 +0,0 @@
-42643

data/server/routing/forward-events.pid

@@ -1 +0,0 @@
-42631

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-42635

data/server/routing/persist.pid

@@ -1 +0,0 @@
-42639

data/tools/cpee.sic

@@ -1,306 +0,0 @@
-#!/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