cpee 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97540332122030fa3cc477f5f47bcff6ddbd5f0977a530075c9c901cfdd2d9b1
-  data.tar.gz: 0a7e55a6145144ab94b304e202b0d550489dd3868b8fa0cf015bf0427c358c50
+  metadata.gz: e789aa5259bacd7b1a1cd8e9c819e078c4acc084983e727347b051c8f861956d
+  data.tar.gz: eb7cbc79394315d929140f424e0f3d02ee11766cb4275433437d0fe8f49dfd8d
 SHA512:
-  metadata.gz: b69f463b07d093c897b2d1b39bbb089b8a9e6e32cd2ae58632111c72b3d9e0c1945f31e67059f524ba2d1b822e84e75b3cbd8150c6849ae52779ac95950aef32
-  data.tar.gz: ab3ab54ff2bb5956ab00fd1b5bbc1b76258fdd6e3f2b96754131d90ad29a44a36072799e2898b61b1840d87ee238d342dde66e8f94d9f265101355f24878d457
+  metadata.gz: e06026cedecdf072de2db0a66f2083f72e83a638d672543509f7f02af50c1aac06a1c20baef44afc20a9112b245f756b73da0d84ed38293981f07396dd076aa2
+  data.tar.gz: ca785378c81867e507086938e449ef78c3d00d737eedc078541c8cd67e64d20573d51145a2e841bd2e70858c5d628e17ae6ccc4f607cc27aa4468b2ff122ab43

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.1"
   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)

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?

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

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">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 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-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -526,7 +526,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:
   - - ">="