cpee 1.3.201 → 1.3.202

data/server/instances/7/properties.xml

@@ -1,94 +1,38 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info>Enter info here</info>
+    <uuid>940fbdeb-6d49-402c-86b6-3115f6feb620</uuid>
+    <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
-    <uuid>851b2fc3-d88a-4018-8af9-a0681def8bc9</uuid>
   </attributes>
-  <state>ready</state>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
   <dataelements>
-    <persons>3</persons>
-    <card>Visa_12345</card>
-    <airline>null</airline>
-    <hotels>[]</hotels>
-    <from>Vienna</from>
-    <to>Prague</to>
-    <costs>0</costs>
+    <i>0</i>
   </dataelements>
   <endpoints>
-    <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>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
   </endpoints>
-  <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :parameters =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, finalize: &lt;&lt;-END
-  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'
-END
-parallel do
-  loop pre_test{data.persons &gt; 0}  do
-    parallel_branch data.persons do |p|
-      call :a2, :bookHotel, parameters: { :method =&gt; :post, :parameters =&gt; {:to =&gt; data.to} }, finalize: &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, parameters: { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
-  end
+  <dsl>loop pre_test{i&lt;2}  do
+  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
+    data.i= data.i + 1
+  END
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>:post</method>
+      <loop mode="pre_test" condition="i&lt;2">
+        <call id="a1" endpoint="move">
           <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
+            <label>Move to next station</label>
+            <method>:post</method>
+            <arguments/>
           </parameters>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </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>
-              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</finalize>
-            </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>
+          <finalize output="result">data.i= data.i + 1</finalize>
+          <update output="result"/>
+        </call>
+      </loop>
     </description>
   </dslx>
   <status>
@@ -97,53 +41,22 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>:post</method>
+      <loop mode="pre_test" condition="i&lt;2">
+        <call id="a1" endpoint="move">
           <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
+            <label>Move to next station</label>
+            <method>:post</method>
+            <arguments/>
           </parameters>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </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>
-              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</finalize>
-            </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>
+          <finalize output="result">data.i= data.i + 1</finalize>
+          <update output="result"/>
+        </call>
+      </loop>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="rest"/>
-    <endpoints type="rest"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
   </transformation>
 </properties>

data/server/instances/8/properties.xml

@@ -1,149 +1,31 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info>Enter info here</info>
+    <uuid>616685f1-763a-4812-878c-4f78847569f3</uuid>
+    <info/>
     <modeltype>CPEE</modeltype>
-    <uuid>7fdbb97e-6594-4edf-9bf1-725eeb05f841</uuid>
+    <theme>default</theme>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
-  <dataelements>
-    <persons>3</persons>
-    <card>Visa_12345</card>
-    <airline>null</airline>
-    <hotels>[]</hotels>
-    <from>Vienna</from>
-    <to>Prague</to>
-    <costs>0</costs>
-  </dataelements>
+  <dataelements/>
   <endpoints>
-    <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>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :parameters =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, finalize: &lt;&lt;-END
-  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'
-END
-parallel do
-  loop pre_test{data.persons &gt; 0}  do
-    parallel_branch data.persons do |p|
-      call :a2, :bookHotel, parameters: { :method =&gt; :post, :parameters =&gt; {:to =&gt; data.to} }, finalize: &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, parameters: { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
-  end
-end
-</dsl>
+  <dsl/>
   <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>:post</method>
-          <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </parameters>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </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>
-              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</finalize>
-            </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 xmlns="http://cpee.org/ns/description/1.0"/>
   </dslx>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>:post</method>
-          <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </parameters>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </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>
-              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</finalize>
-            </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 xmlns="http://cpee.org/ns/description/1.0"/>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="rest"/>
-    <endpoints type="rest"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
   </transformation>
 </properties>

data/server/instances/9/properties.xml

@@ -1,26 +1,58 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info/>
+    <uuid>7d388f7d-ef56-42e0-b68d-b885bb267239</uuid>
+    <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
-    <uuid>7fe1cbb3-82de-4609-8b1d-02bc939a24cf</uuid>
   </attributes>
-  <state>ready</state>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
-  <dataelements/>
+  <dataelements>
+    <i>0</i>
+  </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
   </endpoints>
-  <dsl/>
+  <dsl>loop pre_test{i&lt;2}  do
+  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
+    data.i= data.i + 1
+  END
+end
+</dsl>
   <dslx>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="i&lt;2">
+        <call id="a1" endpoint="move">
+          <parameters>
+            <label>Move to next station</label>
+            <method>:post</method>
+            <arguments/>
+          </parameters>
+          <finalize output="result">data.i= data.i + 1</finalize>
+          <update output="result"/>
+        </call>
+      </loop>
+    </description>
   </dslx>
   <status>
     <id>0</id>
     <message>undefined</message>
   </status>
   <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="i&lt;2">
+        <call id="a1" endpoint="move">
+          <parameters>
+            <label>Move to next station</label>
+            <method>:post</method>
+            <arguments/>
+          </parameters>
+          <finalize output="result">data.i= data.i + 1</finalize>
+          <update output="result"/>
+        </call>
+      </loop>
+    </description>
   </description>
   <transformation>
     <description type="copy"/>

data/server/resources/transformation_dslx.xsl

@@ -340,36 +340,35 @@
 
     <xsl:choose>
       <xsl:when test="count(*) &gt; 0">
-        <xsl:text>{</xsl:text>
-        <xsl:apply-templates select="d:*" mode="parameter"/>
-        <xsl:text>}</xsl:text>
+        <xsl:text>[</xsl:text>
+        <xsl:apply-templates select="d:*" mode="sub"/>
+        <xsl:text>]</xsl:text>
       </xsl:when>
-      <xsl:when test="count(@*) &gt; 0">
-        <xsl:text>Struct.new(:value,</xsl:text>
-        <xsl:for-each select="@*">
-          <xsl:if test="position() &gt;1">, </xsl:if>
-          <xsl:text>:</xsl:text>
-          <xsl:value-of select="name(.)"/>
-        </xsl:for-each>
-        <xsl:text>).new(</xsl:text>
-        <xsl:text></xsl:text>
-        <xsl:choose>
-          <xsl:when test="not(node())">
-            <xsl:text>nil</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="text()"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:text>,</xsl:text>
-        <xsl:for-each select="@*">
-          <xsl:if test="position() &gt;1">, </xsl:if>
-          <xsl:text>"</xsl:text>
-          <xsl:value-of select="string(.)"/>
-          <xsl:text>"</xsl:text>
-        </xsl:for-each>
-        <xsl:text>)</xsl:text>
+      <xsl:when test="not(node())">
+        <xsl:text>nil</xsl:text>
       </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="text()"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="d:*" mode="sub">
+    <xsl:if test="count(preceding-sibling::*) &gt; 0">, </xsl:if>
+    <xsl:text>Struct.new(:name, :value</xsl:text>
+
+    <xsl:if test="count(@*) &gt; 0">
+      <xsl:for-each select="@*">
+        <xsl:text>, </xsl:text>
+        <xsl:text>:</xsl:text>
+        <xsl:value-of select="name(.)"/>
+      </xsl:for-each>
+    </xsl:if>
+
+    <xsl:text>).new(</xsl:text>
+    <xsl:text>:</xsl:text>
+    <xsl:value-of select="name()"/>
+    <xsl:text>, </xsl:text>
+    <xsl:choose>
       <xsl:when test="not(node())">
         <xsl:text>nil</xsl:text>
       </xsl:when>
@@ -377,7 +376,15 @@
         <xsl:value-of select="text()"/>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:for-each select="@*">
+      <xsl:text>, </xsl:text>
+      <xsl:text>"</xsl:text>
+      <xsl:value-of select="string(.)"/>
+      <xsl:text>"</xsl:text>
+    </xsl:for-each>
+    <xsl:text>)</xsl:text>
   </xsl:template>
+
   <xsl:template match="d:finalize | d:update" mode="part-of-call">
     <xsl:param name="myspace"/>
     <xsl:call-template name="print-content">