cpee 1.3.189 → 1.3.190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d211ffeb9e90a4d9922995a30431485fd868cdfc
-  data.tar.gz: 9664f5da7d3d0a9bb2aba654d11f42d618243362
+  metadata.gz: 664ed004156d72278958f176a3de68ba7f8f8fd3
+  data.tar.gz: fa4a8adb9d198ae2564a8ca4c4d2a5320184cfaa
 SHA512:
-  metadata.gz: '0890a45cdaff78864593bcd660238a924553b31b05fdb9b8c66b999812fd5fbc3fa2624db5003c5297fb90fac25640b2a4cd64c5cba0832934f7645b60b3847c'
-  data.tar.gz: 6bc56f7aac0c0bdb870a331bce9f2d7acd5cc9fd5135f93969b2f4088cfb30ce32e40677f4ff286a44f8aaaeb6b746ebcca541ca4673d7f69a110a7e82ef77f9
+  metadata.gz: ca85bc3be6c95e025cb0fb6f9e781df1bb98609914329a7e5d18e5fed3057656a6dfa8408307e65e508f64e900eba84aac39d0985fcf7dbd815281967cc1721b
+  data.tar.gz: 0a183617b446a588e24d8b92ca2d1f2caf8bd9a6567eb3cc22976c1d4ed33d062bbbea4286da0f2fdcf6a52fde9755c49de04f97bfbbf81c7efe11bfecacea33

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.189"
+  s.version          = "1.3.190"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/server/instances/45/notifications/f69cbc7424b9b0682c3e435e2577215c/consumer-secret

@@ -0,0 +1 @@
+437beb82a65d49f658671c245c6b9025

data/server/instances/45/notifications/f69cbc7424b9b0682c3e435e2577215c/producer-secret

@@ -0,0 +1 @@
+fcddc894557dfc2191c42ee9003c48a1

data/server/instances/45/properties.xml

@@ -2,7 +2,7 @@
   <attributes>
     <info>Test</info>
     <modeltype>CPEE</modeltype>
-    <theme>cpee</theme>
+    <theme>default</theme>
   </attributes>
   <state>ready</state>
   <handlerwrapper>LogHandlerWrapper</handlerwrapper>
@@ -13,7 +13,7 @@
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>call :a2, :timeout, parameters: { :label =&gt; Sonja, :method =&gt; :post, :arguments =&gt; {:timeout =&gt; 2} }
+  <dsl>call :a2, :timeout, parameters: { :label =&gt; "Sonja", :method =&gt; :post, :arguments =&gt; {:timeout =&gt; 2} }
 parallel :wait =&gt; -1 do
   parallel_branch  do ||
     call :a3, :timeout, parameters: { :label =&gt; nil, :method =&gt; :post, :arguments =&gt; {:timeout =&gt; 2} }
@@ -38,7 +38,7 @@ end
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a2" endpoint="timeout">
         <parameters>
-          <label>Sonja</label>
+          <label>"Sonja"</label>
           <method>:post</method>
           <arguments>
             <timeout>2</timeout>
@@ -107,7 +107,7 @@ end
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a2" endpoint="timeout">
         <parameters>
-          <label>Sonja</label>
+          <label>"Sonja"</label>
           <method>:post</method>
           <arguments>
             <timeout>2</timeout>

data/server/resources/transformation_dslx.xsl

@@ -322,10 +322,18 @@
     <xsl:call-template name="print-newline"/>
   </xsl:template>
   <xsl:template match="d:parameters">
-    <xsl:apply-templates select="d:*" mode="parameter"/>
+    <xsl:apply-templates select="d:label" mode="parameter"/>
+    <xsl:apply-templates select="d:*[not(name()='label')]" mode="parameter"/>
   </xsl:template>
-  <xsl:template match="d:*" mode="parameter">
-    <xsl:if test="position() &gt;1">, </xsl:if>
+  <xsl:template match="d:label" mode="parameter">
+    <xsl:text>:</xsl:text>
+    <xsl:value-of select="name()"/>
+    <xsl:text> =&gt; "</xsl:text>
+    <xsl:value-of select="text()"/>
+    <xsl:text>"</xsl:text>
+  </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>
     <xsl:value-of select="name()"/>
     <xsl:text> =&gt; </xsl:text>
@@ -381,8 +389,9 @@
   <xsl:template name="print-content">
     <xsl:param name="myspace"/>
     <xsl:if test="text()">
-      <xsl:call-template name="print-newline"/>
-      <xsl:value-of select="text()"/>
+      <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
+        <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),normalize-space(.)))" />
+      </xsl:for-each>
       <xsl:call-template name="print-newline"/>
       <xsl:call-template name="print-space">
         <xsl:with-param name="i">1</xsl:with-param>
@@ -409,8 +418,9 @@
           <xsl:text>, &lt;&lt;-END</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:call-template name="print-newline"/>
-      <xsl:value-of select="text()"/>
+      <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
+        <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),normalize-space(.)))" />
+      </xsl:for-each>
       <xsl:call-template name="print-newline"/>
       <xsl:call-template name="print-space">
         <xsl:with-param name="i">1</xsl:with-param>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.189
+  version: 1.3.190
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -328,9 +328,9 @@ files:
 - server/instances/44/log.xes
 - server/instances/44/properties.xml
 - server/instances/45/log.xes
-- server/instances/45/notifications/7d1bd93a743784ab3600acb22b18f933/consumer-secret
-- server/instances/45/notifications/7d1bd93a743784ab3600acb22b18f933/producer-secret
-- server/instances/45/notifications/7d1bd93a743784ab3600acb22b18f933/subscription.xml
+- server/instances/45/notifications/f69cbc7424b9b0682c3e435e2577215c/consumer-secret
+- server/instances/45/notifications/f69cbc7424b9b0682c3e435e2577215c/producer-secret
+- server/instances/45/notifications/f69cbc7424b9b0682c3e435e2577215c/subscription.xml
 - server/instances/45/properties.xml
 - server/instances/5/properties.xml
 - server/instances/6/properties.xml

data/server/instances/45/notifications/7d1bd93a743784ab3600acb22b18f933/consumer-secret

@@ -1 +0,0 @@
-3d8b06a92c151667b51a688e7a5b8245

data/server/instances/45/notifications/7d1bd93a743784ab3600acb22b18f933/producer-secret

@@ -1 +0,0 @@
-a093d1c760635a9401bb9208d9b85159