cpee 2.0.9 → 2.0.16

data/server/handlerwrappers/default.rb

@@ -24,11 +24,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
   def self::inform_state_change(arguments,newstate) # {{{
     controller = arguments[0]
-		controller.notify("state/change", :state => newstate, :timestamp => Time.now.xmlschema(3))
-  end # }}}
-  def self::inform_state_change(arguments,newstate) # {{{
-    controller = arguments[0]
-		controller.notify("state/change", :state => newstate, :timestamp => Time.now.xmlschema(3))
+		controller.notify("state/change", :state => newstate)
   end # }}}
   def self::inform_syntax_error(arguments,err,code)# {{{
     controller = arguments[0]
@@ -126,6 +122,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']),
@@ -86,7 +86,11 @@ Daemonite.new do |opts|
                 Riddl::Parameter::Complex::new('notification','application/json',mess)
               ] rescue [ 0, [], []])
               if status >= 200 && status < 300
-                val = result[0].value.read
+                val = if result[0].class == Riddl::Parameter::Simple
+                  result[0].value
+                else
+                  result[0].value.read
+                end
                 if (headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true') || val == 'callback'
                   persist_handler instance, callback_key, m, redis
                 else # they may send true or false

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

@@ -65,7 +65,7 @@ p2      = ARGV[2]
 cockpit = "#{curpath}/../cockpit/"
 
 def js_libs(cockpit)
-  res = Typhoeus.get('http://cpee.org/js_libs/js_libs.zip')
+  res = Typhoeus.get('https://cpee.org/js_libs/js_libs.zip')
   if res.success?
     File.write(File.join(cockpit,'js_libs.zip'),res.response_body)
     Zip::File.open(File.join(cockpit,'js_libs.zip')) do |zip_file|
@@ -162,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/
@@ -175,7 +175,7 @@ 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/
@@ -209,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

data/tools/server/server.rb

@@ -10,6 +10,7 @@ Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do |opts|
 
   accessible_description true
   cross_site_xhr true
+  process_out false
 
   use CPEE::implementation(opts)
 end.loop!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.16
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-11-13 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
@@ -183,21 +185,30 @@ files:
 - cockpit/templates.legacy/convert_preset.rb
 - cockpit/templates.legacy/testsets.xml
 - cockpit/templates.legacy/transformations.xml
-- cockpit/templates/BPM 2020 Manual Adjust.xml
-- cockpit/templates/BPM 2020 Solution Baseline.xml
-- cockpit/templates/BPM 2020 Solution NN.xml
-- cockpit/templates/BPM 2020 Solution View.xml
-- cockpit/templates/BPM 2020.xml
 - cockpit/templates/Coopis 2010.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/Track Test Local.xml
+- cockpit/templates/Track Test.xml
+- cockpit/templates/UR-VUE 2020 Manual Adjust.xml
+- cockpit/templates/UR-VUE 2020 Solution Baseline.xml
+- cockpit/templates/UR-VUE 2020 Solution NN.xml
+- cockpit/templates/UR-VUE 2020 Solution View.xml
+- cockpit/templates/UR-VUE 2020.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
 - cockpit/themes/compact/rngs/choose.rng
+- cockpit/themes/compact/rngs/closed_loop.rng
+- cockpit/themes/compact/rngs/closed_loop_cancel.rng
+- cockpit/themes/compact/rngs/closed_loop_control.rng
+- cockpit/themes/compact/rngs/closed_loop_measuring.rng
 - cockpit/themes/compact/rngs/critical.rng
 - cockpit/themes/compact/rngs/escape.rng
 - cockpit/themes/compact/rngs/group.rng
@@ -216,6 +227,10 @@ files:
 - cockpit/themes/compact/symbols/choose.svg
 - cockpit/themes/compact/symbols/choose_exclusive.svg
 - cockpit/themes/compact/symbols/choose_inclusive.svg
+- cockpit/themes/compact/symbols/closed_loop.svg
+- cockpit/themes/compact/symbols/closed_loop_cancel.svg
+- cockpit/themes/compact/symbols/closed_loop_control.svg
+- cockpit/themes/compact/symbols/closed_loop_measuring.svg
 - cockpit/themes/compact/symbols/complex.svg
 - cockpit/themes/compact/symbols/critical.svg
 - cockpit/themes/compact/symbols/end.svg
@@ -234,11 +249,14 @@ 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
 - cockpit/themes/default/rngs/choose.rng
+- cockpit/themes/default/rngs/closed_loop.rng
+- cockpit/themes/default/rngs/closed_loop_cancel.rng
+- cockpit/themes/default/rngs/closed_loop_control.rng
+- cockpit/themes/default/rngs/closed_loop_measuring.rng
 - cockpit/themes/default/rngs/critical.rng
 - cockpit/themes/default/rngs/escape.rng
 - cockpit/themes/default/rngs/group.rng
@@ -257,6 +275,10 @@ files:
 - cockpit/themes/default/symbols/choose.svg
 - cockpit/themes/default/symbols/choose_exclusive.svg
 - cockpit/themes/default/symbols/choose_inclusive.svg
+- cockpit/themes/default/symbols/closed_loop.svg
+- cockpit/themes/default/symbols/closed_loop_cancel.svg
+- cockpit/themes/default/symbols/closed_loop_control.svg
+- cockpit/themes/default/symbols/closed_loop_measuring.svg
 - cockpit/themes/default/symbols/complex.svg
 - cockpit/themes/default/symbols/critical.svg
 - cockpit/themes/default/symbols/end.svg
@@ -274,10 +296,62 @@ files:
 - cockpit/themes/default/symbols/start.svg
 - cockpit/themes/default/symbols/stop.svg
 - cockpit/themes/default/symbols/terminate.svg
+- cockpit/themes/diana/rngs/alternative.rng
+- cockpit/themes/diana/rngs/call.rng
+- cockpit/themes/diana/rngs/callmanipulate.rng
+- cockpit/themes/diana/rngs/choose.rng
+- cockpit/themes/diana/rngs/closed_loop.rng
+- cockpit/themes/diana/rngs/closed_loop_cancel.rng
+- cockpit/themes/diana/rngs/closed_loop_control.rng
+- cockpit/themes/diana/rngs/closed_loop_measuring.rng
+- cockpit/themes/diana/rngs/critical.rng
+- cockpit/themes/diana/rngs/escape.rng
+- cockpit/themes/diana/rngs/group.rng
+- cockpit/themes/diana/rngs/loop.rng
+- cockpit/themes/diana/rngs/manipulate.rng
+- cockpit/themes/diana/rngs/otherwise.rng
+- cockpit/themes/diana/rngs/parallel.rng
+- cockpit/themes/diana/rngs/parallel_branch.rng
+- cockpit/themes/diana/rngs/scripts.rng
+- cockpit/themes/diana/rngs/stop.rng
+- cockpit/themes/diana/rngs/terminate.rng
+- cockpit/themes/diana/symbols/alternative.svg
+- cockpit/themes/diana/symbols/arrow.svg
+- cockpit/themes/diana/symbols/call.svg
+- cockpit/themes/diana/symbols/callmanipulate.svg
+- cockpit/themes/diana/symbols/choose.svg
+- cockpit/themes/diana/symbols/choose_exclusive.svg
+- cockpit/themes/diana/symbols/choose_inclusive.svg
+- cockpit/themes/diana/symbols/closed_loop.svg
+- cockpit/themes/diana/symbols/closed_loop_cancel.svg
+- cockpit/themes/diana/symbols/closed_loop_control.svg
+- cockpit/themes/diana/symbols/closed_loop_measuring.svg
+- cockpit/themes/diana/symbols/complex.svg
+- cockpit/themes/diana/symbols/critical.svg
+- cockpit/themes/diana/symbols/end.svg
+- cockpit/themes/diana/symbols/escape.svg
+- cockpit/themes/diana/symbols/event_end.svg
+- cockpit/themes/diana/symbols/loop.svg
+- cockpit/themes/diana/symbols/manipulate.svg
+- cockpit/themes/diana/symbols/otherwise.svg
+- cockpit/themes/diana/symbols/parallel.svg
+- cockpit/themes/diana/symbols/parallel_branch.svg
+- cockpit/themes/diana/symbols/parallel_branch_compact.svg
+- cockpit/themes/diana/symbols/parallel_branch_event.svg
+- cockpit/themes/diana/symbols/parallel_branch_normal.svg
+- cockpit/themes/diana/symbols/scripts.svg
+- cockpit/themes/diana/symbols/start.svg
+- cockpit/themes/diana/symbols/stop.svg
+- cockpit/themes/diana/symbols/terminate.svg
+- cockpit/themes/diana/theme.js
 - cockpit/themes/extended/rngs/alternative.rng
 - cockpit/themes/extended/rngs/call.rng
 - cockpit/themes/extended/rngs/callmanipulate.rng
 - cockpit/themes/extended/rngs/choose.rng
+- cockpit/themes/extended/rngs/closed_loop.rng
+- cockpit/themes/extended/rngs/closed_loop_cancel.rng
+- cockpit/themes/extended/rngs/closed_loop_control.rng
+- cockpit/themes/extended/rngs/closed_loop_measuring.rng
 - cockpit/themes/extended/rngs/critical.rng
 - cockpit/themes/extended/rngs/escape.rng
 - cockpit/themes/extended/rngs/group.rng
@@ -296,6 +370,10 @@ files:
 - cockpit/themes/extended/symbols/choose.svg
 - cockpit/themes/extended/symbols/choose_exclusive.svg
 - cockpit/themes/extended/symbols/choose_inclusive.svg
+- cockpit/themes/extended/symbols/closed_loop.svg
+- cockpit/themes/extended/symbols/closed_loop_cancel.svg
+- cockpit/themes/extended/symbols/closed_loop_control.svg
+- cockpit/themes/extended/symbols/closed_loop_measuring.svg
 - cockpit/themes/extended/symbols/complex.svg
 - cockpit/themes/extended/symbols/critical.svg
 - cockpit/themes/extended/symbols/end.svg
@@ -336,6 +414,10 @@ files:
 - cockpit/themes/model/symbols/choose.svg
 - cockpit/themes/model/symbols/choose_exclusive.svg
 - cockpit/themes/model/symbols/choose_inclusive.svg
+- cockpit/themes/model/symbols/closed_loop.svg
+- cockpit/themes/model/symbols/closed_loop_cancel.svg
+- cockpit/themes/model/symbols/closed_loop_control.svg
+- cockpit/themes/model/symbols/closed_loop_measuring.svg
 - cockpit/themes/model/symbols/complex.svg
 - cockpit/themes/model/symbols/critical.svg
 - cockpit/themes/model/symbols/end.svg
@@ -358,6 +440,10 @@ files:
 - cockpit/themes/packed/rngs/call.rng
 - cockpit/themes/packed/rngs/callmanipulate.rng
 - cockpit/themes/packed/rngs/choose.rng
+- cockpit/themes/packed/rngs/closed_loop.rng
+- cockpit/themes/packed/rngs/closed_loop_cancel.rng
+- cockpit/themes/packed/rngs/closed_loop_control.rng
+- cockpit/themes/packed/rngs/closed_loop_measuring.rng
 - cockpit/themes/packed/rngs/critical.rng
 - cockpit/themes/packed/rngs/escape.rng
 - cockpit/themes/packed/rngs/group.rng
@@ -376,6 +462,10 @@ files:
 - cockpit/themes/packed/symbols/choose.svg
 - cockpit/themes/packed/symbols/choose_exclusive.svg
 - cockpit/themes/packed/symbols/choose_inclusive.svg
+- cockpit/themes/packed/symbols/closed_loop.svg
+- cockpit/themes/packed/symbols/closed_loop_cancel.svg
+- cockpit/themes/packed/symbols/closed_loop_control.svg
+- cockpit/themes/packed/symbols/closed_loop_measuring.svg
 - cockpit/themes/packed/symbols/complex.svg
 - cockpit/themes/packed/symbols/critical.svg
 - cockpit/themes/packed/symbols/end.svg
@@ -398,6 +488,10 @@ files:
 - cockpit/themes/preset/rngs/call.rng
 - cockpit/themes/preset/rngs/callmanipulate.rng
 - cockpit/themes/preset/rngs/choose.rng
+- cockpit/themes/preset/rngs/closed_loop.rng
+- cockpit/themes/preset/rngs/closed_loop_cancel.rng
+- cockpit/themes/preset/rngs/closed_loop_control.rng
+- cockpit/themes/preset/rngs/closed_loop_measuring.rng
 - cockpit/themes/preset/rngs/critical.rng
 - cockpit/themes/preset/rngs/escape.rng
 - cockpit/themes/preset/rngs/group.rng
@@ -416,6 +510,10 @@ files:
 - cockpit/themes/preset/symbols/choose.svg
 - cockpit/themes/preset/symbols/choose_exclusive.svg
 - cockpit/themes/preset/symbols/choose_inclusive.svg
+- cockpit/themes/preset/symbols/closed_loop.svg
+- cockpit/themes/preset/symbols/closed_loop_cancel.svg
+- cockpit/themes/preset/symbols/closed_loop_control.svg
+- cockpit/themes/preset/symbols/closed_loop_measuring.svg
 - cockpit/themes/preset/symbols/complex.svg
 - cockpit/themes/preset/symbols/critical.svg
 - cockpit/themes/preset/symbols/end.svg
@@ -506,6 +604,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

data/cockpit/templates/BPM 2020.xml

@@ -1,26 +0,0 @@
-<testset>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <handlers>
-    <handler url="http://tango.wst.univie.ac.at:9332">
-      <votes topic='state'>change</votes>
-      <events topic='state'>change</events>
-      <events topic='task'>instantiation</events>
-    </handler>
-  </handlers>
-  <endpoints>
-    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
-    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
-    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
-    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
-    <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
-    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
-    <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
-    <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
-    <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
-    <subprocess xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9296/url/</subprocess>
-    <adjust xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/cpee-cockpit/templates/BPM%202020%20Manual%20Adjust.xml</adjust>
-  </endpoints>
-  <attributes>
-    <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
-  </attributes>
-</testset>

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