cpee 1.3.223 → 1.3.224

data/cpee.gemspec

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

@@ -368,6 +368,11 @@
       <xsl:when test="not(node())">
         <xsl:text>nil</xsl:text>
       </xsl:when>
+      <xsl:when test="child::node()[not(self::text())]">
+        <xsl:text>"{ </xsl:text>
+        <xsl:apply-templates select="*" mode="JSON"/>
+        <xsl:text> }"</xsl:text>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="text()"/>
       </xsl:otherwise>
@@ -461,4 +466,97 @@
     <xsl:text>
 </xsl:text>
   </xsl:template>
+
+  <!-- JSON Element -->
+  <xsl:template match="*" mode="JSON">
+    <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:template>
+
+  <!-- JSON Array Element -->
+  <xsl:template match="*" mode="JSONArrayElement">
+      <xsl:call-template name="JSONProperties"/>
+  </xsl:template>
+
+  <!-- JSON Object Properties -->
+  <xsl:template name="JSONProperties">
+    <xsl:param name="parent"></xsl:param>
+    <xsl:variable name="childName" select="name(*[1])"/>
+    <xsl:choose>
+      <xsl:when test="not(*|@*)">
+        <xsl:choose>
+          <xsl:when test="$parent='Yes'">
+            <xsl:choose>
+              <xsl:when test="number(.) = .">
+                <xsl:value-of select="."/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>\"</xsl:text>
+                <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                <xsl:text>\"</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>\"</xsl:text>
+            <xsl:value-of select="name()"/>
+            <xsl:text>\": </xsl:text>
+            <xsl:choose>
+              <xsl:when test="number(.) = .">
+                <xsl:value-of select="."/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>\"</xsl:text>
+                <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                <xsl:text>\"</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:when test="count(*[name()=$childName]) > 1">
+        <xsl:text>{ \"</xsl:text>
+        <xsl:value-of select="$childName"/>
+        <xsl:text>\": [ </xsl:text>
+        <xsl:apply-templates select="*" mode="JSONArrayElement"/>
+        <xsl:text> ] }</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>{</xsl:text>
+        <xsl:apply-templates select="@*" mode="JSON"/>
+        <xsl:apply-templates select="*" mode="JSON"/>
+        <xsl:text>}</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="following-sibling::*">, </xsl:if>
+  </xsl:template>
+
+  <!-- JSON Attribute Property -->
+  <xsl:template match="@*" mode="JSON">
+    <xsl:text> \"</xsl:text>
+    <xsl:value-of select="name()"/>
+    <xsl:text>\": </xsl:text>
+    <xsl:choose>
+      <xsl:when test="number(.) = .">
+        <xsl:value-of select="."/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>\"</xsl:text>
+        <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+        <xsl:text>\"</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:choose>
+      <xsl:when test="not(position() = last())">
+        <xsl:text>,</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> </xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 </xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.223
+  version: 1.3.224
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -106,6 +106,7 @@ files:
 - cockpit/contrib/tree_example.svg
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
+- cockpit/graph.html
 - cockpit/index.html
 - cockpit/js/details.js
 - cockpit/js/instance.js
@@ -152,36 +153,7 @@ files:
 - cockpit/testsets/Worklist Test2.xml
 - cockpit/testsets/testsets.xml
 - cockpit/testsets/transformations.xml
-- cockpit/themes/adventure/rngs/alternative.rng
-- cockpit/themes/adventure/rngs/call.rng
-- cockpit/themes/adventure/rngs/callmanipulate.rng
-- cockpit/themes/adventure/rngs/choose.rng
-- cockpit/themes/adventure/rngs/critical.rng
-- cockpit/themes/adventure/rngs/escape.rng
-- cockpit/themes/adventure/rngs/finalize.rng
-- cockpit/themes/adventure/rngs/group.rng
-- cockpit/themes/adventure/rngs/loop.rng
-- cockpit/themes/adventure/rngs/manipulate.rng
-- cockpit/themes/adventure/rngs/otherwise.rng
-- cockpit/themes/adventure/rngs/parallel.rng
-- cockpit/themes/adventure/rngs/parallel_branch.rng
-- cockpit/themes/adventure/rngs/update.rng
-- cockpit/themes/adventure/symbols/alternative.svg
-- cockpit/themes/adventure/symbols/call.svg
-- cockpit/themes/adventure/symbols/callmanipulate.svg
-- cockpit/themes/adventure/symbols/choose.svg
-- cockpit/themes/adventure/symbols/choose_exclusive.svg
-- cockpit/themes/adventure/symbols/choose_inclusive.svg
-- cockpit/themes/adventure/symbols/critical.svg
-- cockpit/themes/adventure/symbols/escape.svg
-- cockpit/themes/adventure/symbols/loop.svg
-- cockpit/themes/adventure/symbols/manipulate.svg
-- cockpit/themes/adventure/symbols/otherwise.svg
-- cockpit/themes/adventure/symbols/parallel.svg
-- cockpit/themes/adventure/symbols/parallel_branch.svg
-- cockpit/themes/adventure/symbols/scripts.svg
-- cockpit/themes/adventure/symbols/start.svg
-- cockpit/themes/adventure/theme.js
+- cockpit/themes/compact/theme.js
 - cockpit/themes/default/rngs/alternative.rng
 - cockpit/themes/default/rngs/call.rng
 - cockpit/themes/default/rngs/callmanipulate.rng
@@ -197,6 +169,7 @@ files:
 - cockpit/themes/default/rngs/parallel_branch.rng
 - cockpit/themes/default/rngs/update.rng
 - cockpit/themes/default/symbols/alternative.svg
+- cockpit/themes/default/symbols/arrow.svg
 - cockpit/themes/default/symbols/call.svg
 - cockpit/themes/default/symbols/callcorrelationreceive.svg
 - cockpit/themes/default/symbols/callcorrelationsend.svg
@@ -217,41 +190,6 @@ files:
 - cockpit/themes/default/symbols/scripts.svg
 - cockpit/themes/default/symbols/start.svg
 - cockpit/themes/default/theme.js
-- cockpit/themes/labels/rngs/alternative.rng
-- cockpit/themes/labels/rngs/call.rng
-- cockpit/themes/labels/rngs/callmanipulate.rng
-- cockpit/themes/labels/rngs/choose.rng
-- cockpit/themes/labels/rngs/critical.rng
-- cockpit/themes/labels/rngs/escape.rng
-- cockpit/themes/labels/rngs/finalize.rng
-- cockpit/themes/labels/rngs/group.rng
-- cockpit/themes/labels/rngs/loop.rng
-- cockpit/themes/labels/rngs/manipulate.rng
-- cockpit/themes/labels/rngs/otherwise.rng
-- cockpit/themes/labels/rngs/parallel.rng
-- cockpit/themes/labels/rngs/parallel_branch.rng
-- cockpit/themes/labels/rngs/update.rng
-- cockpit/themes/labels/symbols/alternative.svg
-- cockpit/themes/labels/symbols/call.svg
-- cockpit/themes/labels/symbols/callcorrelationreceive.svg
-- cockpit/themes/labels/symbols/callcorrelationsend.svg
-- cockpit/themes/labels/symbols/callinstantiation.svg
-- cockpit/themes/labels/symbols/callmanipulate.svg
-- cockpit/themes/labels/symbols/callmanipulateworklist.svg
-- cockpit/themes/labels/symbols/callworklist.svg
-- cockpit/themes/labels/symbols/choose.svg
-- cockpit/themes/labels/symbols/choose_exclusive.svg
-- cockpit/themes/labels/symbols/choose_inclusive.svg
-- cockpit/themes/labels/symbols/critical.svg
-- cockpit/themes/labels/symbols/escape.svg
-- cockpit/themes/labels/symbols/loop.svg
-- cockpit/themes/labels/symbols/manipulate.svg
-- cockpit/themes/labels/symbols/otherwise.svg
-- cockpit/themes/labels/symbols/parallel.svg
-- cockpit/themes/labels/symbols/parallel_branch.svg
-- cockpit/themes/labels/symbols/scripts.svg
-- cockpit/themes/labels/symbols/start.svg
-- cockpit/themes/labels/theme.js
 - cockpit/themes/lego/rngs/alternative.rng
 - cockpit/themes/lego/rngs/call.rng
 - cockpit/themes/lego/rngs/choose.rng

data/cockpit/themes/adventure/rngs/alternative.rng

@@ -1,5 +0,0 @@
-<element rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="condition" rngui:label="Condition">
-    <data type="string" rngui:label="Condition"/>
-  </attribute>
-</element>

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

@@ -1,29 +0,0 @@
-<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
-    <data type="string" rngui:readonly="true"/>
-  </attribute>
-  <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
-  </attribute>
-  <element name='parameters' rngui:header="Parameters">
-    <element name="label" rngui:label="Label">
-      <data type="string" rngui:label="Short description of the task"/>
-    </element>
-    <element name="method" rngui:label="Method">
-      <choice>
-        <value>:post</value>
-        <value>:get</value>
-        <value>:put</value>
-        <value>:delete</value>
-      </choice>
-    </element>
-    <element name="arguments" rngui:header="Arguments">
-      <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name'>
-          <anyName/>
-          <data type="string" rngui:label="Value"/>
-        </element>
-      </zeroOrMore>
-    </element>
-  </element>
-</element>

data/cockpit/themes/adventure/rngs/callmanipulate.rng

@@ -1,41 +0,0 @@
-<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
-    <data type="string" rngui:readonly="true"/>
-  </attribute>
-  <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
-  </attribute>
-  <element name='parameters' rngui:header="Parameters">
-    <element name="label" rngui:label="Label">
-      <data type="string" rngui:label="Short description of the task"/>
-    </element>
-    <element name="method" rngui:label="Method">
-      <choice>
-        <value>:post</value>
-        <value>:get</value>
-        <value>:put</value>
-        <value>:delete</value>
-      </choice>
-    </element>
-    <element name="arguments" rngui:header="Arguments">
-      <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name'>
-          <anyName/>
-          <data type="string" rngui:label="Value"/>
-        </element>
-      </zeroOrMore>
-    </element>
-  </element>
-  <element name="finalize" rngui:header="Finalize" rngui:label="Code">
-    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
-      <data type="string" rngui:readonly="true"/>
-    </attribute>
-    <text rngui:label='Script that is executed, when a service returns data'/>
-  </element>
-  <element name="update" rngui:header="Update" rngui:label="Code">
-    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
-      <data type="string" rngui:readonly="true"/>
-    </attribute>
-    <text rngui:label='Script that is executed, when a service sends intermediate data'/>
-  </element>
-</element>

data/cockpit/themes/adventure/rngs/choose.rng

@@ -1,8 +0,0 @@
-<element rngui:version="1.2" name="choose" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="mode" rngui:label="Mode" rngui:default="exclusive">
-    <choice>
-      <value>exclusive</value>
-      <value>inclusive</value>
-    </choice>
-  </attribute>
-</element>

data/cockpit/themes/adventure/rngs/critical.rng

@@ -1,5 +0,0 @@
-<element rngui:version="1.2" name="critical" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="sid" rngui:label="SID" rngui:default="section" rngui:hint="Identical SID's shared by between differnt 'critical' elements define mutual exclusive areas.">
-    <data type="string"/>
-  </attribute>
-</element>

data/cockpit/themes/adventure/rngs/escape.rng

@@ -1 +0,0 @@
-<element rngui:version="1.2" name="escape" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org"/>

data/cockpit/themes/adventure/rngs/finalize.rng

@@ -1,6 +0,0 @@
-<element name="finalize" rngui:version="1.2" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="output" rngui:label="Access Variable" rngui:default="result">
-    <data type="string" rngui:readonly="true"/>
-  </attribute>
-  <text rngui:label='Script that is executed, when a service returns data'/>
-</element>

data/cockpit/themes/adventure/rngs/group.rng

@@ -1,3 +0,0 @@
-<element name="group" rngui:version="1.2" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <text rngui:label='A group of tasks, that belongs together'/>
-</element>

data/cockpit/themes/adventure/rngs/loop.rng

@@ -1,11 +0,0 @@
-<element rngui:version="1.2" name="loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="mode" rngui:label="Mode" rngui:default="pre_test">
-    <choice>
-      <value>pre_test</value>
-      <value>post_test</value>
-    </choice>
-  </attribute>
-  <attribute name="condition" rngui:label="Condition">
-    <data type="string" rngui:label="Condition"/>
-  </attribute>
-</element>

data/cockpit/themes/adventure/rngs/manipulate.rng

@@ -1,6 +0,0 @@
-<element rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
-    <data type="string" rngui:readonly="true"/>
-  </attribute>
-  <text rngui:label='Script that is executed'/>
-</element>

data/cockpit/themes/adventure/rngs/otherwise.rng

@@ -1 +0,0 @@
-<element rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org"/>

data/cockpit/themes/adventure/rngs/parallel.rng

@@ -1,5 +0,0 @@
-<element rngui:version="1.2" name="parallel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
-    <data type="integer"/>
-  </attribute>
-</element>

data/cockpit/themes/adventure/rngs/parallel_branch.rng

@@ -1,8 +0,0 @@
-<element rngui:version="1.2" name="parallel_branch" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="pass" rngui:label="Pass to branch">
-    <data type="string" rngui:label="Data element passed to the local scope, thus not affected by global changes ..."/>
-  </attribute>
-  <attribute name="local" rngui:label="Local scope">
-    <data type="string" rngui:label="Name of the passed data element in the local scope ..."/>
-  </attribute>
-</element>

data/cockpit/themes/adventure/rngs/update.rng

@@ -1,6 +0,0 @@
-<element name="update" rngui:version="1.2" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <attribute name="output" rngui:label="Access Variable" rngui:default="result">
-    <data type="string" rngui:readonly="true"/>
-  </attribute>
-  <text rngui:label='Script that is executed, when a service sends intermediate data'/>
-</element>

data/cockpit/themes/adventure/symbols/alternative.svg

@@ -1,4 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="standwithout"/>
-  <text transform="translate(15,20)" class="normal">{..}</text>
-</svg>

data/cockpit/themes/adventure/symbols/call.svg

@@ -1,4 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
-  <path transform="scale(0.7) translate(12, 2)" class="stand" style="fill:#000000;" d="m 19.511059,31.248618 0,-23.6413153 -3.940219,0 0,15.7608793 -7.8804404,-7.88044 0,7.88044 -7.88043943,-7.88044 0,15.760876 z"/>
-</svg>

data/cockpit/themes/adventure/symbols/callmanipulate.svg

@@ -1,6 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
-  <path transform="scale(0.7) translate(12, 2)" class="stand" style="fill:#000000;" d="m 19.511059,31.248618 0,-23.6413153 -3.940219,0 0,15.7608793 -7.8804404,-7.88044 0,7.88044 -7.88043943,-7.88044 0,15.760876 z"/>
-  <circle cx="28" cy="27" r="9" class="rfill stand"/>
-  <text transform="translate(28,31)" class="small">s</text>
-</svg>

data/cockpit/themes/adventure/symbols/choose.svg

@@ -1,5 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
-  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
-  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
-</svg>

data/cockpit/themes/adventure/symbols/choose_exclusive.svg

@@ -1,5 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
-  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
-  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
-</svg>

data/cockpit/themes/adventure/symbols/choose_inclusive.svg

@@ -1,4 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
-  <circle cx="15.5" cy="15.5" r="7" class="stand"/>
-</svg>

data/cockpit/themes/adventure/symbols/critical.svg

@@ -1,4 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
-  <text transform="translate(15,21)" class="normal">⚠</text>
-</svg>

data/cockpit/themes/adventure/symbols/escape.svg

@@ -1,5 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
-  <circle cx="15" cy="15" r="11" class="stand"/>
-  <polygon points="10.5,20.5 15,8.5 20.5,20.5 15,15.5 10.5,20.5" class="black"/>
-</svg>

data/cockpit/themes/adventure/symbols/loop.svg

@@ -1,5 +0,0 @@
-<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
-  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
-  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
-</svg>