cpee 2.1.29 → 2.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e67e4d9fd57c8c9b51f5c5e2dd281f37fc0c219fe607c41d56e8da68cf3802
-  data.tar.gz: 5c537c87ed397e3da5a58fa9a06a410371408229d72f8302ac3f8d1aad07bddc
+  metadata.gz: e5b91153e5d1f79bffd42f93f011cce42a0595f5fe17cfd0b7f6dd5a39852518
+  data.tar.gz: 8cfccd832f88ea23ed93d4d5bda91e2b5e9414ca195e797a665911b62b2373f5
 SHA512:
-  metadata.gz: 1e2ffe8f6b2594b0d7badfef16628e2444df2762a639bbaf93f36191c44d69b81a120bd3ed66502f869689039fb8a5e1b0d7c10cfc36200101fc512678678a59
-  data.tar.gz: 6eca82caf6987dd5e17c0629be864747444efd7e0d03e202d98c4759e2b5d2d29625911d08fe11c222e8b8a8d05211f7880645c260987b9225216daa93948a82
+  metadata.gz: b1e149e8b4ae2b28df6a30d2757b29c54aab7d65ca4f51ee7d9c226b36bceb448064439ae6e93995ee0e32a0fba01b6841ab1fb8b88afbefd2483b38c426b798
+  data.tar.gz: 75a3f332f847963e76c1c8557cf14af6f9f6f0b61d7722bdc09a9a864d86ae2593a2f4a695c23e1c30a12c1fa86aa0f2ef2858d8acfeeb6653eee14578d8f03a

data/cockpit/templates/Worklist.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
   <dataelements>
@@ -7,7 +8,16 @@
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
     <worklist>http://cpee.org:9398</worklist>
   </endpoints>
-  <positions/>
+  <attributes>
+    <info>Worklist</info>
+    <modeltype>CPEE</modeltype>
+    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+    <theme>extended</theme>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>Templates.dir</design_dir>
+  </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="worklist">
@@ -16,19 +26,48 @@
           <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>
+            <domain>VirtualBusiness1</domain>
+            <form>https://cpee.org/~demo/form/form-f.html</form>
+            <role>Assistant</role>
             <schaden>55546</schaden>
             <text>fetzen hin</text>
           </arguments>
         </parameters>
         <code>
-          <finalize>data.bla = result</finalize>
+          <prepare/>
+          <finalize output="result">data.bla = result</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
         </code>
-        <annotations/>
-        <documentation/>
+        <annotations>
+          <_timing>
+            <_timing_weight/>
+            <_timing_avg/>
+            <explanations/>
+          </_timing>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+        <documentation>
+          <input/>
+          <output/>
+          <implementation>
+            <description/>
+          </implementation>
+          <code>
+            <description/>
+          </code>
+        </documentation>
       </call>
+      <stop id="a2"/>
     </description>
   </description>
   <transformation>
@@ -36,14 +75,4 @@
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
-  <attributes>
-    <info>Worklist</info>
-    <modeltype>CPEE</modeltype>
-    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
-    <theme>extended</theme>
-    <creator>Christine Ashcreek</creator>
-    <author>Christine Ashcreek</author>
-    <design_stage>development</design_stage>
-    <design_dir>Templates.dir</design_dir>
-  </attributes>
-</testset>
+</testset>

data/cockpit/themes/compact/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/control/theme.js

@@ -329,7 +329,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/default/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/extended/theme.js

@@ -329,7 +329,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/model/theme.js

@@ -292,7 +292,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/packed/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/preset/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cpee.gemspec

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

data/lib/cpee/fail.rb

@@ -0,0 +1,23 @@
+
+# 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
+  class FAIL < Riddl::Implementation #{{{
+    def response
+      @status = 404
+      nil
+    end
+  end #}}}
+end

data/lib/cpee/implementation.rb

@@ -16,6 +16,7 @@ require 'fileutils'
 require 'redis'
 require 'riddl/server'
 require 'riddl/client'
+require_relative 'fail'
 require_relative 'redis'
 require_relative 'message'
 require_relative 'persistence'
@@ -83,7 +84,7 @@ module CPEE
     opts[:sse_connections]            = {}
 
     opts[:statemachine]               = CPEE::StateMachine.new opts[:states], %w{running simulating replaying finishing stopping abandoned finished} do |id|
-      opts[:redis].get("instance:#{id}/state")
+      CPEE::Persistence::extract_item(id,opts,"state")
     end
 
     opts[:runtime_cmds]               << [
@@ -176,16 +177,14 @@ module CPEE
 
   class Instances < Riddl::Implementation #{{{
     def response
-      redis = @a[0][:redis]
+      opts = @a[0]
       Riddl::Parameter::Complex.new("wis","text/xml") do
         ins = XML::Smart::string('<instances/>')
-        redis.zrevrange('instances',0,-1).each do |instance|
-          statekey = "instance:#{instance}/state"
-          attributes = "instance:#{instance}/attributes/"
-          info = redis.get(attributes + 'info')
-          uuid = redis.get(attributes + 'uuid')
-          state = redis.get(statekey)
-          state_changed = redis.get(File.join(statekey,'@changed'))
+        CPEE::Persistence::each_object(opts) do |instance|
+          info = CPEE::Persistence::extract_item(instance,opts,'attributes/info')
+          uuid = CPEE::Persistence::extract_item(instance,opts,'attributes/uuid')
+          state = CPEE::Persistence::extract_item(instance,opts,'state')
+          state_changed = CPEE::Persistence::extract_item(instance,opts,'state/@changed')
           ins.root.add('instance', info,  'uuid' => uuid, 'id' => instance, 'state' => state, 'state_changed' => state_changed )
         end
         ins.to_s
@@ -209,9 +208,9 @@ module CPEE
       doc = XML::Smart::open_unprotected(opts[:properties_init])
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
       name     = @p[0].value
-      id       = redis.zrevrange('instances', 0, 0).first.to_i + 1
+      id       = CPEE::Persistence::new_object(opts)
       uuid     = SecureRandom.uuid
-      instance = 'instance:' + id.to_s
+      instance = CPEE::Persistence::OBJ + ':' + id.to_s
       redis.multi do |multi|
         multi.zadd('instances',id,id)
         doc.root.find(PROPERTIES_PATHS_FULL.join(' | ')).each do |e|
@@ -235,12 +234,12 @@ module CPEE
             doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
             key = File.basename(File.dirname(f))
             url = doc.find('string(/np:subscription/@url)')
-            multi.sadd("instance:#{id}/handlers",key)
-            multi.set("instance:#{id}/handlers/#{key}/url",url)
+            multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers",key)
+            multi.set(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}/url",url)
             doc.find('/np:subscription/np:topic/*').each do |e|
               c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
-              multi.sadd("instance:#{id}/handlers/#{key}",c)
-              multi.sadd("instance:#{id}/handlers/#{c}",key)
+              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}",c)
+              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{c}",key)
             end
           end rescue nil # all the ones that are not ok, are ignored
         end
@@ -251,6 +250,12 @@ module CPEE
         multi.set(File.join(instance, 'state', '@changed'), Time.now.xmlschema(3))
       end
 
+      content = {
+        :state => 'ready',
+        :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+      }
+      CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,uuid,name,content,redis)
+
       @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-UUID", uuid)
@@ -289,7 +294,18 @@ module CPEE
         @status = 404
         return
       end
-      empt = redis.keys("instance:#{id}/*").to_a
+
+      content = {
+        :state => 'purged',
+        :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+      }
+      state = CPEE::Persistence::extract_item(id,opts,'state')
+      if state == 'stopped' || state == 'ready'
+        CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,content[:attributes]['uuid'],content[:attributes]['info'],content,redis)
+      end
+
+      empt = CPEE::Persistence::keys(id,opts).to_a
+      empt.delete_if{|e| e =~ /\/handlers/ }
       redis.multi do |multi|
         multi.del empt
         multi.zrem 'instances', id
@@ -297,11 +313,4 @@ module CPEE
     end
   end #}}}
 
-    class FAIL < Riddl::Implementation #{{{
-      def response
-        @status = 404
-        nil
-      end
-    end #}}}
-
 end

data/lib/cpee/implementation_callbacks.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Callbacks
@@ -54,13 +55,13 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].sismember("instance:#{id}/callbacks",callback)
+        if CPEE::Persistence::is_member?(id,opts,'callbacks',callback)
           res = {}
-          res[:uuid] = opts[:redis].get("instance:#{id}/callback/#{callback}/uuid")
-          res[:type] = opts[:redis].get("instance:#{id}/callback/#{callback}/type")
-          res[:position] = opts[:redis].get("instance:#{id}/callback/#{callback}/position")
-          res[:label] = opts[:redis].get("instance:#{id}/callback/#{callback}/label")
-          if sub = opts[:redis].get("instance:#{id}/callback/#{callback}/subscription")
+          res[:uuid]     = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/uuid")
+          res[:type]     = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type")
+          res[:position] = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/position")
+          res[:label]    = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/label")
+          if sub = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/subscription")
             res[:subscription] = sub
           end
 
@@ -77,7 +78,7 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+        if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           CPEE::Message::send(
             :'callback-end',
             callback,
@@ -88,7 +89,7 @@ module CPEE
             {},
             opts[:redis]
           )
-        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+        elsif CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'vote'
           CPEE::Message::send(
             :'vote-response',
             callback,
@@ -112,7 +113,7 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+        if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           ret = {}
           ret['values'] = @p.map{ |e|
             [e.name, e.class == Riddl::Parameter::Simple ? [:simple,e.value] : [:complex,e.mimetype,e.value.path] ]
@@ -129,7 +130,7 @@ module CPEE
             ret,
             opts[:redis]
           )
-        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+        elsif CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'vote'
           if @p.length == 1 && @p[0].name == 'continue' && @p[0].class == Riddl::Parameter::Simple
             CPEE::Message::send(
               :'vote-response',

data/lib/cpee/implementation_notifications.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Notifications
@@ -188,7 +189,7 @@ module CPEE
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'
             id, key = what.match(/forward:([^\/]+)\/(.+)/).captures
-            if sse = opts.dig(:sse_connections,id.to_i,key)
+            if sse = opts.dig(:sse_connections,id,key)
               sse.send message
             else
               DeleteSubscription::set(id,opts,key)
@@ -197,7 +198,7 @@ module CPEE
             mess = JSON.parse(message[message.index(' ')+1..-1])
             state = mess.dig('content','state')
             if state == 'finished' || state == 'abandoned'
-              opts.dig(:sse_connections,mess.dig('instance').to_i)&.each do |key,sse|
+              opts.dig(:sse_connections,mess.dig('instance').to_s)&.each do |key,sse|
                 EM.add_timer(10) do # just to be sure that all messages arrived. 10 seconds should be enough ... we think ... therefore we are (not sure)
                   sse.close
                 end
@@ -218,7 +219,7 @@ module CPEE
     class SSE < Riddl::SSEImplementation #{{{
       def onopen
         @opts = @a[1]
-        @id = @a[0]
+        @id = @a[0].to_s
         @key = @r[-2]
         if CPEE::Persistence::exists_handler?(@id,@opts,@key)
           @opts[:sse_connections][@id] ||= {}

data/lib/cpee/implementation_properties.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require_relative 'attributes_helper'
+require_relative 'fail'
 require_relative 'value_helper'
 require 'json'
 require 'erb'

data/lib/cpee/message.rb

@@ -15,25 +15,27 @@
 module CPEE
 
   module Message
+    WHO = 'cpee'
+    TYPE = 'instance'
 
     def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend)
       topic = ::File::dirname(event)
       name = ::File::basename(event)
+      payload = {
+        WHO => cpee,
+        TYPE + '-url' => File.join(cpee,instance.to_s),
+        TYPE => instance,
+        'topic' => topic,
+        'type' => type,
+        'name' => name,
+        'timestamp' =>  Time.now.xmlschema(3),
+        'content' => content
+      }
+      payload[TYPE + '-uuid'] = instance_uuid if instance_uuid
+      payload[TYPE + '-name'] = instance_name if instance_name
       backend.publish(type.to_s + ':' + event,
         instance.to_s + ' ' +
-        JSON::generate(
-          { 'cpee' => cpee,
-            'instance-url' => File.join(cpee,instance.to_s),
-            'instance-uuid' => instance_uuid,
-            'instance-name' => instance_name,
-            'instance' => instance,
-            'topic' => topic,
-            'type' => type,
-            'name' => name,
-            'timestamp' =>  Time.now.xmlschema(3),
-            'content' => content
-          }
-        )
+        JSON::generate(payload)
       )
     end
 

data/lib/cpee/persistence.rb

@@ -15,6 +15,8 @@
 module CPEE
 
   module Persistence
+    OBJ = 'instance'
+
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h
@@ -37,13 +39,13 @@ module CPEE
       )
     end #}}}
     def self::extract_set(id,opts,item) #{{{
-      opts[:redis].smembers("instance:#{id}/#{item}").map do |e|
-        [e,opts[:redis].get("instance:#{id}/#{item}/#{e}")]
+      opts[:redis].smembers(OBJ + ":#{id}/#{item}").map do |e|
+        [e,opts[:redis].get(OBJ + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
     def self::extract_list(id,opts,item) #{{{
-      opts[:redis].zrange("instance:#{id}/#{item}",0,-1).map do |e|
-        [e,opts[:redis].get("instance:#{id}/#{item}/#{e}")]
+      opts[:redis].zrange(OBJ + ":#{id}/#{item}",0,-1).map do |e|
+        [e,opts[:redis].get(OBJ + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
 
@@ -60,15 +62,32 @@ module CPEE
       )
     end #}}}
     def self::extract_item(id,opts,item) #{{{
-      opts[:redis].get("instance:#{id}/#{item}")
+      opts[:redis].get(OBJ + ":#{id}/#{item}")
     end #}}}
 
     def self::exists?(id,opts) #{{{
-      opts[:redis].exists?("instance:#{id}/state")
+      opts[:redis].exists?(OBJ + ":#{id}/state")
     end #}}}
+    def self::is_member?(id,opts,item,value) #{{{
+      opts[:redis].sismember(OBJ + ":#{id}/#{item}",value)
+    end  #}}}
+
+    def self::each_object(opts)
+      opts[:redis].zrevrange(OBJ + 's',0,-1).each do |instance|
+        yield instance
+      end
+    end
+
+    def self::new_object(opts)
+      opts[:redis].zrevrange(OBJ + 's', 0, 0).first.to_i + 1
+    end
+
+    def self::keys(id,opts,item=nil)
+      opts[:redis].keys(File.join(OBJ + ":#{id}",item.to_s,'*'))
+    end
 
     def self::set_handler(id,opts,key,url,values,update=false) #{{{
-      exis = opts[:redis].smembers("instance:#{id}/handlers/#{key}")
+      exis = opts[:redis].smembers(OBJ + ":#{id}/handlers/#{key}")
 
       if update == false && exis.length > 0
         return 405
@@ -101,14 +120,14 @@ module CPEE
       200
     end #}}}
     def self::extract_handler(id,opts,key) #{{{
-      opts[:redis].smembers("instance:#{id}/handlers/#{key}")
+      opts[:redis].smembers(OBJ + ":#{id}/handlers/#{key}")
     end #}}}
     def self::exists_handler?(id,opts,key) #{{{
-      opts[:redis].exists?("instance:#{id}/handlers/#{key}")
+      opts[:redis].exists?(OBJ + ":#{id}/handlers/#{key}")
     end #}}}
     def self::extract_handlers(id,opts) #{{{
-      opts[:redis].smembers("instance:#{id}/handlers").map do |e|
-        [e, opts[:redis].get("instance:#{id}/handlers/#{e}/url")]
+      opts[:redis].smembers(OBJ + ":#{id}/handlers").map do |e|
+        [e, opts[:redis].get(OBJ + ":#{id}/handlers/#{e}/url")]
       end
     end #}}}
   end

data/server/executionhandlers/ruby/connection.rb

@@ -220,6 +220,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       elsif result[0].is_a? Riddl::Parameter::Complex
         if result[0].mimetype == 'application/json'
           result = JSON::parse(result[0].value.read) rescue nil
+        elsif result[0].mimetype == 'text/yaml'
+          result = YAML::load(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
           result = XML::Smart::string(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'text/plain'

data/server/executionhandlers/ruby/controller.rb

@@ -21,6 +21,7 @@ require 'cpee/value_helper'
 require 'cpee/attributes_helper'
 require 'cpee/message'
 require 'cpee/redis'
+require 'cpee/persistence'
 
 require 'ostruct'
 class ParaStruct < OpenStruct
@@ -41,8 +42,8 @@ class Controller
     @id = id
 
     @attributes = {}
-    @redis.keys("instance:#{id}/attributes/*").each do |key|
-      @attributes[File.basename(key)] = @redis.get(key)
+    CPEE::Persistence::extract_list(id,opts,'attributes').each do |de|
+      @attributes[de[0]] = de[1]
     end
 
     @attributes_helper = AttributesHelper.new
@@ -152,7 +153,8 @@ class Controller
     topic, name = what.split('/')
     handler = File.join(topic,'vote',name)
     votes = []
-    @redis.smembers("instance:#{id}/handlers/#{handler}").each do |client|
+
+    CPEE::Persistence::extract_handler(id,@opts,handler).each do |client|
       voteid = Digest::MD5.hexdigest(Kernel::rand().to_s)
       content[:key] = voteid
       content[:attributes] = attributes_translated

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -6,10 +6,10 @@
   <xsl:template match="/">
     <xsl:text>control flow do</xsl:text>
     <xsl:call-template name="print-newline"/>
-    <xsl:apply-templates select="//d:description"/>
+    <xsl:apply-templates select="/d:description"/>
     <xsl:text>end</xsl:text>
   </xsl:template>
-  <xsl:template match="//d:description">
+  <xsl:template match="/d:description">
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
         <xsl:value-of select="0*$myspacemultiplier"/>

data/server/routing/end.pid

@@ -0,0 +1 @@
+1772897

data/server/routing/forward-events.pid

@@ -0,0 +1 @@
+1772901

data/server/routing/forward-events.rb

@@ -62,6 +62,12 @@ Daemonite.new do |opts|
             end
           end
         end
+        unless opts[:redis].exists?("instance:#{instance}/state")
+          empt = opts[:redis].keys("instance:#{instance}/*").to_a
+          opts[:redis].multi do |multi|
+            multi.del empt
+          end
+        end
       rescue => e
         puts e.message
         puts e.backtrace

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+1772905

data/server/routing/persist.pid

@@ -0,0 +1 @@
+1772911

data/server/routing/persist.rb

@@ -66,8 +66,10 @@ Daemonite.new do |opts|
             end
           when 'event:state/change'
             opts[:redis].multi do |multi|
-              multi.set("instance:#{instance}/state",mess.dig('content','state'))
-              multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
+              unless mess.dig('content','state') == 'purged'
+                multi.set("instance:#{instance}/state",mess.dig('content','state'))
+                multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
+              end
             end
           when 'event:executionhandler/change'
             opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))

data/server/server.conf

@@ -1,4 +1,4 @@
 :host:   tango.wst.univie.ac.at
 :port:   8298
-:url:    http://tango.wst.univie.ac.at:8298
+:url:    http://tango.wst.univie.ac.at/flow/engine/
 :secure: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.29
+  version: 2.1.30
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -221,30 +221,20 @@ files:
 - 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
 - cockpit/templates/Subprocess.xml
-- cockpit/templates/Subprocess.xml.active
-- cockpit/templates/Subprocess.xml.active-uuid
 - cockpit/templates/Subprocess.xml.attrs
 - cockpit/templates/Track Test Local.xml
 - cockpit/templates/Track Test.xml
-- cockpit/templates/Track Test.xml.active
-- cockpit/templates/Track Test.xml.active-uuid
 - cockpit/templates/Track Test.xml.attrs
 - cockpit/templates/UR-VUE 2020 Manual Adjust.xml
 - cockpit/templates/UR-VUE 2020 Solution Baseline.xml
-- cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active
-- cockpit/templates/UR-VUE 2020 Solution Baseline.xml.active-uuid
 - cockpit/templates/UR-VUE 2020 Solution NN.xml
 - cockpit/templates/UR-VUE 2020 Solution View.xml
 - cockpit/templates/UR-VUE 2020.xml
 - cockpit/templates/Wait.xml
-- cockpit/templates/Wait.xml.active
-- cockpit/templates/Wait.xml.active-uuid
 - cockpit/templates/Wait.xml.attrs
 - cockpit/templates/Worklist.xml
 - cockpit/templates/instantiate.local/Take_Sub.xml
@@ -616,6 +606,7 @@ files:
 - lib/callbacks/callbacks.rng
 - lib/cpee.xml
 - lib/cpee/attributes_helper.rb
+- lib/cpee/fail.rb
 - lib/cpee/implementation.rb
 - lib/cpee/implementation_callbacks.rb
 - lib/cpee/implementation_notifications.rb
@@ -672,9 +663,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

data/cockpit/templates/Coopis 2010.xml.active

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

data/cockpit/templates/Coopis 2010.xml.active-uuid

@@ -1 +0,0 @@
-692f7da6-a212-4876-9e72-dd8fc242651d

data/cockpit/templates/Subprocess.xml.active

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

data/cockpit/templates/Subprocess.xml.active-uuid

@@ -1 +0,0 @@
-e109897c-8484-4d87-b7d3-8786731a2f0a

data/cockpit/templates/Track Test.xml.active

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

data/cockpit/templates/Track Test.xml.active-uuid

@@ -1 +0,0 @@
-92a04ef3-759d-451b-97ef-a5dab3c8809a

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

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

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

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

data/cockpit/templates/Wait.xml.active

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

data/cockpit/templates/Wait.xml.active-uuid

@@ -1 +0,0 @@
-bf96a05e-845c-4f6e-88a8-b0d0d0ea9b8f