cpee 2.0.6 → 2.0.13

data/server/handlerwrappers/default.rb

@@ -126,6 +126,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       if headers['CPEE_INSTANTIATION']
         @controller.notify("task/instantiation", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
       end
+      if headers['CPEE_EVENT']
+        @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
+      end
       if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
         headers['CPEE_UPDATE'] = true
         callback result, headers

data/server/routing/forward-events.rb

@@ -39,7 +39,8 @@ Daemonite.new do |opts|
             if url.nil? || url == ""
               redis.publish("forward:#{instance}/#{key}",mess)
             else
-              client = Riddl::Client.new(url,'http://riddl.org/ns/common-patterns/notifications-consumer/2.0/consumer.xml')
+              p "#{type}/#{topic}/#{event}-#{url}"
+              client = Riddl::Client.new(url)
               client.post [
                 Riddl::Parameter::Simple::new('type',type),
                 Riddl::Parameter::Simple::new('topic',topic),

data/server/routing/forward-votes.rb

@@ -70,7 +70,7 @@ Daemonite.new do |opts|
               persist_handler instance, callback_key, m, redis
               redis.publish("forward:#{instance}/#{subscription_key}",mess)
             else
-              client = Riddl::Client.new(url,'http://riddl.org/ns/common-patterns/notifications-consumer/2.0/consumer.xml')
+              client = Riddl::Client.new(url)
               callback = m['instance-url'] + '/callbacks/' + subscription_key
               status, result, headers = (client.post [
                 Riddl::Header.new("CPEE-BASE",m['cpee']),

data/server/server.conf

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

data/tools/cpee

@@ -117,6 +117,16 @@ elsif command == 'convert'
         doc.find('//x:start_git').each do |e|
           e.text = 'https://centurio.work/flow-test/start/git/'
         end rescue nil
+        doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
+          if e.parent.qname.name != 'code'
+            n = e.parent
+            if (x = n.find('d:code')).any?
+              x.first.add(e)
+            else
+              n.add('d:code').add(e)
+            end
+          end
+        end rescue nil
 
         doc.find('//p:*').each do |e|
           e.namespaces.delete_all!
@@ -152,7 +162,7 @@ elsif command == 'archive'
         XML::Smart.string(res.response_body) do |doc|
           if doc.root.qname.to_s == "instances"
             doc.root.children.each do |i|
-              if ["finished","abandoned"].include?(i.attributes['state'])
+              if ["finished","abandoned"].include?(i.attributes['state']) || (["ready"].include?(i.attributes['state']) && Time.parse(i.attributes['changed']).to_i < Time.now-(60*60*24))
                 prop = Typhoeus.get(File.join(base,name.to_s,i.attributes['id'],'properties','/'))
                 if prop.success?
                   File.write(File.join(p1,i.attributes['uuid'] + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
@@ -165,11 +175,10 @@ elsif command == 'archive'
             if prop.success?
               xprop = XML::Smart::string(prop.response_body)
               xprop.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-              if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)"))
+              if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)")) || (["ready"].include?(xprop.find("string(/p:properties/p:state)")) && Time.parse(xprop.find("string(/p:properties/p:state/@changed)")) < Time.now-(60*60*12))
                 uuid = xprop.find("string(/p:properties/p:attributes/p:uuid)")
                 id = name.to_s
                 File.write(File.join(p1,uuid + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
-                p File.join(base,name.to_s,'/')
                 Typhoeus.delete(File.join(base,name.to_s,'/'))
               end
             end
@@ -200,11 +209,10 @@ elsif command == 'abandon'
     names << File.basename(p1)
   end
   names.each do |name|
-    res = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
-    if res.success?
-      case res.response_body
-        when "ready", "stopped" then
-          Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res1.success?
+      if res1.response_body == 'ready' || res1.response_body == 'stopped'
+        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
       end
     end
   end
@@ -246,7 +254,7 @@ elsif command == 'delete!'
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.cp_r("#{curpath}/server/",p1)
-    FileUtils.cp_r("#{curpath}/archive/",p1)
+    FileUtils.mkdir("#{p1}/archive") rescue nil
     FileUtils.mkdir("#{p1}/instances") rescue nil
     FileUtils.mkdir("#{p1}/resources") rescue nil
     FileUtils.mkdir("#{p1}/handlerwrappers") rescue nil

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.13
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Ralph Vigne
 - Gerhard Stuermer
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.108'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.108'
 - !ruby/object:Gem::Dependency
   name: weel
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ files:
 - README.md
 - Rakefile
 - cockpit/README
+- cockpit/config.json
 - cockpit/contrib/graph_example.svg
 - cockpit/contrib/legend.svg
 - cockpit/contrib/symbols.svg
@@ -127,6 +128,7 @@ files:
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
+- cockpit/edit.html
 - cockpit/graph.html
 - cockpit/index.html
 - cockpit/js/details.js
@@ -192,8 +194,13 @@ files:
 - 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/Track Test Local.xml
+- cockpit/templates/Track Test.xml
 - cockpit/templates/Worklist.xml
-- cockpit/templates/convert_cpee2.rb
+- cockpit/templates/instantiate.local/Take_Sub.xml
+- cockpit/templates/instantiate/Take_Perf.xml
+- cockpit/templates/instantiate/Take_Sub.xml
+- cockpit/templates/instantiate/Take_X.xml
 - cockpit/themes/compact/rngs/alternative.rng
 - cockpit/themes/compact/rngs/call.rng
 - cockpit/themes/compact/rngs/callmanipulate.rng
@@ -234,7 +241,6 @@ files:
 - cockpit/themes/compact/symbols/stop.svg
 - cockpit/themes/compact/symbols/terminate.svg
 - cockpit/themes/compact/theme.js
-- cockpit/themes/convert_cpee2.rb
 - cockpit/themes/default/rngs/alternative.rng
 - cockpit/themes/default/rngs/call.rng
 - cockpit/themes/default/rngs/callmanipulate.rng
@@ -506,6 +512,7 @@ files:
 - server/routing/forward-events.rb
 - server/routing/forward-votes.rb
 - server/routing/persist.rb
+- server/server.conf
 - server/server.rb
 - tools/cpee
 - tools/server/resources/notifications/logging/subscription.xml
@@ -515,7 +522,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -530,8 +537,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 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/cockpit/templates/convert_cpee2.rb

@@ -1,15 +0,0 @@
-#!/usr/bin/ruby
-require 'xml/smart'
-
-Dir['*.xml'].each do |f|
-  XML::Smart.modify(f) do |doc|
-    doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-    doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
-    if doc.root.qname.name == 'testset'
-      doc.find('//attributes | //endpoints | //dataelements | //positions | //transformation | //handlerwrapper | //description').each do |e|
-        e.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
-        e.namespace = nil
-      end
-    end
-  end
-end

data/cockpit/themes/convert_cpee2.rb

@@ -1,8 +0,0 @@
-#!/usr/bin/ruby
-require 'xml/smart'
-
-Dir['*.rng'].each do |f|
-  XML::Smart.modify(f) do |doc|
-    doc.root.attributes['ns'] = 'http://cpee.org/ns/description/1.0'
-  end
-end