cpee 1.3.175 → 1.3.176

data/server/instances/8/properties.xml

@@ -1,51 +1,90 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <info>Enter info here</info>
-  <state>finished</state>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
   <dataelements>
-    <json>{"lv":"Workflow Technologies","id":{"lvnr":"050311","gruppe":1}}</json>
-    <json_lv>Workflow Technologies</json_lv>
-    <json_lvnr/>
-    <xml_lv>Workflow Technologies</xml_lv>
-    <xml_lvnr>050311</xml_lvnr>
+    <persons>0</persons>
+    <card>Visa_12345</card>
+    <airline>FlyNiki</airline>
+    <hotels>["Mariott","Rathaus","Mariott"]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>1021.0</costs>
   </dataelements>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <json>http://cpee.org/services/json.php</json>
-    <xml>http://cpee.org/services/xml.php</xml>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
   </endpoints>
-  <dsl>call :a1, :json, { :label =&gt; "Get JSON", :method =&gt; "get", :parameters =&gt; nil }, &lt;&lt;-end 
-data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']
+  <dsl>call :a1, :bookAir, { :method =&gt; :post, :parameters =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, &lt;&lt;-end 
+  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'
 end
-call :a2, :xml, { :label =&gt; "Get XML", :method =&gt; "get", :parameters =&gt; nil }, &lt;&lt;-end 
-data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')
+parallel do
+  loop pre_test{data.persons &gt; 0} do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, { :method =&gt; :post, :parameters =&gt; {:to =&gt; data.to} }, &lt;&lt;-end 
+        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f
+      end
+    end
+    manipulate :a3, &lt;&lt;-end 
+      data.persons -= 1
+    end
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
+  end
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="json" svg-label="Get JSON">
-        <parameters>
-          <label>Get JSON</label>
-          <method>get</method>
-          <parameters/>
-        </parameters>
-        <manipulate>data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']</manipulate>
-      </call>
-      <call id="a2" endpoint="xml">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <label>Get XML</label>
-          <method>get</method>
-          <parameters/>
+          <method>:post</method>
+          <parameters>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </parameters>
         </parameters>
-        <manipulate>data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
+        <manipulate output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</manipulate>
       </call>
+      <parallel>
+        <loop pre_test="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
+              </parameters>
+              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</manipulate>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <parameters>
+                <costs>data.costs</costs>
+              </parameters>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </dslx>
   <status>
@@ -54,30 +93,53 @@ data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="json" svg-label="Get JSON">
-        <parameters>
-          <label>Get JSON</label>
-          <method>get</method>
-          <parameters/>
-        </parameters>
-        <manipulate>data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']</manipulate>
-      </call>
-      <call id="a2" endpoint="xml">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <label>Get XML</label>
-          <method>get</method>
-          <parameters/>
+          <method>:post</method>
+          <parameters>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </parameters>
         </parameters>
-        <manipulate>data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
+        <manipulate output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</manipulate>
       </call>
+      <parallel>
+        <loop pre_test="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
+              </parameters>
+              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</manipulate>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <parameters>
+                <costs>data.costs</costs>
+              </parameters>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="xslt"/>
-    <endpoints type="xslt"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>

data/server/instances/9/properties.xml

@@ -1,45 +1,90 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>Enter info here</info>
-  <state>ready</state>
+  <info>asd</info>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
-  <dataelements/>
+  <dataelements>
+    <persons>0</persons>
+    <card>Visa_12345</card>
+    <airline>FlyNiki</airline>
+    <hotels>["Ibis","Mariott","Rathaus"]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>724.0</costs>
+  </dataelements>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <json>http://cpee.org/services/json.php</json>
-    <xml>http://cpee.org/services/xml.php</xml>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
   </endpoints>
-  <dsl>call :a1, :json, { :label =&gt; "Get JSON", :method =&gt; "get", :parameters =&gt; nil }, &lt;&lt;-end 
-data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']
+  <dsl>call :a1, :bookAir, { :method =&gt; :post, :parameters =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, &lt;&lt;-end 
+  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'
 end
-call :a2, :xml, { :label =&gt; "Get XML", :method =&gt; "get", :parameters =&gt; nil }, &lt;&lt;-end 
-data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')
+parallel do
+  loop pre_test{data.persons &gt; 0} do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, { :method =&gt; :post, :parameters =&gt; {:to =&gt; data.to} }, &lt;&lt;-end 
+        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f
+      end
+    end
+    manipulate :a3, &lt;&lt;-end 
+      data.persons -= 1
+    end
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
+  end
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="json" svg-label="Get JSON">
-        <parameters>
-          <label>Get JSON</label>
-          <method>get</method>
-          <parameters/>
-        </parameters>
-        <manipulate>data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']</manipulate>
-      </call>
-      <call id="a2" endpoint="xml">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <label>Get XML</label>
-          <method>get</method>
-          <parameters/>
+          <method>:post</method>
+          <parameters>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </parameters>
         </parameters>
-        <manipulate>data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
+        <manipulate output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</manipulate>
       </call>
+      <parallel>
+        <loop pre_test="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
+              </parameters>
+              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</manipulate>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <parameters>
+                <costs>data.costs</costs>
+              </parameters>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </dslx>
   <status>
@@ -48,30 +93,53 @@ data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="json" svg-label="Get JSON">
-        <parameters>
-          <label>Get JSON</label>
-          <method>get</method>
-          <parameters/>
-        </parameters>
-        <manipulate>data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']</manipulate>
-      </call>
-      <call id="a2" endpoint="xml">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <label>Get XML</label>
-          <method>get</method>
-          <parameters/>
+          <method>:post</method>
+          <parameters>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </parameters>
         </parameters>
-        <manipulate>data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
+        <manipulate output="result">  data.airline = result.value('id')
+    data.costs += result.value('costs').to_f
+    status.update 1, 'Hotel'</manipulate>
       </call>
+      <parallel>
+        <loop pre_test="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <parameters>
+                  <to>data.to</to>
+                </parameters>
+              </parameters>
+              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</manipulate>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">      data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose>
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <parameters>
+                <costs>data.costs</costs>
+              </parameters>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="xslt"/>
-    <endpoints type="xslt"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>

data/server/resources/topics.xml

@@ -15,43 +15,43 @@
 -->
 
 <topics xmlns='http://riddl.org/ns/common-patterns/notifications-producer/1.0'>
-  <topic id='running'>
-    <event>activity_calling</event>
-    <event>activity_failed</event>
-    <event>activity_status</event>
-    <event>activity_manipulating</event>
-    <event>activity_done</event>
+  <topic id='activity'>
+    <event>calling</event>
+    <event>failed</event>
+    <event>manipulating</event>
+    <event>status</event>
+    <event>done</event>
     <vote>syncing_before</vote>
     <vote>syncing_after</vote>
   </topic>
-  <topic id='properties/position'>
+  <topic id='position'>
     <event>change</event>
   </topic>
-  <topic id='properties/description'>
+  <topic id='description'>
     <event>change</event>
     <event>error</event>
     <vote>modify</vote>
   </topic>
-  <topic id='properties/state'>
+  <topic id='state'>
     <event>change</event>
     <vote>change</vote>
   </topic>
-  <topic id='properties/status'>
+  <topic id='status'>
     <event>change</event>
   </topic>
-  <topic id='properties/dataelements'>
+  <topic id='dataelements'>
     <event>change</event>
   </topic>
-  <topic id='properties/endpoints'>
+  <topic id='endpoints'>
     <event>change</event>
   </topic>
-  <topic id='properties/handlerwrapper'>
+  <topic id='handlerwrapper'>
     <event>change</event>
   </topic>
-  <topic id='properties/transformation'>
+  <topic id='transformation'>
     <event>change</event>
   </topic>
-  <topic id='properties/handlers'>
+  <topic id='handler'>
     <event>change</event>
     <event>error</event>
     <event>debug</event>

data/server/resources/transformation_dslx.xsl

@@ -49,7 +49,23 @@
       <xsl:text>, { </xsl:text>
       <xsl:apply-templates select="d:parameters"/>
       <xsl:text> }</xsl:text>
-      <xsl:apply-templates select="d:manipulate" mode="part-of-call">
+      <xsl:choose>
+        <xsl:when test="count(d:finalize | d:update)=2">
+          <xsl:text>, &lt;&lt;-END, &lt;&lt;-END</xsl:text>
+        </xsl:when>
+        <xsl:when test="d:finalize">
+          <xsl:text>, &lt;&lt;-END</xsl:text>
+        </xsl:when>
+        <xsl:when test="d:update">
+          <xsl:text>, nil, &lt;&lt;-END</xsl:text>
+        </xsl:when>
+      </xsl:choose>
+      <xsl:apply-templates select="d:finalize" mode="part-of-call">
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:apply-templates select="d:update" mode="part-of-call">
         <xsl:with-param name="myspace">
           <xsl:value-of select="$myspace"/>
         </xsl:with-param>
@@ -57,7 +73,7 @@
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='manipulate'">
-      <xsl:call-template name="print-content">
+      <xsl:call-template name="print-mcontent">
         <xsl:with-param name="myspace">
           <xsl:value-of select="$myspace"/>
         </xsl:with-param>
@@ -357,7 +373,7 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  <xsl:template match="d:manipulate" mode="part-of-call">
+  <xsl:template match="d:finalize | d:update" mode="part-of-call">
     <xsl:param name="myspace"/>
     <xsl:call-template name="print-content">
       <xsl:with-param name="myspace">
@@ -366,6 +382,21 @@
     </xsl:call-template>
   </xsl:template>
   <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:call-template name="print-newline"/>
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>END</xsl:text>
+    </xsl:if>
+  </xsl:template>
+  <xsl:template name="print-mcontent">
     <xsl:param name="myspace"/>
     <xsl:if test="text()">
       <xsl:choose>
@@ -378,7 +409,7 @@
           </xsl:if>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>, &lt;&lt;-end </xsl:text>
+          <xsl:text>, &lt;&lt;-END</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:call-template name="print-newline"/>
@@ -390,7 +421,14 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>end</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@language='application/x-ruby'">
+          <xsl:text>end</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>END</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
   </xsl:template>
   <xsl:template name="print-space">