cpee 2.0.1 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e789aa5259bacd7b1a1cd8e9c819e078c4acc084983e727347b051c8f861956d
-  data.tar.gz: eb7cbc79394315d929140f424e0f3d02ee11766cb4275433437d0fe8f49dfd8d
+  metadata.gz: 892345432ec66be6bde99413fae6a0b212bbfb0dda125d73baaca1f3d7dd316d
+  data.tar.gz: 8eb06548d37bae0609def5a8fee6a3bdddfd99a7c3c08820ae21f6adeed5469f
 SHA512:
-  metadata.gz: e06026cedecdf072de2db0a66f2083f72e83a638d672543509f7f02af50c1aac06a1c20baef44afc20a9112b245f756b73da0d84ed38293981f07396dd076aa2
-  data.tar.gz: ca785378c81867e507086938e449ef78c3d00d737eedc078541c8cd67e64d20573d51145a2e841bd2e70858c5d628e17ae6ccc4f607cc27aa4468b2ff122ab43
+  metadata.gz: 3cb92676128eecf6cd2e7d294accbd5c7b691f34ac9b9371d388348600f0e98f1eeff8ec72b71edaf2573167a58539078e84e088c111c1ac5fd828205ea35d7b
+  data.tar.gz: f08abbc9c2543f0799a608051b8d87e29b81e9175e7fec8ee3265296b2a2451aabf4894271fd1a1a0b09133cca113c4b740899f99b35cf91bbbf0ed1fa238d94

data/cockpit/js/instance.js

@@ -784,7 +784,7 @@ function save_testsetfile() {// {{{
   var def = new $.Deferred();
   def.done(function(name,testset) {
     var ct = new Date();
-    $('#savetestsetfile').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
+    $('#savetestsetfile').attr('download',name + '.xml');
     $('#savetestsetfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
     document.getElementById('savetestsetfile').click();
   });
@@ -811,6 +811,11 @@ function get_testset(deferred) {// {{{
       $('testset > dslx',testset).remove();
       testset.append($X('<transformation xmlns="http://cpee.org/ns/properties/2.0"><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>'));
       var name =  $('testset > attributes > info',testset).text();
+      $('[xmlns]',testset).each((idx,ele) => {
+        if (ele.parentNode.namespaceURI == ele.getAttribute('xmlns')) {
+          ele.removeAttribute('xmlns');
+        }
+      });
       deferred.resolve(name,testset);
     },
     error: function() { deferred.reject(); report_failure(); }

data/cockpit/model.html

@@ -33,6 +33,7 @@
     <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
     <script type="text/javascript" src="/js_libs/ui.js"></script>

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.1"
+  s.version          = "2.0.7"
   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."
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'

data/lib/cpee/implementation.rb

@@ -259,12 +259,13 @@ module CPEE
       opts = @a[0]
       redis = opts[:redis]
       id = @r[0].to_i
-      unless redis.exists("instance:#{id}/state")
+      unless redis.exists?("instance:#{id}/state")
         @status = 404
         return
       end
+      empt = redis.keys("instance:#{id}/*").to_a
       redis.multi do |multi|
-        multi.del redis.keys("instance:#{id}/*").to_a
+        multi.del empt
         multi.zrem 'instances', id
       end
     end

data/lib/cpee/implementation_properties.rb

@@ -215,13 +215,16 @@ module CPEE
         case state
           when 'running'
             CPEE::Persistence::write_instance id, opts
-            pid = Kernel.spawn(exe , :out => exe + '.out', :err => exe + '.err')
-            File.write(exe + '.pid',pid)
+            pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
             Process.detach pid
+            File.write(exe + '.pid',pid)
           when 'stopping'
             pid = File.read(exe + '.pid') rescue nil
-            if pid
+            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
+              PutState::set id, opts, 'stopped'
             end
           else
             ### Most probably this is never needed. Lets see.

data/server/resources/backend/run

@@ -26,8 +26,8 @@ File.write(opts[:pidf],opts[:pid])
   Signal.trap(sig) do
     puts "Caught #{sig}!"
     controller.stop
-    File.unlink(opts[:pidf])
   end
 end
 
 controller.start
+File.unlink(opts[:pidf])

data/tools/cpee

@@ -30,7 +30,7 @@ end
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
   opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] convert | ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
@@ -47,10 +47,12 @@ ARGV.options { |opt|
   opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
 	opt.on("")
   opt.on(wrap("[ui]              starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
+	opt.on("")
+  opt.on(wrap("[convert]         converts all testsets in the current directory to cpee2"))
   opt.parse!
 }
 if (ARGV.length == 0) ||
-   (ARGV.length == 1  && ARGV[0] != 'ui') ||
+   (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
    (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
    (ARGV.length == 3  && ARGV[0] != 'archive') ||
    (ARGV.length >  3)
@@ -99,6 +101,29 @@ elsif command == 'cpui'
       puts "Directory already exists."
     end
   end
+elsif command == 'convert'
+  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'
+      doc.register_namespace 'x', 'http://cpee.org/ns/properties/2.0'
+      if doc.root.qname.name == 'testset'
+        doc.root.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
+        doc.root.namespace = nil
+
+        doc.find('//x:start_url').each do |e|
+          e.text = 'https://centurio.work/flow-test/start/url/'
+        end rescue nil
+        doc.find('//x:start_git').each do |e|
+          e.text = 'https://centurio.work/flow-test/start/git/'
+        end rescue nil
+
+        doc.find('//p:*').each do |e|
+          e.namespaces.delete_all!
+        end rescue nil
+      end
+    end
+  end
 elsif command == 'archive'
   p2 = File.join(p2,'*') if p2 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p2)
@@ -139,11 +164,12 @@ elsif command == 'archive'
             prop = Typhoeus.get(File.join(base,name.to_s,'properties','/'))
             if prop.success?
               xprop = XML::Smart::string(prop.response_body)
-              xprop.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
+              xprop.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
               if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)"))
                 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
@@ -220,6 +246,7 @@ elsif command == 'delete!'
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.cp_r("#{curpath}/server/",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
@@ -230,9 +257,6 @@ elsif command == 'new'
       cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
       cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
       File.write("#{p1}/#{nam}",cont)
-      p f
-      p nam
-      p "#{p1}/#{nam}"
     end
   else
     puts 'Directory already exists.'

data/tools/server/resources/notifications/logging/subscription.xml

@@ -1,7 +1,19 @@
-<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9300/log">
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0" url="http://localhost:9299/">
   <topic id="activity">
     <event>calling</event>
     <event>receiving</event>
     <event>done</event>
   </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+  <topic id="task">
+    <event>instantiation</event>
+  </topic>
 </subscription>

data/tools/server/resources/properties.init

@@ -2,40 +2,41 @@
 <!--
   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 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
+  CPEE (file COPYING in the main directory). If not, see
   <http://www.gnu.org/licenses/>.
 -->
 
-<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <attributes>
-    <info/>
-    <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-  </attributes>
-  <state>ready</state>
+<properties xmlns="http://cpee.org/ns/properties/2.0">
+  <state changed="1970-01-01T00:00:00+00:00">ready</state>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
   <dataelements/>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+    <theme>preset</theme>
+  </attributes>
   <dsl/>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0"/>
   </dslx>
-  <status>
-    <id>0</id>
-    <message>undefined</message>
-  </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0"/>
   </description>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.7
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -508,9 +508,6 @@ files:
 - server/routing/persist.rb
 - server/server.rb
 - tools/cpee
-- tools/instantiation/instantiation
-- tools/server/resources/notifications/logging/consumer-secret
-- tools/server/resources/notifications/logging/producer-secret
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init
 - tools/server/server.rb

data/tools/instantiation/instantiation

@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-require 'rubygems'
-require 'cpee/instantiation'
-
-options = {
-  :host => 'localhost',
-  :port => 9296,
-  :secure => false
-  # :secure_options => {
-  #   :private_key_file => '',
-  #   :cert_chain_file => '',
-  #   :verify_peer => false
-  # }
-}
-
-Riddl::Server.new(CPEE::Instantiation::SERVER, options) do
-  accessible_description true
-  cross_site_xhr true
-
-  @riddl_opts[:cpee] ||= 'http://localhost:8298/'
-
-  use CPEE::Instantiation::implementation(@riddl_opts)
-end.loop!

data/tools/server/resources/notifications/logging/consumer-secret

@@ -1 +0,0 @@
-f7c77861ac613eeac8fb9829c9a545a2

data/tools/server/resources/notifications/logging/producer-secret

@@ -1 +0,0 @@
-2a24d172b1aeb05fe94fdc5e095dec32