cpee 2.0.26 → 2.1.1

data/cockpit/themes/packed/theme.js

@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -848,7 +852,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1275,6 +1288,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1287,6 +1318,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{

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

@@ -2,6 +2,12 @@
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>
+  <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
+    <choice>
+      <value id='last'>After Last Task in Branch</value>
+      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+    </choice>
+  </attribute>
   <element rngui:ignore="true" name="parallel_branch">
     <attribute name="pass">
       <data type="string"/>

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

@@ -0,0 +1,83 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data elements (internal context) in the process can be used as input for context data probes. All probes can be the basis for impact factors. Please go to individual tasks to define deal with data that is  ">
+
+    <element name="probes" rngui:header="Context Data Extraction" rngui:fold="closed">
+      <zeroOrMore rngui:label="Add Probe">
+        <element name="probe">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_type" rngui:label="Extractor Type">
+            <choice>
+              <value id='code'>Extractor Code</value>
+              <value id='service'>Extractor Service</value>
+            </choice>
+          </element>
+          <element name="extractor_code" rngui:label="Extractor Code">
+            <text rngui:label="Service Url"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Service">
+            <data type="string" rngui:label="Service Url"/>
+          </element>
+          <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+            <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+              <element rngui:label="Name">
+                <anyName/>
+                <data type="string" rngui:label="Value / Json"/>
+              </element>
+            </zeroOrMore>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Service Url"/>
+          </element>
+          <element name="visualizer_params" rngui:label="Visualizer Arguments">
+            <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+              <element rngui:label="Name">
+                <anyName/>
+                <data type="string" rngui:label="Value / Json"/>
+              </element>
+            </zeroOrMore>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
+
+    <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+      <zeroOrMore rngui:label="Add Impact Profile">
+        <element name="ip">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="target" rngui:label="Target Value">
+            <data type="string" rngui:label="Value"/>
+          </element>
+          <element name="ifs" rngui:header="Impact Factors">
+            <zeroOrMore rngui:label="Add Impact Factor">
+              <element name="if">
+                <element name="ivs" rngui:header="Impact Values">
+                  <zeroOrMore rngui:label="Add Impact Value ">
+                    <element name="iv">
+                      <element name="extractor_url" rngui:label="Extractor Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                      <element name="aggregator_url" rngui:label="Aggregator Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                    </element>
+                  </zeroOrMore>
+                </element>
+                <element name="aggregator_url" rngui:label="Impact Function Url">
+                  <data type="string" rngui:label="Service Url + Parameters"/>
+                </element>
+              </element>
+            </zeroOrMore>
+          </element>
+          <element name="vfunc_url" rngui:label="Violation Function Url">
+            <data type="string" rngui:label="Service Url + Parameters"/>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
+
+  </element>
+</element>

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

@@ -1,8 +1,8 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
 
-  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
-  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
   <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
   <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
   <line x1="28" y1="18" x2="24" y2="11" class="stand"/>

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

@@ -0,0 +1,9 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <path
+    d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+    class="stand"/>
+</svg>
+

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

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
+</svg>
+

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

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline hfill rfill stand"/>
 </svg>

data/cockpit/themes/preset/theme.js

@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -849,7 +853,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1142,7 +1155,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'svg': self.adaptor.theme_dir + 'symbols/start.svg'
     },//}}}
-    'description': null,
+    'description': self.adaptor.theme_dir + 'rngs/start.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
@@ -1276,6 +1289,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1288,6 +1319,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.26"
+  s.version          = "2.1.1"
   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."
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 0.108'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.90'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.99'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
-  s.add_runtime_dependency 'rubyzip', '~>1.2'
+  s.add_runtime_dependency 'rubyzip', '~>2'
 end

data/lib/cpee/attributes_helper.rb

@@ -1,3 +1,17 @@
+# 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/>.
+
 require 'weel'
 
 class AttributesHelper

data/lib/cpee/implementation.rb

@@ -28,7 +28,7 @@ module CPEE
 
   SERVER = File.expand_path(File.join(__dir__,'..','cpee.xml'))
   PROPERTIES_PATHS_FULL = %w{
-    /p:properties/p:handlerwrapper
+    /p:properties/p:executionhandler
     /p:properties/p:positions/p:*
     /p:properties/p:positions/p:*/@*
     /p:properties/p:dataelements/p:*
@@ -54,22 +54,17 @@ module CPEE
   }
   def self::implementation(opts)
     opts[:instances]                  ||= File.expand_path(File.join(__dir__,'..','..','server','instances'))
-    opts[:global_handlerwrappers]     ||= File.expand_path(File.join(__dir__,'..','..','server','handlerwrappers'))
-    opts[:handlerwrappers]            ||= ''
+    opts[:global_executionhandlers]   ||= File.expand_path(File.join(__dir__,'..','..','server','executionhandlers'))
+    opts[:executionhandlers]          ||= ''
     opts[:topics]                     ||= File.expand_path(File.join(__dir__,'..','..','server','resources','topics.xml'))
     opts[:properties_init]            ||= File.expand_path(File.join(__dir__,'..','..','server','resources','properties.init'))
     opts[:properties_empty]           ||= File.expand_path(File.join(__dir__,'..','..','server','resources','properties.empty'))
-    opts[:transformation_dslx]        ||= File.expand_path(File.join(__dir__,'..','..','server','resources','transformation_dslx.xsl'))
     opts[:transformation_service]     ||= File.expand_path(File.join(__dir__,'..','..','server','resources','transformation.xml'))
     opts[:empty_dslx]                 ||= File.expand_path(File.join(__dir__,'..','..','server','resources','empty_dslx.xml'))
     opts[:notifications_init]         ||= File.expand_path(File.join(__dir__,'..','..','server','resources','notifications'))
     opts[:states]                     ||= File.expand_path(File.join(__dir__,'..','..','server','resources','states.xml'))
-    opts[:backend_run]                ||= File.expand_path(File.join(__dir__,'..','..','server','resources','backend','run'))
-    opts[:backend_template]           ||= File.expand_path(File.join(__dir__,'..','..','server','resources','backend','instance.template'))
-    opts[:backend_opts]               ||= 'opts.yaml'
     opts[:watchdog_frequency]         ||= 7
     opts[:watchdog_start_off]         ||= false
-    opts[:backend_instance]           ||= 'instance.rb'
     opts[:infinite_loop_stop]         ||= 10000
 
     ### set redis_cmd to nil if you want to do global
@@ -100,6 +95,13 @@ module CPEE
     ]
 
     Proc.new do
+      Dir[File.join(opts[:global_executionhandlers],'*','execution.rb')].each do |h|
+        require h
+      end unless opts[:global_executionhandlers].nil? || opts[:global_executionhandlers].strip == ''
+      Dir[File.join(opts[:executionhandlers],'*','execution.rb')].each do |h|
+        require h
+      end unless opts[:executionhandlers].nil? || opts[:executionhandlers].strip == ''
+
       parallel do
         CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
         EM.add_periodic_timer(opts[:watchdog_frequency]) do ### start services

data/lib/cpee/implementation_callbacks.rb

@@ -1,3 +1,17 @@
+# 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/>.
+
 require 'json'
 
 module CPEE

data/lib/cpee/implementation_notifications.rb

@@ -1,3 +1,17 @@
+# 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/>.
+
 require 'json'
 
 module CPEE

data/lib/cpee/implementation_properties.rb

@@ -1,6 +1,19 @@
+# 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/>.
+
 require_relative 'attributes_helper'
 require_relative 'value_helper'
-require_relative 'transform'
 require 'json'
 require 'erb'
 require 'yaml'
@@ -31,9 +44,9 @@ module CPEE
             run CPEE::Properties::GetStatusMessage, id, opts if get
           end
         end
-        on resource 'handlerwrapper' do
-          run CPEE::Properties::GetHandlerWrapper, id, opts if get
-          run CPEE::Properties::PutHandlerWrapper, id, opts if put 'handlerwrapper'
+        on resource 'executionhandler' do
+          run CPEE::Properties::GetExecutionHandler, id, opts if get
+          run CPEE::Properties::PutExecutionHandler, id, opts if put 'executionhandler'
         end
         on resource 'positions' do
           run CPEE::Properties::GetPositions, id, opts if get
@@ -128,8 +141,8 @@ module CPEE
           if (node = doc.find('/p:properties/p:status')).any?
             CPEE::Properties::PutStatus::set id, opts, node.first.dump
           end
-          if (node = doc.find('/p:properties/p:handlerwrapper')).any?
-            CPEE::Properties::PutHandlerWrapper::set id, opts, node.first.text
+          if (node = doc.find('/p:properties/p:executionhandler')).any?
+            CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text
           end
 
           %w{dataelements endpoints attributes}.each do |item|
@@ -169,8 +182,8 @@ module CPEE
           if (node = doc.find('/p:properties/p:status')).any?
             CPEE::Properties::PutStatus::set id, opts, node.first.dump
           end
-          if (node = doc.find('/p:properties/p:handlerwrapper')).any?
-            CPEE::Properties::PutHandlerWrapper::set id, opts, node.first.text
+          if (node = doc.find('/p:properties/p:executionhandler')).any?
+            CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text
           end
 
           %w{dataelements endpoints attributes}.each do |item|
@@ -211,19 +224,14 @@ module CPEE
       end
 
       def self::run(id,opts,state)
-        exe = File.join(opts[:instances],id.to_s,File.basename(opts[:backend_run]))
         case state
           when 'running'
-            CPEE::Persistence::write_instance id, opts
-            pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
-            Process.detach pid
-            File.write(exe + '.pid',pid)
+            seh = Object.const_get('CPEE::ExecutionHandler::' + CPEE::Persistence::extract_item(id,opts,'executionhandler').capitalize)
+            seh::prepare(id,opts)
+            seh::run(id,opts)
           when 'stopping'
-            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
-            else
-              File.unlink(exe + '.pid') rescue nil
+            seh = Object.const_get('CPEE::ExecutionHandler::' + CPEE::Persistence::extract_item(id,opts,'executionhandler').capitalize)
+            if seh::stop(id,opts) # process is not running anyway, so change redis
               PutState::set id, opts, 'stopped'
             end
           else
@@ -302,16 +310,16 @@ module CPEE
         Riddl::Parameter::Simple.new('value',CPEE::Persistence::extract_item(id,opts,'status/message'))
       end
     end #}}}
-    class GetHandlerWrapper < Riddl::Implementation #{{{
+    class GetExecutionHandler < Riddl::Implementation #{{{
       def response
         id = @a[0]
         opts = @a[1]
-        Riddl::Parameter::Simple.new('value',CPEE::Persistence::extract_item(id,opts,'handlerwrapper'))
+        Riddl::Parameter::Simple.new('value',CPEE::Persistence::extract_item(id,opts,'executionhandler'))
       end
     end #}}}
-    class PutHandlerWrapper < Riddl::Implementation #{{{
+    class PutExecutionHandler < Riddl::Implementation #{{{
       def self::set(id,opts,hw)
-        CPEE::Persistence::set_item(id,opts,'handlerwrapper',:handlerwrapper => hw)
+        CPEE::Persistence::set_item(id,opts,'executionhandler',:executionhandler => hw)
       end
       def response
         id = @a[0]
@@ -319,7 +327,7 @@ module CPEE
         if opts[:statemachine].readonly? id
           @status = 423
         else
-          PutHandlerWrapper::set(id,opts,@p[0].value)
+          PutExecutionHandler::set(id,opts,@p[0].value)
         end
         nil
       end
@@ -633,8 +641,103 @@ module CPEE
     end #}}}
 
     class PutDescription < Riddl::Implementation #{{{
+      def self::transform(descxml,tdesc,tdesctype,tdata,tdatatype,tendp,tendptype,hw,opts) #{{{
+        desc = XML::Smart::string(descxml)
+        desc.register_namespace  'p', 'http://cpee.org/ns/description/1.0'
+
+        dslx = nil
+        dsl = nil
+        de = {}
+        ep = {}
+
+        if desc.root.children.empty?
+          tdesctype = tdatatype = tendptype = 'clean'
+        end
+
+        ### description transformation, including dslx to dsl
+        addit = if tdesctype == 'copy' || tdesc.empty?
+          desc
+        elsif tdesctype == 'rest' && !tdesc.empty?
+          srv = Riddl::Client.interface(tdesc,opts[:transformation_service])
+          status, res = srv.post [
+            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            Riddl::Parameter::Simple.new("type","description")
+          ]
+          if status >= 200 && status < 300
+            XML::Smart::string(res[0].value.read).root
+          else
+            raise 'Could not extract dslx'
+          end
+        elsif tdesctype == 'xslt' && !tdesc.empty?
+          trans = XML::Smart::open_unprotected(tdesc)
+          desc.transform_with(trans).root
+        elsif tdesctype == 'clean'
+          XML::Smart::open_unprotected(opts[:empty_dslx]).root
+        else
+          nil
+        end
+        unless addit.nil?
+          dslx = addit.to_s
+          dsl = Object.const_get('CPEE::ExecutionHandler::' + hw.capitalize)::dslx_to_dsl(addit)
+        end
+
+        ### dataelements extraction
+        addit = if tdatatype == 'rest' && !tdata.empty?
+          srv = Riddl::Client.interface(tdata,@opts[:transformation_service])
+          status, res = srv.post [
+            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            Riddl::Parameter::Simple.new("type","dataelements")
+          ]
+          if status >= 200 && status < 300
+            res
+          else
+            raise 'Could not extract dataelements'
+          end
+        elsif tdatatype == 'xslt' && !tdata.empty?
+          trans = XML::Smart::open_unprotected(tdata)
+          desc.transform_with(trans)
+        elsif tdatatype == 'clean'
+          []
+        else
+          nil
+        end
+        unless addit.nil?
+          addit.each_slice(2).each do |k,v|
+            de[k.value.to_sym] = v.value
+          end
+        end
+
+        ### endpoints extraction
+        addit = if tendptype == 'rest' && !tdata.empty?
+          srv = Riddl::Client.interface(tendp,@opts[:transformation_service])
+          status, res = srv.post [
+            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            Riddl::Parameter::Simple.new("type","endpoints")
+          ]
+          if status >= 200 && status < 300
+            res
+          else
+            raise 'Could not extract endpoints'
+          end
+        elsif tendptype == 'xslt' && !tdata.empty?
+          trans = XML::Smart::open_unprotected(tendp.text)
+          desc.transform_with(trans)
+        elsif tendptype == 'clean'
+          []
+        else
+          nil
+        end
+        unless addit.nil?
+          addit.each_slice(2).each do |k,v|
+            ep[k.value.to_sym] = v.value
+          end
+        end
+
+        [dslx, dsl, de, ep]
+      end #}}}
+
       def self::set(id,opts,xml)
-        dslx, dsl, de, ep = transform(
+        dslx, dsl, de, ep = PutDescription::transform(
           xml,
           CPEE::Persistence::extract_item(id,opts,'transformation/description'),
           CPEE::Persistence::extract_item(id,opts,'transformation/description/@type'),
@@ -642,6 +745,7 @@ module CPEE
           CPEE::Persistence::extract_item(id,opts,'transformation/dataelements/@type'),
           CPEE::Persistence::extract_item(id,opts,'transformation/endpoints'),
           CPEE::Persistence::extract_item(id,opts,'transformation/endpoints/@type'),
+          CPEE::Persistence::extract_item(id,opts,'executionhandler'),
           opts
         )
         CPEE::Persistence::set_item(id,opts,'description',