cpee 2.1.25 → 2.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd74be5656971609e82c88413e57b2e27f791202f4467f13a403872c96a293ed
-  data.tar.gz: dbea7ed1391528186d367b96b70f1f8c00887d8ec6934ef074041b7a54f03599
+  metadata.gz: 4f13d0d499477cb49d9cb850f9dddf8aaef848c326dca500044f19f2ca5c9889
+  data.tar.gz: a96532269da4927bd5b3f5cb2ab195440ea67115f7906b4f2f30ae63d8fccd01
 SHA512:
-  metadata.gz: f1956162c5fed6a82a83806bf5b1aeefac1849f4509b85060fb673735a7cb3d8275a0c1a479b8863d1820ef8b2c73f0bc5bbc359d94975897cf8a9eb7decde34
-  data.tar.gz: c6e145b03c672b5c5639e0edb2a5b462d1a3a52668ec6ae0b3f5f7e585ca056c31cece27a45327e484bf347cbcbf6aa6cfa5fc09023d1c4e79a0b122242dfd30
+  metadata.gz: 0efcc7924b603332c15ad3040478e80f34ad747cbe67c0cbd3eb23e41da3cd4914adc5688c3c40cf74dff2bbf92c7e60d02e7cbeaf8017867255554771ea9bbf
+  data.tar.gz: 61035d40cb0c1c44a85dd9736a0020a74c56a13d4c30e1f5164f060695058a302644a59b63e443529d4e85a4aaba014492e2909bb8e61aea81480ec3eed57d7e

data/cockpit/css/ui.css

@@ -242,4 +242,4 @@ span.vote {
   overflow: auto;
 }
 #disclaimer p { max-width: 82ex; text-align: justify; }
-#disclaimer input { margin:0; padding:0; vertical-align:bottom; margin-right: 0.5em; }
+#disclaimer input { margin:0; padding:0; vertical-align:baseline; margin-right: 0.5em; }

data/cockpit/themes/compact/theme.js

@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cockpit/themes/control/theme.js

@@ -524,7 +524,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cockpit/themes/default/theme.js

@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cockpit/themes/extended/theme.js

@@ -524,7 +524,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cockpit/themes/model/theme.js

@@ -480,7 +480,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cockpit/themes/packed/theme.js

@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cockpit/themes/preset/theme.js

@@ -499,7 +499,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.25"
+  s.version          = "2.1.26"
   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."

data/server/executionhandlers/ruby/connection.rb

@@ -149,10 +149,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def activity_handle(passthrough, parameters) # {{{
     raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
     @label = parameters[:label]
-    @sensors = parameters.dig(:stream,:sensors)
-    @aggregators = parameters.dig(:stream,:aggregators)
-    @costs = parameters.dig(:stream,:costs)
-    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @anno = parameters[:annotations]
+    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :annotations => anno)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -303,7 +301,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :annotations => @anno)
     @guard_files += result
     @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -403,6 +403,8 @@
   <xsl:template match="d:parameters">
     <xsl:apply-templates select="d:label" mode="parameter"/>
     <xsl:apply-templates select="d:*[not(name()='label')]" mode="parameter"/>
+    <xsl:if test="count(*) &gt; 0">, </xsl:if>
+    <xsl:apply-templates select="../d:annotations" mode="annotations"/>
   </xsl:template>
   <xsl:template match="d:label" mode="parameter">
     <xsl:text>:</xsl:text>
@@ -411,6 +413,12 @@
     <xsl:value-of select="str:replace(str:replace(text(),'\','\\'),'&quot;','\&quot;')"/>
     <xsl:text>"</xsl:text>
   </xsl:template>
+  <xsl:template match="d:annotations" mode="annotations">
+    <xsl:text>:</xsl:text>
+    <xsl:value-of select="name()"/>
+    <xsl:text> =&gt; </xsl:text>
+    <xsl:apply-templates select="d:*" mode="plainmulti"/>
+  </xsl:template>
   <xsl:template match="d:*[not(name()='label')]" mode="parameter">
     <xsl:if test="count(preceding-sibling::*) &gt; 0">, </xsl:if>
     <xsl:text>:</xsl:text>
@@ -423,24 +431,6 @@
         <xsl:apply-templates select="d:*" mode="sub"/>
         <xsl:text>]</xsl:text>
       </xsl:when>
-      <xsl:when test="count(*) &gt; 0 and name()='sensors'">
-        <xsl:text>[</xsl:text>
-        <xsl:apply-templates select="d:*" mode="plainmulti"/>
-        <xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:when test="count(*) &gt; 0 and name()='aggregators'">
-        <xsl:text>[</xsl:text>
-        <xsl:apply-templates select="d:*" mode="plainmulti"/>
-        <xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:when test="count(*) &gt; 0 and name()='costs'">
-        <xsl:text>[</xsl:text>
-        <xsl:apply-templates select="d:*" mode="plainmulti"/>
-        <xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:when test="count(*) &gt; 0 and name()='report'">
-        <xsl:apply-templates select="d:*" mode="plainmulti"/>
-      </xsl:when>
       <xsl:when test="count(*) &gt; 0 and not(name()='arguments')">
         <xsl:text>{</xsl:text>
         <xsl:apply-templates select="d:*" mode="parameter"/>

data/server/executionhandlers/ruby/test.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<description xmlns="http://cpee.org/ns/description/1.0">
+  <call id="a1" endpoint="">
+    <parameters>
+      <label>asdad</label>
+      <method>:post</method>
+      <arguments/>
+    </parameters>
+    <code>
+      <prepare/>
+      <finalize output="result"/>
+      <update output="result"/>
+      <rescue output="result"/>
+    </code>
+    <annotations>
+      <_timing>
+        <_timing_weight/>
+        <_timing_avg/>
+        <explanations/>
+      </_timing>
+      <_context_data_analysis>
+        <probes/>
+        <ips/>
+      </_context_data_analysis>
+      <report>
+        <url>http://hoellerersdsdf</url>
+      </report>
+      <_notes>
+        <_notes_general/>
+      </_notes>
+    </annotations>
+    <documentation>
+      <input/>
+      <output/>
+      <implementation>
+        <description/>
+      </implementation>
+      <code>
+        <description/>
+      </code>
+    </documentation>
+  </call>
+</description>

data/tools/cpee

@@ -119,14 +119,22 @@ elsif command == 'convert'
         doc.find('//d:parallel_branch/@pass').delete_all!
         doc.find('//d:parallel_branch/@local').delete_all!
         doc.find('//d:call').each do |c|
-          c.find('d:annotations').first.add c.find('d:parameters/d:_context_data_analysis')
-          c.find('d:annotations').first.add c.find('d:parameters/d:_report')
+          if c.find('d:annotations').empty?
+            c.add('d:annotations')
+          end
+          c.find('d:annotations').first.add c.find('d:parameters/d:_context_data_analysis') rescue nil
+          c.find('d:annotations').first.add c.find('d:parameters/d:report') rescue nil
+          c.find('d:annotations').first.add c.find('d:_timing') rescue nil
+          c.find('d:annotations').first.add c.find('d:_notes') rescue nil
+          c.find('d:parameters/d:sensors').delete_all! rescue nil
+          c.find('d:parameters/d:stream').delete_all! rescue nil
+          c.find('d:annotations').first.add c.find('d:parameters/d:report') rescue nil
           if c.find('d:documentation').empty?
             node = c.add('d:documentation')
-            node.add c.find('d:input')
-            node.add c.find('d:output')
-            node.add c.find('d:implementation')
-            node.add c.find('d:code[d:description]')
+            node.add c.find('d:input') rescue nil
+            node.add c.find('d:output') rescue nil
+            node.add c.find('d:implementation') rescue nil
+            node.add c.find('d:code[d:description]') rescue nil
           end
         end
         doc.find('//x:handlerwrapper').delete_all!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.25
+  version: 2.1.26
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -652,6 +652,7 @@ files:
 - server/executionhandlers/ruby/controller.rb
 - server/executionhandlers/ruby/dsl_to_dslx.xsl
 - server/executionhandlers/ruby/execution.rb
+- server/executionhandlers/ruby/test.xml
 - server/resources/empty_dslx.xml
 - server/resources/notifications/logging/subscription.xml
 - server/resources/properties.empty