cpee 2.0 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97540332122030fa3cc477f5f47bcff6ddbd5f0977a530075c9c901cfdd2d9b1
-  data.tar.gz: 0a7e55a6145144ab94b304e202b0d550489dd3868b8fa0cf015bf0427c358c50
+  metadata.gz: ceb3ebb10b51f80ab5279f9738c67e1b916c06f10b7f30352ba8c2152172fbbd
+  data.tar.gz: 48b7e67c715b8ed0a9e5e4fa4cd90786f5cf2096fc1362c0d679c729e0576816
 SHA512:
-  metadata.gz: b69f463b07d093c897b2d1b39bbb089b8a9e6e32cd2ae58632111c72b3d9e0c1945f31e67059f524ba2d1b822e84e75b3cbd8150c6849ae52779ac95950aef32
-  data.tar.gz: ab3ab54ff2bb5956ab00fd1b5bbc1b76258fdd6e3f2b96754131d90ad29a44a36072799e2898b61b1840d87ee238d342dde66e8f94d9f265101355f24878d457
+  metadata.gz: 9b1340826747baad2c00ed578b84a87d20d3d6ffb31d7a6cf6f856ba8366686d6c8044faebd819168d36488dc690956ed2c44e38b999f81f6edf83fac86a5c4e
+  data.tar.gz: b5744e76d4fa37304555a1fb1678a6181e1bda425e4a5007419214c514af3c78f4bee52adb5623f76a2a84509c7c28ebd2a8ca299b1b1b1c175dec45f047a3d9

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/cockpit/templates/Coopis 2010.xml

@@ -1,15 +1,6 @@
 <testset>
   <positions xmlns="http://cpee.org/ns/properties/2.0"/>
   <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
-  <handlers>
-    <handler url="http://localhost:9299/">
-      <events topic="activity">calling,receiving,done</events>
-      <events topic="dataelements">change</events>
-      <events topic="endpoints">change</events>
-      <events topic="attributes">change</events>
-      <events topic="task">instantiation</events>
-    </handler>
-  </handlers>
   <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <persons>3</persons>
     <card>Visa_12345</card>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml

@@ -74,4 +74,4 @@
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml

@@ -74,4 +74,4 @@
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml

@@ -74,4 +74,4 @@
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/themes/compact/rngs/call.rng

@@ -114,4 +114,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/default/rngs/call.rng

@@ -114,4 +114,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/extended/rngs/call.rng

@@ -114,4 +114,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/packed/rngs/call.rng

@@ -114,4 +114,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/preset/rngs/call.rng

@@ -114,4 +114,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0"
+  s.version          = "2.0.6"
   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."
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables      = ['cpee']
   s.test_files       = Dir['{test/*,test/*/tc_*.rb}']
 
-  s.required_ruby_version = '>=2.4.0'
+  s.required_ruby_version = '>=2.7.0'
 
   s.authors          = ['Juergen eTM Mangler','Ralph Vigne','Gerhard Stuermer']
 

data/lib/cpee/implementation.rb

@@ -204,6 +204,20 @@ module CPEE
           p = path(e)
           multi.zadd(File.join(instance, File.dirname(p)), i, File.basename(p))
         end
+        Dir[File.join(opts[:notifications_init],'*','subscription.xml')].each do |f|
+          XML::Smart::open_unprotected(f) do |doc|
+            doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+            key = File.basename(File.dirname(f))
+            url = doc.find('string(/np:subscription/@url)')
+            multi.sadd("instance:#{id}/handlers",key)
+            multi.set("instance:#{id}/handlers/#{key}/url",url)
+            doc.find('/np:subscription/np:topic/*').each do |e|
+              c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
+              multi.sadd("instance:#{id}/handlers/#{key}",c)
+              multi.sadd("instance:#{id}/handlers/#{c}",key)
+            end
+          end rescue nil # all the ones that are not ok, are ignored
+        end
         multi.set(File.join(instance, 'attributes', 'uuid'), SecureRandom.uuid)
         multi.zadd(File.join(instance, 'attributes'), -2, 'uuid')
         multi.set(File.join(instance, 'attributes', 'info'), name)
@@ -245,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

@@ -146,7 +146,9 @@ module CPEE
           end
 
           if (node = doc.find('/p:properties/p:positions')).any?
-            CPEE::Properties::PatchPositions::set id, opts, node.first.dump
+            if node.first.find('p:*').any?
+              CPEE::Properties::PatchPositions::set id, opts, node.first.dump
+            end
           end
 
           if (node = doc.find('/p:properties/p:state')).any?
@@ -185,7 +187,9 @@ module CPEE
           end
 
           if (node = doc.find('/p:properties/p:positions')).any?
-            CPEE::Properties::PutPositions::set id, opts, node.first.dump
+            if node.first.find('p:*').any?
+              CPEE::Properties::PutPositions::set id, opts, node.first.dump
+            end
           end
 
           if (node = doc.find('/p:properties/p:state')).any?
@@ -211,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

@@ -3,7 +3,11 @@ require 'yaml'
 opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
 opts[:pidf] = __FILE__ + '.pid'
 opts[:pid] = Process.pid
-require_relative '../../../lib/cpee/controller'
+if File.exist? '../../../lib/cpee/controller'
+  require_relative '../../../lib/cpee/controller'
+else
+  require 'cpee/controller'
+end
 
 Dir[File.join(opts[:global_handlerwrappers],'*.rb')].each do |h|
   require h
@@ -22,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/server/resources/transformation_dslx.xsl

@@ -507,11 +507,11 @@
         <xsl:text>nil</xsl:text>
       </xsl:when>
       <xsl:when test="child::node()[not(self::text())]">
-        <!-- FUUUU, there is probably much more TODO -->
+        <!-- FUUUU, there is probably much more TODO. Updated Matthias und Juergen, we tested for ing-opcua/execute -->
         <xsl:choose>
-          <xsl:when test="child::*/child::* and count(child::*[not(name()=name(../child::*[1]))])=0">
+          <xsl:when test="child::* and name(child::*)=concat(name(.),'_item')  and count(child::*[not(name()=name(../child::*[1]))])=0">
             <xsl:text>"[ </xsl:text>
-            <xsl:apply-templates select="*" mode="JSON"/>
+            <xsl:apply-templates select="*" mode="JSONArrayItem"/>
             <xsl:text>]"</xsl:text>
           </xsl:when>
           <xsl:otherwise>
@@ -655,6 +655,15 @@
       <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
     </xsl:choose>
   </xsl:template>
+  <xsl:template match="*" mode="JSONArrayItem">
+    <xsl:call-template name="JSONProperties">
+      <xsl:with-param name="parent" select="'Yes'"></xsl:with-param>
+    </xsl:call-template>
+    <xsl:choose>
+      <xsl:when test="following-sibling::*">, </xsl:when>
+      <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 
   <!-- JSON Object Properties -->
   <xsl:template name="JSONProperties">

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.cp_r("#{curpath}/archive/",p1)
     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'
+  version: 2.0.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-10-05 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
@@ -526,7 +523,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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