cpee 2.0.28 → 2.1.4

data/server/{resources/transformation_dslx.xsl → executionhandlers/ruby/dsl_to_dslx.xsl}

@@ -4,24 +4,27 @@
   <xsl:strip-space elements="*"/>
   <xsl:variable name="myspacemultiplier">2</xsl:variable>
   <xsl:template match="/">
+    <xsl:text>control flow do</xsl:text>
+    <xsl:call-template name="print-newline"/>
     <xsl:apply-templates select="//d:description"/>
+    <xsl:text>end</xsl:text>
   </xsl:template>
   <xsl:template match="//d:description">
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
-        <xsl:value-of select="-1*$myspacemultiplier"/>
+        <xsl:value-of select="0*$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:apply-templates>
   </xsl:template>
   <xsl:template match="*">
     <xsl:param name="myspace"/>
-    <xsl:call-template name="print-space">
-      <xsl:with-param name="i">1</xsl:with-param>
-      <xsl:with-param name="count">
-        <xsl:value-of select="$myspace+$myspacemultiplier"/>
-      </xsl:with-param>
-    </xsl:call-template>
     <xsl:if test="name()='call' or name()='manipulate'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:value-of select="name()"/>
       <xsl:text> :</xsl:text>
       <xsl:value-of select="@id"/>
@@ -94,26 +97,54 @@
           <xsl:value-of select="$myspace"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:call-template name="print-newline"/>
+      <xsl:call-template name="print-newline"></xsl:call-template>
     </xsl:if>
     <xsl:if test="name()='terminate'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>terminate</xsl:text>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='stop'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>stop :</xsl:text>
       <xsl:value-of select="@id"/>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='escape'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>escape</xsl:text>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='parallel'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>parallel</xsl:text>
       <xsl:if test="@wait">
         <xsl:text> :wait =&gt; </xsl:text>
         <xsl:value-of select="@wait"/>
+        <xsl:if test="@cancel">
+          <xsl:text>, :cancel =&gt; :</xsl:text>
+          <xsl:value-of select="@cancel"/>
+        </xsl:if>
       </xsl:if>
       <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
@@ -132,6 +163,12 @@
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='loop'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>loop </xsl:text>
       <xsl:if test="@mode='pre_test'">
         <xsl:choose>
@@ -185,6 +222,12 @@
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='choose'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>choose </xsl:text>
       <xsl:choose>
         <xsl:when test="@mode='exclusive'">
@@ -219,6 +262,12 @@
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='critical'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:text>critical :</xsl:text>
       <xsl:value-of select="@sid"/>
       <xsl:text> do</xsl:text>

data/server/executionhandlers/ruby/execution.rb

@@ -0,0 +1,81 @@
+# This file is part of CPEE.
+#
+# CPEE is free software: you can redistribute it and/or modify it under the terms
+# of the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
+module CPEE
+
+  module ExecutionHandler
+
+    module Ruby
+      BACKEND_INSTANCE = 'instance.rb'
+      BACKEND_OPTS     = 'opts.yaml'
+      DSL_TO_DSLX_XSL  = File.expand_path(File.join(__dir__,'dsl_to_dslx.xsl'))
+      BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run'))
+      BACKEND_TEMPLATE = File.expand_path(File.join(__dir__,'backend','instance.template'))
+
+      def self::dslx_to_dsl(dslx) # transpile
+        trans = XML::Smart::open_unprotected(ExecutionHandler::Ruby::DSL_TO_DSLX_XSL)
+        dslx.transform_with(trans).to_s
+      end
+
+      def self::prepare(id,opts) # write result to disk
+        Dir.mkdir(File.join(opts[:instances],id.to_s)) rescue nil
+        FileUtils.copy(ExecutionHandler::Ruby::BACKEND_RUN,File.join(opts[:instances],id.to_s))
+        dsl = CPEE::Persistence::extract_item(id,opts,'dsl')
+        hw = CPEE::Persistence::extract_item(id,opts,'executionhandler')
+        endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
+        dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
+        positions = CPEE::Persistence::extract_set(id,opts,'positions')
+        positions.map! do |k, v|
+          [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
+        end
+        File.open(File.join(opts[:instances],id.to_s,ExecutionHandler::Ruby::BACKEND_OPTS),'w') do |f|
+          YAML::dump({
+            :host => opts[:host],
+            :url => opts[:url],
+            :redis_url => opts[:redis_url],
+            :redis_path => File.join(opts[:basepath],opts[:redis_path]),
+            :redis_db => opts[:redis_db],
+            :global_executionhandlers => opts[:global_executionhandlers],
+            :executionhandlers => opts[:executionhandlers],
+            :executionhandler => hw
+          },f)
+        end
+        template = ERB.new(File.read(ExecutionHandler::Ruby::BACKEND_TEMPLATE), trim_mode: '-')
+        res = template.result_with_hash(dsl: dsl, dataelements: dataelements, endpoints: endpoints, positions: positions)
+        File.write(File.join(opts[:instances],id.to_s,ExecutionHandler::Ruby::BACKEND_INSTANCE),res)
+      end
+
+      def self::run(id,opts)
+        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
+        pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
+        Process.detach pid
+        File.write(exe + '.pid',pid)
+      end
+
+      def self::stop(id,opts) ### return: bool to tell if manually changing redis is necessary
+        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
+        pid = File.read(exe + '.pid') rescue nil
+        if pid && (Process.kill(0, pid.to_i) rescue false)
+          Process.kill('HUP', pid.to_i) rescue nil
+          false
+        else # its not running, so clean up
+          File.unlink(exe + '.pid') rescue nil
+          true
+        end
+      end
+    end
+
+  end
+
+end

data/server/resources/properties.empty

@@ -22,7 +22,7 @@
     <id>0</id>
     <message>undefined</message>
   </status>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <executionhandler>ruby</executionhandler>
   <positions/>
   <dataelements/>
   <endpoints/>

data/server/resources/properties.init

@@ -22,7 +22,7 @@
     <id>0</id>
     <message>undefined</message>
   </status>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <executionhandler>ruby</executionhandler>
   <positions/>
   <dataelements/>
   <endpoints>

data/server/resources/topics.xml

@@ -52,9 +52,9 @@
   <topic id='attributes'>
     <event>change</event>
   </topic>
-  <topic id='handlerwrapper'>
-    <event>error</event>
+  <topic id='executionhandler'>
     <event>change</event>
+    <event>error</event>
   </topic>
   <topic id='transformation'>
     <event>change</event>

data/server/routing/end.pid

@@ -1 +1 @@
-592867
+430947

data/server/routing/forward-events.pid

@@ -1 +1 @@
-592855
+430935

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-592859
+430939

data/server/routing/persist.pid

@@ -1 +1 @@
-592863
+430943

data/server/routing/persist.rb

@@ -22,7 +22,7 @@ require_relative '../../lib/cpee/redis'
 
 EVENTS = %w{
   event:state/change
-  event:handlerwrapper/change
+  event:executionhandler/change
   event:description/change
   event:dataelements/change
   event:endpoints/change
@@ -69,8 +69,8 @@ Daemonite.new do |opts|
               multi.set("instance:#{instance}/state",mess.dig('content','state'))
               multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
             end
-          when 'event:handlerwrapper/change'
-            opts[:redis].set("instance:#{instance}/handlerwrapper",mess.dig('content','handlerwrapper'))
+          when 'event:executionhandler/change'
+            opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))
           when 'event:description/change'
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/description",mess.dig('content','description'))

data/tools/cpee

@@ -94,13 +94,13 @@ if command == 'ui'
     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)
+  if !File.exists?(p1)
+    FileUtils.cp_r(cockpit,p1)
+  else
+    FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')).delete_if{|e| e =~ /\.json/ || e=~ /legacy/ })
+    puts "Directory already exists, updating ..."
+  end
+  js_libs(p1)
 elsif command == 'convert'
   Dir['*.xml'].each do |f|
     XML::Smart.modify(f) do |doc|
@@ -111,11 +111,17 @@ elsif command == 'convert'
         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://centurio.work/flow-test/start/url/'
+          e.text = 'https://cpee.org/flow/start/url/'
         end rescue nil
         doc.find('//x:start_git').each do |e|
-          e.text = 'https://centurio.work/flow-test/start/git/'
+          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'
@@ -257,7 +263,7 @@ elsif command == 'new'
     FileUtils.mkdir("#{p1}/archive") rescue nil
     FileUtils.mkdir("#{p1}/instances") rescue nil
     FileUtils.mkdir("#{p1}/resources") rescue nil
-    FileUtils.mkdir("#{p1}/handlerwrappers") rescue nil
+    FileUtils.mkdir("#{p1}/executionhandler") rescue nil
     Dir["#{curpath}/../systemd/*.service"].each do |f|
       nam =  File.basename f
       cont = File.read(f)

data/tools/server/cpee

@@ -4,7 +4,7 @@ require 'cpee/implementation'
 
 Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do |opts|
   opts[:instances]          = File.join(__dir__,'instances')
-  opts[:handlerwrappers]    = File.join(__dir__,'handlerwrappers')
+  opts[:executionhandlers   = File.join(__dir__,'executionhandlers')
   opts[:notifications_init] = File.join(__dir__,'resources','notifications')
   opts[:properties_init]    = File.join(__dir__,'resources','properties.init')
 

data/tools/server/resources/properties.init

@@ -22,7 +22,7 @@
     <id>0</id>
     <message>undefined</message>
   </status>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <executionhandler>ruby</executionhandler>
   <positions/>
   <dataelements/>
   <endpoints>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.28
+  version: 2.1.4
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.114'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.114'
 - !ruby/object:Gem::Dependency
   name: weel
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.90
+        version: 1.99.99
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.90
+        version: 1.99.99
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - cockpit/README
 - cockpit/Signavio.xml
 - cockpit/config.json
+- cockpit/config.json.example
 - cockpit/contrib/graph_example.svg
 - cockpit/contrib/legend.svg
 - cockpit/contrib/symbols.svg
@@ -143,7 +144,6 @@ files:
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
-- cockpit/js_libs.zip
 - cockpit/model.html
 - cockpit/replay.html
 - cockpit/rngs/attributes.rng
@@ -188,11 +188,12 @@ files:
 - cockpit/templates.legacy/Worklist Test CPEE.xml
 - cockpit/templates.legacy/Worklist Test.xml
 - cockpit/templates.legacy/Worklist Test2.xml
-- cockpit/templates.legacy/convert_cpee2.rb
 - cockpit/templates.legacy/convert_preset.rb
 - cockpit/templates.legacy/testsets.xml
 - cockpit/templates.legacy/transformations.xml
 - cockpit/templates/Coopis 2010.xml
+- cockpit/templates/Coopis 2010.xml.active
+- cockpit/templates/Coopis 2010.xml.active-uuid
 - cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml
@@ -225,6 +226,7 @@ files:
 - cockpit/themes/compact/rngs/parallel.rng
 - cockpit/themes/compact/rngs/parallel_branch.rng
 - cockpit/themes/compact/rngs/scripts.rng
+- cockpit/themes/compact/rngs/start.rng
 - cockpit/themes/compact/rngs/stop.rng
 - cockpit/themes/compact/rngs/terminate.rng
 - cockpit/themes/compact/symbols/alternative.svg
@@ -251,6 +253,8 @@ files:
 - cockpit/themes/compact/symbols/parallel_branch_compact.svg
 - cockpit/themes/compact/symbols/parallel_branch_event.svg
 - cockpit/themes/compact/symbols/parallel_branch_normal.svg
+- cockpit/themes/compact/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/compact/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/compact/symbols/scripts.svg
 - cockpit/themes/compact/symbols/start.svg
 - cockpit/themes/compact/symbols/stop.svg
@@ -273,6 +277,7 @@ files:
 - cockpit/themes/control/rngs/parallel.rng
 - cockpit/themes/control/rngs/parallel_branch.rng
 - cockpit/themes/control/rngs/scripts.rng
+- cockpit/themes/control/rngs/start.rng
 - cockpit/themes/control/rngs/stop.rng
 - cockpit/themes/control/rngs/terminate.rng
 - cockpit/themes/control/symbols/alternative.svg
@@ -299,6 +304,8 @@ files:
 - cockpit/themes/control/symbols/parallel_branch_compact.svg
 - cockpit/themes/control/symbols/parallel_branch_event.svg
 - cockpit/themes/control/symbols/parallel_branch_normal.svg
+- cockpit/themes/control/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/control/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/control/symbols/scripts.svg
 - cockpit/themes/control/symbols/start.svg
 - cockpit/themes/control/symbols/stop.svg
@@ -321,6 +328,7 @@ files:
 - cockpit/themes/default/rngs/parallel.rng
 - cockpit/themes/default/rngs/parallel_branch.rng
 - cockpit/themes/default/rngs/scripts.rng
+- cockpit/themes/default/rngs/start.rng
 - cockpit/themes/default/rngs/stop.rng
 - cockpit/themes/default/rngs/terminate.rng
 - cockpit/themes/default/symbols/alternative.svg
@@ -347,6 +355,8 @@ files:
 - cockpit/themes/default/symbols/parallel_branch_compact.svg
 - cockpit/themes/default/symbols/parallel_branch_event.svg
 - cockpit/themes/default/symbols/parallel_branch_normal.svg
+- cockpit/themes/default/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/default/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/default/symbols/scripts.svg
 - cockpit/themes/default/symbols/start.svg
 - cockpit/themes/default/symbols/stop.svg
@@ -369,6 +379,7 @@ files:
 - cockpit/themes/extended/rngs/parallel.rng
 - cockpit/themes/extended/rngs/parallel_branch.rng
 - cockpit/themes/extended/rngs/scripts.rng
+- cockpit/themes/extended/rngs/start.rng
 - cockpit/themes/extended/rngs/stop.rng
 - cockpit/themes/extended/rngs/terminate.rng
 - cockpit/themes/extended/symbols/alternative.svg
@@ -395,6 +406,8 @@ files:
 - cockpit/themes/extended/symbols/parallel_branch_compact.svg
 - cockpit/themes/extended/symbols/parallel_branch_event.svg
 - cockpit/themes/extended/symbols/parallel_branch_normal.svg
+- cockpit/themes/extended/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/extended/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/extended/symbols/scripts.svg
 - cockpit/themes/extended/symbols/start.svg
 - cockpit/themes/extended/symbols/stop.svg
@@ -439,6 +452,8 @@ files:
 - cockpit/themes/model/symbols/parallel_branch_compact.svg
 - cockpit/themes/model/symbols/parallel_branch_event.svg
 - cockpit/themes/model/symbols/parallel_branch_normal.svg
+- cockpit/themes/model/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/model/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/model/symbols/scripts.svg
 - cockpit/themes/model/symbols/start.svg
 - cockpit/themes/model/symbols/stop.svg
@@ -461,6 +476,7 @@ files:
 - cockpit/themes/packed/rngs/parallel.rng
 - cockpit/themes/packed/rngs/parallel_branch.rng
 - cockpit/themes/packed/rngs/scripts.rng
+- cockpit/themes/packed/rngs/start.rng
 - cockpit/themes/packed/rngs/stop.rng
 - cockpit/themes/packed/rngs/terminate.rng
 - cockpit/themes/packed/symbols/alternative.svg
@@ -487,6 +503,8 @@ files:
 - cockpit/themes/packed/symbols/parallel_branch_compact.svg
 - cockpit/themes/packed/symbols/parallel_branch_event.svg
 - cockpit/themes/packed/symbols/parallel_branch_normal.svg
+- cockpit/themes/packed/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/packed/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/packed/symbols/scripts.svg
 - cockpit/themes/packed/symbols/start.svg
 - cockpit/themes/packed/symbols/stop.svg
@@ -509,6 +527,7 @@ files:
 - cockpit/themes/preset/rngs/parallel.rng
 - cockpit/themes/preset/rngs/parallel_branch.rng
 - cockpit/themes/preset/rngs/scripts.rng
+- cockpit/themes/preset/rngs/start.rng
 - cockpit/themes/preset/rngs/stop.rng
 - cockpit/themes/preset/rngs/terminate.rng
 - cockpit/themes/preset/symbols/alternative.svg
@@ -535,6 +554,8 @@ files:
 - cockpit/themes/preset/symbols/parallel_branch_compact.svg
 - cockpit/themes/preset/symbols/parallel_branch_event.svg
 - cockpit/themes/preset/symbols/parallel_branch_normal.svg
+- cockpit/themes/preset/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/preset/symbols/parallel_eventbased_parallel.svg
 - cockpit/themes/preset/symbols/scripts.svg
 - cockpit/themes/preset/symbols/start.svg
 - cockpit/themes/preset/symbols/stop.svg
@@ -553,7 +574,6 @@ files:
 - lib/callbacks/callbacks.rng
 - lib/cpee.xml
 - lib/cpee/attributes_helper.rb
-- lib/cpee/controller.rb
 - lib/cpee/implementation.rb
 - lib/cpee/implementation_callbacks.rb
 - lib/cpee/implementation_notifications.rb
@@ -562,12 +582,10 @@ files:
 - lib/cpee/persistence.rb
 - lib/cpee/redis.rb
 - lib/cpee/statemachine.rb
-- lib/cpee/transform.rb
 - lib/cpee/value_helper.rb
 - lib/engine.xml
 - lib/engine/instance-info.rng
 - lib/engine/instances.rng
-- lib/instantiation.xml
 - lib/properties.xml
 - lib/properties/arbitrary.rng
 - lib/properties/attributes.rng
@@ -576,7 +594,7 @@ files:
 - lib/properties/dsl.rng
 - lib/properties/dslx.rng
 - lib/properties/endpoints.rng
-- lib/properties/handlerwrapper.rng
+- lib/properties/executionhandler.rng
 - lib/properties/position.rng
 - lib/properties/positions.rng
 - lib/properties/properties.rng
@@ -595,12 +613,14 @@ files:
 - lib/properties/t_transformation.rng
 - lib/properties/transformation.rng
 - server/dev.rb
-- server/handlerwrappers/default.rb
-- server/resources/backend/README.md
-- server/resources/backend/instance.rb
-- server/resources/backend/instance.template
-- server/resources/backend/opts.yaml
-- server/resources/backend/run
+- server/executionhandlers/ruby/backend/README.md
+- server/executionhandlers/ruby/backend/instance.template
+- server/executionhandlers/ruby/backend/opts.yaml
+- server/executionhandlers/ruby/backend/run
+- server/executionhandlers/ruby/connection.rb
+- server/executionhandlers/ruby/controller.rb
+- server/executionhandlers/ruby/dsl_to_dslx.xsl
+- server/executionhandlers/ruby/execution.rb
 - server/resources/empty_dslx.xml
 - server/resources/notifications/logging/subscription.xml
 - server/resources/properties.empty
@@ -609,7 +629,6 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
-- server/resources/transformation_dslx.xsl
 - server/routing/end.pid
 - server/routing/end.rb
 - server/routing/forward-events.pid
@@ -619,229 +638,11 @@ files:
 - server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
-- server/server.pid
 - server/server.rb
 - tools/cpee
 - tools/server/cpee
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init
-- tools/test/README
-- tools/test/config.json
-- tools/test/contrib/graph_example.svg
-- tools/test/contrib/legend.svg
-- tools/test/contrib/symbols.svg
-- tools/test/contrib/transformation1.xsl
-- tools/test/contrib/transformation2.xsl
-- tools/test/contrib/tree_example.svg
-- tools/test/css/model.css
-- tools/test/css/track.css
-- tools/test/css/ui.css
-- tools/test/css/wfadaptor.css
-- tools/test/edit.html
-- tools/test/graph.html
-- tools/test/index.html
-- tools/test/js/details.js
-- tools/test/js/instance.js
-- tools/test/js/model.js
-- tools/test/js/parameters.js
-- tools/test/js/track.js
-- tools/test/js/ui.js
-- tools/test/js/wfadaptor.js
-- tools/test/js_libs.zip
-- tools/test/js_libs/Makefile
-- tools/test/js_libs/ansi_up.js
-- tools/test/js_libs/console.js
-- tools/test/js_libs/custommenu.css
-- tools/test/js_libs/custommenu.js
-- tools/test/js_libs/experiments1/relaxngui.css
-- tools/test/js_libs/experiments1/relaxngui.js
-- tools/test/js_libs/experiments1/rngtest9.html
-- tools/test/js_libs/experiments1/rngtest9.rng
-- tools/test/js_libs/experiments1/rngtest9.xml
-- tools/test/js_libs/jquery-2.2.4.min.js
-- tools/test/js_libs/jquery-3.2.1.min.js
-- tools/test/js_libs/jquery-3.3.1.min.js
-- tools/test/js_libs/jquery.browser.js
-- tools/test/js_libs/jquery.caret.min.js
-- tools/test/js_libs/jquery.cookie.js
-- tools/test/js_libs/jquery.min.js
-- tools/test/js_libs/jquery.svg.min.js
-- tools/test/js_libs/jquery.svgdom.min.js
-- tools/test/js_libs/markdown.min.js
-- tools/test/js_libs/parsequery.js
-- tools/test/js_libs/printf.js
-- tools/test/js_libs/relaxngui.css
-- tools/test/js_libs/relaxngui.js
-- tools/test/js_libs/strftime.min.js
-- tools/test/js_libs/tests/dataelements.html
-- tools/test/js_libs/tests/dataelements.rng
-- tools/test/js_libs/tests/dataelements.xml
-- tools/test/js_libs/tests/relaxngui.css
-- tools/test/js_libs/tests/relaxngui.js
-- tools/test/js_libs/tests/rngtest1.html
-- tools/test/js_libs/tests/rngtest1.rng
-- tools/test/js_libs/tests/rngtest1.xml
-- tools/test/js_libs/tests/rngtest2.html
-- tools/test/js_libs/tests/rngtest2.rng
-- tools/test/js_libs/tests/rngtest2.xml
-- tools/test/js_libs/tests/rngtest3.html
-- tools/test/js_libs/tests/rngtest3.rng
-- tools/test/js_libs/tests/rngtest3.xml
-- tools/test/js_libs/tests/rngtest4.html
-- tools/test/js_libs/tests/rngtest4.rng
-- tools/test/js_libs/tests/rngtest4.xml
-- tools/test/js_libs/tests/rngtest5.html
-- tools/test/js_libs/tests/rngtest5.rng
-- tools/test/js_libs/tests/rngtest5.xml
-- tools/test/js_libs/tests/rngtest6.html
-- tools/test/js_libs/tests/rngtest6.rng
-- tools/test/js_libs/tests/rngtest6.xml
-- tools/test/js_libs/tests/rngtest8.html
-- tools/test/js_libs/tests/rngtest8.rng
-- tools/test/js_libs/tests/rngtest8.xml
-- tools/test/js_libs/tests/rngtest9.html
-- tools/test/js_libs/tests/rngtest9.rng
-- tools/test/js_libs/tests/rngtest9.xml
-- tools/test/js_libs/ui.css
-- tools/test/js_libs/ui.html
-- tools/test/js_libs/ui.js
-- tools/test/js_libs/underscore.min.js
-- tools/test/js_libs/util.js
-- tools/test/js_libs/vkbeautify.0.99.00.beta.js
-- tools/test/js_libs/vkbeautify.js
-- tools/test/js_libs/webcomponents.min.js
-- tools/test/model.html
-- tools/test/rngs/attributes.rng
-- tools/test/rngs/dataelements.rng
-- tools/test/rngs/endpoints.rng
-- tools/test/templates.legacy/Async.xml
-- tools/test/templates.legacy/BCO.xml
-- tools/test/templates.legacy/BCS.xml
-- tools/test/templates.legacy/Centurio.xml
-- tools/test/templates.legacy/Concurrent.xml
-- tools/test/templates.legacy/Coopis Testset.xml
-- tools/test/templates.legacy/Endpoints and Data Manipulation.xml
-- tools/test/templates.legacy/ICSOC Testset.xml
-- tools/test/templates.legacy/Infinity.xml
-- tools/test/templates.legacy/Lego Boxer.xml
-- tools/test/templates.legacy/Lego Conveyor.xml
-- tools/test/templates.legacy/Lego Crane.xml
-- tools/test/templates.legacy/Lego Ejector.xml
-- tools/test/templates.legacy/Lego Full.xml
-- tools/test/templates.legacy/Lego Liddy.xml
-- tools/test/templates.legacy/Lego Plate.xml
-- tools/test/templates.legacy/Lego Transporter.xml
-- tools/test/templates.legacy/Lego_Part_1.xml
-- tools/test/templates.legacy/LgLinear.xml
-- tools/test/templates.legacy/Linear.xml
-- tools/test/templates.legacy/Log.xml
-- tools/test/templates.legacy/Mangler 1.xml
-- tools/test/templates.legacy/Mangler 2.xml
-- tools/test/templates.legacy/Manuel Labels.xml
-- tools/test/templates.legacy/Promise.xml
-- tools/test/templates.legacy/SOPROMO Test Sonification.xml
-- tools/test/templates.legacy/Subprocess.xml
-- tools/test/templates.legacy/Syncing P34 1.xml
-- tools/test/templates.legacy/Syncing P34 2.xml
-- tools/test/templates.legacy/Syncing P34 3.xml
-- tools/test/templates.legacy/Syncing P34.xml
-- tools/test/templates.legacy/TEST - Bad Loop.xml
-- tools/test/templates.legacy/TEST - Wrong Positions.xml
-- tools/test/templates.legacy/Take_5.xml
-- tools/test/templates.legacy/Update.xml
-- tools/test/templates.legacy/Worklist Parallel.xml
-- tools/test/templates.legacy/Worklist Test CPEE.xml
-- tools/test/templates.legacy/Worklist Test.xml
-- tools/test/templates.legacy/Worklist Test2.xml
-- tools/test/templates.legacy/convert_cpee2.rb
-- tools/test/templates.legacy/convert_preset.rb
-- tools/test/templates.legacy/testsets.xml
-- tools/test/templates.legacy/transformations.xml
-- tools/test/templates/Coopis 2010.xml
-- tools/test/templates/IUPC arXiv:1104.3609 P34 1.xml
-- tools/test/templates/IUPC arXiv:1104.3609 P34 2.xml
-- tools/test/templates/IUPC arXiv:1104.3609 P34 3.xml
-- tools/test/templates/Track Test Local.xml
-- tools/test/templates/Track Test.xml
-- tools/test/templates/UR-VUE 2020 Manual Adjust.xml
-- tools/test/templates/UR-VUE 2020 Solution Baseline.xml
-- tools/test/templates/UR-VUE 2020 Solution NN.xml
-- tools/test/templates/UR-VUE 2020 Solution View.xml
-- tools/test/templates/UR-VUE 2020.xml
-- tools/test/templates/Worklist.xml
-- tools/test/templates/instantiate.local/Take_Sub.xml
-- tools/test/templates/instantiate/Take_Perf.xml
-- tools/test/templates/instantiate/Take_Sub.xml
-- tools/test/templates/instantiate/Take_X.xml
-- tools/test/themes/compact/theme.js
-- tools/test/themes/diana/theme.js
-- tools/test/themes/extended/theme.js
-- tools/test/themes/model/rngs/alternative.rng
-- tools/test/themes/model/rngs/call.rng
-- tools/test/themes/model/rngs/callmanipulate.rng
-- tools/test/themes/model/rngs/choose.rng
-- tools/test/themes/model/rngs/critical.rng
-- tools/test/themes/model/rngs/escape.rng
-- tools/test/themes/model/rngs/group.rng
-- tools/test/themes/model/rngs/loop.rng
-- tools/test/themes/model/rngs/manipulate.rng
-- tools/test/themes/model/rngs/otherwise.rng
-- tools/test/themes/model/rngs/parallel.rng
-- tools/test/themes/model/rngs/parallel_branch.rng
-- tools/test/themes/model/rngs/scripts.rng
-- tools/test/themes/model/rngs/stop.rng
-- tools/test/themes/model/rngs/terminate.rng
-- tools/test/themes/model/theme.js
-- tools/test/themes/packed/theme.js
-- tools/test/themes/preset/rngs/alternative.rng
-- tools/test/themes/preset/rngs/call.rng
-- tools/test/themes/preset/rngs/callmanipulate.rng
-- tools/test/themes/preset/rngs/choose.rng
-- tools/test/themes/preset/rngs/closed_loop.rng
-- tools/test/themes/preset/rngs/closed_loop_cancel.rng
-- tools/test/themes/preset/rngs/closed_loop_control.rng
-- tools/test/themes/preset/rngs/closed_loop_measuring.rng
-- tools/test/themes/preset/rngs/critical.rng
-- tools/test/themes/preset/rngs/escape.rng
-- tools/test/themes/preset/rngs/group.rng
-- tools/test/themes/preset/rngs/loop.rng
-- tools/test/themes/preset/rngs/manipulate.rng
-- tools/test/themes/preset/rngs/otherwise.rng
-- tools/test/themes/preset/rngs/parallel.rng
-- tools/test/themes/preset/rngs/parallel_branch.rng
-- tools/test/themes/preset/rngs/scripts.rng
-- tools/test/themes/preset/rngs/stop.rng
-- tools/test/themes/preset/rngs/terminate.rng
-- tools/test/themes/preset/symbols/alternative.svg
-- tools/test/themes/preset/symbols/arrow.svg
-- tools/test/themes/preset/symbols/call.svg
-- tools/test/themes/preset/symbols/callmanipulate.svg
-- tools/test/themes/preset/symbols/choose.svg
-- tools/test/themes/preset/symbols/choose_exclusive.svg
-- tools/test/themes/preset/symbols/choose_inclusive.svg
-- tools/test/themes/preset/symbols/closed_loop.svg
-- tools/test/themes/preset/symbols/closed_loop_cancel.svg
-- tools/test/themes/preset/symbols/closed_loop_control.svg
-- tools/test/themes/preset/symbols/closed_loop_measuring.svg
-- tools/test/themes/preset/symbols/complex.svg
-- tools/test/themes/preset/symbols/critical.svg
-- tools/test/themes/preset/symbols/end.svg
-- tools/test/themes/preset/symbols/escape.svg
-- tools/test/themes/preset/symbols/event_end.svg
-- tools/test/themes/preset/symbols/loop.svg
-- tools/test/themes/preset/symbols/manipulate.svg
-- tools/test/themes/preset/symbols/otherwise.svg
-- tools/test/themes/preset/symbols/parallel.svg
-- tools/test/themes/preset/symbols/parallel_branch.svg
-- tools/test/themes/preset/symbols/parallel_branch_compact.svg
-- tools/test/themes/preset/symbols/parallel_branch_event.svg
-- tools/test/themes/preset/symbols/parallel_branch_normal.svg
-- tools/test/themes/preset/symbols/scripts.svg
-- tools/test/themes/preset/symbols/start.svg
-- tools/test/themes/preset/symbols/stop.svg
-- tools/test/themes/preset/symbols/terminate.svg
-- tools/test/themes/preset/theme.js
-- tools/test/track.html
 homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
@@ -861,7 +662,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee.org). If you