cpee 2.0.2 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71f98dc26ff6f1cfed69fc184651d7fd01175bee56c77df2f92df10a8db1a3e
-  data.tar.gz: 6b023b74f885fc91e81b1ad27040998eea19e7098cb899f3555e5c1c3e11cf38
+  metadata.gz: 95c3d4997c835af1ee4d34d11331ffff81cd630da92bd50bfdbb7222d84576a2
+  data.tar.gz: 1b05ef8c78a4c280496beb8875bc47efaac200a877f42f5a6c3f2c30bdf98976
 SHA512:
-  metadata.gz: fd458b2163ef367cde6ac05fa4e178b93f0ad06d5a01cbfc44bf32d921e7675e667a13fd7956e19eac89b064b47908beb815f23d127201d3bf6ac5e7a081c7cd
-  data.tar.gz: f003121ae2244ba0e0608d56cc628f99a05a57e101fb806d1adce44225cc762fc7bb7354c51e3f2bee3bcabb46cfe6200fb7f6a0a3599b16c0a75ffd1f83c7d4
+  metadata.gz: eda37aca3ed44140077015b70825b1e3500cae7a5afd972d50ee389051bb281d8dd5e3b3416dcd66cd3b8072aa48c87a8693081b20eebdd6db3f71fc316cedfa
+  data.tar.gz: e795b2134cb33fb78cd318fae57fd5f42b0bc3ca9efea451b288874479ff6155d10990aefb217ade6f6520954024fb4ec5ca35a8fc9273e5ebf0af7a2a76ac56

data/cockpit/themes/model/theme.js

@@ -241,7 +241,7 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var ret;
         if ($('> url',$(node).children('parameters').children('arguments')).length > 0) {
-          ret = [ { column: 'Label', value: '<a target="blank_" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '">' + $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + '</a>' } ];
+          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="blank_" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
         } else {
           ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
         }

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.2"
+  s.version          = "2.0.8"
   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_properties.rb

@@ -215,12 +215,12 @@ 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 && (Process.kill(0, pid) rescue false)
+            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

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

@@ -48,12 +48,11 @@ ARGV.options { |opt|
 	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.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  && ARGV[0] != 'convert') ||
+   (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)
@@ -118,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!
@@ -247,6 +256,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
@@ -257,9 +267,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.2
+  version: 2.0.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-13 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