cpee 2.1.26 → 2.1.32

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'
@@ -25,71 +26,75 @@ module CPEE
 
     def self::implementation(id,opts)
       Proc.new do
-        run CPEE::Properties::Get, id, opts if get
-        run CPEE::Properties::Patch, id, opts if patch 'set-some-properties'
-        run CPEE::Properties::Put, id, opts if put 'set-some-properties'
-        on resource 'state' do
-          run CPEE::Properties::GetStateMachine, id, opts if get 'machine'
-          run CPEE::Properties::GetState, id, opts if get
-          run CPEE::Properties::PutState, id, opts if put 'state'
-          on resource '@changed' do
-            run CPEE::Properties::GetStateChanged, id, opts if get
-          end
-        end
-        on resource 'status' do
-          run CPEE::Properties::GetStatus, id, opts if get
-          run CPEE::Properties::PutStatus, id, opts if put 'status'
-          on resource 'id' do
-            run CPEE::Properties::GetStatusID, id, opts if get
-          end
-          on resource 'message' do
-            run CPEE::Properties::GetStatusMessage, id, opts if get
-          end
-        end
-        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
-          run CPEE::Properties::PatchPositions, id, opts if patch 'positions'
-          run CPEE::Properties::PutPositions, id, opts if put 'positions'
-          run CPEE::Properties::PostPositions, id, opts if post 'position'
-          on resource do
-            run CPEE::Properties::GetDetail, 'positions', id, opts if get
-            run CPEE::Properties::SetDetail, id, opts if put 'detail'
-            run CPEE::Properties::DelDetail, id, opts if delete
-            on resource '@passthrough' do
-              run CPEE::Properties::GetPt, id, opts if get
+        if CPEE::Persistence::exists?(id,opts)
+          run CPEE::Properties::Get, id, opts if get
+          run CPEE::Properties::Patch, id, opts if patch 'set-some-properties'
+          run CPEE::Properties::Put, id, opts if put 'set-some-properties'
+          on resource 'state' do
+            run CPEE::Properties::GetStateMachine, id, opts if get 'machine'
+            run CPEE::Properties::GetState, id, opts if get
+            run CPEE::Properties::PutState, id, opts if put 'state'
+            on resource '@changed' do
+              run CPEE::Properties::GetStateChanged, id, opts if get
             end
           end
-        end
-        %w{dataelements endpoints attributes}.each do |ele|
-          on resource ele do
-            run CPEE::Properties::GetItems, ele, id, opts if get
-            run CPEE::Properties::PatchItems, ele, id, opts if patch ele
-            run CPEE::Properties::PutItems, ele, id, opts if put ele
-            run CPEE::Properties::PostItem, ele, id, opts if post ele[0..-2]
+          on resource 'status' do
+            run CPEE::Properties::GetStatus, id, opts if get
+            run CPEE::Properties::PutStatus, id, opts if put 'status'
+            on resource 'id' do
+              run CPEE::Properties::GetStatusID, id, opts if get
+            end
+            on resource 'message' do
+              run CPEE::Properties::GetStatusMessage, id, opts if get
+            end
+          end
+          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
+            run CPEE::Properties::PatchPositions, id, opts if patch 'positions'
+            run CPEE::Properties::PutPositions, id, opts if put 'positions'
+            run CPEE::Properties::PostPositions, id, opts if post 'position'
             on resource do
-              run CPEE::Properties::GetItem, ele, id, opts if get
-              run CPEE::Properties::SetItem, ele, id, opts if put 'string'
-              run CPEE::Properties::DelItem, ele, id, opts if delete
+              run CPEE::Properties::GetDetail, 'positions', id, opts if get
+              run CPEE::Properties::SetDetail, id, opts if put 'detail'
+              run CPEE::Properties::DelDetail, id, opts if delete
+              on resource '@passthrough' do
+                run CPEE::Properties::GetPt, id, opts if get
+              end
             end
           end
-        end
-        on resource 'dsl' do
-          run CPEE::Properties::GetComplex, 'dsl', 'text/plain', id, opts if get
-        end
-        on resource 'dslx' do
-          run CPEE::Properties::GetComplex, 'dslx', 'text/xml', id, opts if get
-        end
-        on resource 'description' do
-          run CPEE::Properties::GetComplex, 'description', 'text/xml', id, opts if get
-          run CPEE::Properties::PutDescription, id, opts if put 'description'
-        end
-        on resource 'transformation' do
-          run CPEE::Properties::GetTransformation, id, opts if get
-          run CPEE::Properties::PutTransformation, id, opts if put 'transformation'
+          %w{dataelements endpoints attributes}.each do |ele|
+            on resource ele do
+              run CPEE::Properties::GetItems, ele, id, opts if get
+              run CPEE::Properties::PatchItems, ele, id, opts if patch ele
+              run CPEE::Properties::PutItems, ele, id, opts if put ele
+              run CPEE::Properties::PostItem, ele, id, opts if post ele[0..-2]
+              on resource do
+                run CPEE::Properties::GetItem, ele, id, opts if get
+                run CPEE::Properties::SetItem, ele, id, opts if put 'string'
+                run CPEE::Properties::DelItem, ele, id, opts if delete
+              end
+            end
+          end
+          on resource 'dsl' do
+            run CPEE::Properties::GetComplex, 'dsl', 'text/plain', id, opts if get
+          end
+          on resource 'dslx' do
+            run CPEE::Properties::GetComplex, 'dslx', 'text/xml', id, opts if get
+          end
+          on resource 'description' do
+            run CPEE::Properties::GetComplex, 'description', 'text/xml', id, opts if get
+            run CPEE::Properties::PutDescription, id, opts if put 'description'
+          end
+          on resource 'transformation' do
+            run CPEE::Properties::GetTransformation, id, opts if get
+            run CPEE::Properties::PutTransformation, id, opts if put 'transformation'
+          end
+        else
+          run CPEE::FAIL
         end
       end
     end
@@ -222,7 +227,7 @@ module CPEE
     end #}}}
     class PutState < Riddl::Implementation #{{{
       def self::set(id,opts,state)
-        CPEE::Persistence::set_item(id,opts,'state',:state => state, :timestamp => Time.now.xmlschema(3))
+        CPEE::Persistence::set_item(id,opts,'state',:state => state, :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h)
       end
 
       def self::run(id,opts,state)

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,11 +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?(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
@@ -97,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

@@ -77,7 +77,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
 
   def additional #{{{
-    { :attributes => @controller.attributes }
+    {
+      :attributes => @controller.attributes,
+      :cpee => {
+        'base' => @controller.base_url,
+        'instance' => @controller.instance_id,
+        'instance_url' => @controller.instance_url,
+        'instance_uuid' => @controller.uuid
+      }
+    }
   end #}}}
 
   def proto_curl(parameters) #{{{
@@ -149,8 +157,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def activity_handle(passthrough, parameters) # {{{
     raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
     @label = parameters[:label]
-    @anno = parameters[:annotations]
-    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :annotations => anno)
+    @anno = parameters.delete(:annotations) rescue nil
+    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :annotations => @anno)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -198,7 +206,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @controller.notify("status/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil? || changed_dataelements.empty?
-      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'OTHER' ? v.inspect : (v.encode('UTF-8',enc) rescue convert_to_base64(v))) }
+      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue convert_to_base64(v))) }
       @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => de)
     end
     unless changed_endpoints.nil? || changed_endpoints.empty?
@@ -220,6 +228,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'
@@ -276,7 +286,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
             ''
           else
             enc = detect_encoding(ttt)
-            enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
+            enc == 'OTHER' ? ttt : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
           end
         elsif r.mimetype == 'text/plain' || r.mimetype == 'text/html'
           ttt = r.value.read

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
@@ -52,9 +53,9 @@ class Controller
     @loop_guard = {}
 
     @callback_keys = {}
-    @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
 
-    Thread.new do
+    @subs = Thread.new do
+      @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
       @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
         on.pmessage do |pat, what, message|
           if pat == 'callback-response:*' && @callback_keys.has_key?(what[18..-1])
@@ -77,6 +78,10 @@ class Controller
           end
         end
       end
+      @psredis.close
+    rescue =>  e
+      sleep 1
+      retry
     end
   end
 
@@ -136,7 +141,6 @@ class Controller
         CPEE::Message::send(:'vote-response',key,base,@id,uuid,info,true,@redis)
       end
     end
-    @thread.join if !@thread.nil? && @thread.alive?
   end
 
   def info
@@ -152,7 +156,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"/>
@@ -417,7 +417,9 @@
     <xsl:text>:</xsl:text>
     <xsl:value-of select="name()"/>
     <xsl:text> =&gt; </xsl:text>
-    <xsl:apply-templates select="d:*" mode="plainmulti"/>
+    <xsl:text>{ </xsl:text>
+    <xsl:apply-templates select="d:*" mode="simplemulti"/>
+    <xsl:text> }</xsl:text>
   </xsl:template>
   <xsl:template match="d:*[not(name()='label')]" mode="parameter">
     <xsl:if test="count(preceding-sibling::*) &gt; 0">, </xsl:if>
@@ -507,6 +509,34 @@
     </xsl:choose>
     <xsl:text> }</xsl:text>
   </xsl:template>
+  <xsl:template match="d:*" mode="simplemulti">
+    <xsl:if test="count(preceding-sibling::*) &gt; 0">, </xsl:if>
+    <xsl:text>:</xsl:text>
+    <xsl:value-of select="name()"/>
+    <xsl:text> =&gt; </xsl:text>
+    <xsl:choose>
+      <xsl:when test="count(*) &gt; 0">
+        <xsl:text>{</xsl:text>
+        <xsl:apply-templates select="d:*" mode="plain"/>
+        <xsl:text>}</xsl:text>
+      </xsl:when>
+      <xsl:when test="not(node())">
+        <xsl:text>nil</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="substring(text(),1,1) = '!'">
+            <xsl:value-of select="substring(text(),2)"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>"</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(text(),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>"</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
   <xsl:template name="format-name">
     <xsl:param name="tname"/>
     <xsl:choose>
@@ -719,9 +749,9 @@
               <xsl:otherwise>
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
-                    <xsl:text>#{</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-                    <xsl:text>.to_json}</xsl:text>
+                    <xsl:text>#{(</xsl:text>
+                    <xsl:value-of select="substring(.,2)"/>
+                    <xsl:text>).to_json}</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:text>\"</xsl:text>

data/server/routing/end.pid

@@ -0,0 +1 @@
+2206017

data/server/routing/forward-events.pid

@@ -0,0 +1 @@
+2206021

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 @@
+2206025

data/server/routing/persist.pid

@@ -0,0 +1 @@
+2206029

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.26
+  version: 2.1.32
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -221,20 +221,22 @@ 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/Frames.xml
 - 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.attrs
 - cockpit/templates/Track Test Local.xml
 - cockpit/templates/Track Test.xml
+- 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.attrs
 - cockpit/templates/Worklist.xml
 - cockpit/templates/instantiate.local/Take_Sub.xml
 - cockpit/templates/instantiate/Take_Perf.xml
@@ -605,6 +607,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
@@ -661,9 +664,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/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