cpee 1.3.225 → 1.3.226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 831bd6c8a62caa40df7e52d21e8b83132ca74ec4
-  data.tar.gz: 7438caf8c8ccbc361474beb8b7320e21455ca9a4
+  metadata.gz: 29fda55c433e2e644eb7789d9a1d536db13159d1
+  data.tar.gz: eaf8521b70023dd5a0834a328854718f4aee4f22
 SHA512:
-  metadata.gz: 6cc32d3fb2d3f9dd7439bea5776fa2e66f6a053a29dbda50beefa6759050b78637387b23bae467ae2b04267f45b273ba4f0f6c28fe3d5189b4e27be3e982b250
-  data.tar.gz: 7f9d69fcdd8673727bc191b9dd505839e1e3a079b25eb0596bea225558d7fece5cd8ee77239b85fb8d6d83120ea5754edca6bf692cd719efeda5b14b376c2bbb
+  metadata.gz: ee7d33e2623ccb034ddd593aee8a5588042be884c8bef27f40b9229af6b8a938fc1b47eb5b24120b33a8d47ff97f473fccd520717aceb045cd4f7612f3e18d7a
+  data.tar.gz: 4bf2c9318a15958b894ddd574663a33f1cb8c8916b75978bdaa61d4139888506f71ff4df10799a38dd6d6088376aaac5934d2e500d17562163094bdf49bf69e9

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.225"
+  s.version          = "1.3.226"
   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/resources/transformation_dslx.xsl

@@ -377,9 +377,9 @@
         <xsl:text>nil</xsl:text>
       </xsl:when>
       <xsl:when test="child::node()[not(self::text())]">
-        <xsl:text>"{ </xsl:text>
+        <xsl:text>"[</xsl:text>
         <xsl:apply-templates select="*" mode="JSON"/>
-        <xsl:text>}"</xsl:text>
+        <xsl:text> ]"</xsl:text>
       </xsl:when>
       <xsl:otherwise>
         <xsl:choose>
@@ -486,28 +486,32 @@
 
   <!-- JSON Element -->
   <xsl:template match="*" mode="JSON">
-    <xsl:text>\"</xsl:text>
+    <xsl:text> { \"</xsl:text>
     <xsl:value-of select="name()"/>
-    <xsl:text>-</xsl:text>
-    <xsl:value-of select="generate-id(.)"/>
     <xsl:text>\": </xsl:text>
     <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:text> </xsl:text></xsl:when>
+    </xsl:choose>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="following-sibling::*">,</xsl:if>
   </xsl:template>
 
   <xsl:template match="*" mode="JSONSUB">
-    <xsl:text>\"</xsl:text>
+    <xsl:text> \"</xsl:text>
     <xsl:value-of select="name()"/>
     <xsl:text>\": </xsl:text>
     <xsl:call-template name="JSONProperties">
       <xsl:with-param name="parent" select="'Yes'"></xsl:with-param>
     </xsl:call-template>
+    <xsl:if test="following-sibling::*">,</xsl:if>
   </xsl:template>
 
   <!-- JSON Array Element -->
   <xsl:template match="*" mode="JSONArrayElement">
-      <xsl:call-template name="JSONProperties"/>
+    <xsl:call-template name="JSONProperties"/>
   </xsl:template>
 
   <!-- JSON Object Properties -->
@@ -519,7 +523,7 @@
         <xsl:choose>
           <xsl:when test="$parent='Yes'">
             <xsl:choose>
-              <xsl:when test="number(.) = .">
+              <xsl:when test="string(number(.)) = .">
                 <xsl:value-of select="."/>
               </xsl:when>
               <xsl:otherwise>
@@ -534,7 +538,7 @@
             <xsl:value-of select="name()"/>
             <xsl:text>\": </xsl:text>
             <xsl:choose>
-              <xsl:when test="number(.) = .">
+              <xsl:when test="string(number(.)) = .">
                 <xsl:value-of select="."/>
               </xsl:when>
               <xsl:otherwise>
@@ -568,10 +572,12 @@
           <xsl:text>\"</xsl:text>
           <xsl:text> ]</xsl:text>
         </xsl:if>
-        <xsl:text> </xsl:text>
+        <xsl:choose>
+          <xsl:when test="following-sibling::*"></xsl:when>
+          <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
+        </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:if test="following-sibling::*">, </xsl:if>
   </xsl:template>
 
   <!-- JSON Attribute Property -->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.225
+  version: 1.3.226
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl