cpee 1.3.201 → 1.3.202

data/server/instances/11/properties.xml

@@ -1,95 +1,38 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info>Enter info here</info>
+    <uuid>0a8bd5ab-9ceb-4e8c-aae1-02dcefc6a2c3</uuid>
+    <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-    <uuid>7cd50d3e-5488-4272-84f5-33ae0757310e</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, :arguments =&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} , :mode =&gt; "pre_test", :condition =&gt; "data.persons &gt; 0" do
-    parallel_branch data.persons do |p|
-      call :a2, :bookHotel, parameters: { :method =&gt; :post, :arguments =&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, :arguments =&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>
-          <arguments>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </arguments>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </call>
-      <parallel>
-        <loop mode="pre_test" condition="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
-              <parameters>
-                <method>:post</method>
-                <arguments>
-                  <to>data.to</to>
-                </arguments>
-              </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>
-              <arguments>
-                <costs>data.costs</costs>
-              </arguments>
-            </parameters>
-          </call>
-        </alternative>
-      </choose>
+      <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>
@@ -98,53 +41,22 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>:post</method>
-          <arguments>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </arguments>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </call>
-      <parallel>
-        <loop mode="pre_test" condition="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
-              <parameters>
-                <method>:post</method>
-                <arguments>
-                  <to>data.to</to>
-                </arguments>
-              </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>
-              <arguments>
-                <costs>data.costs</costs>
-              </arguments>
-            </parameters>
-          </call>
-        </alternative>
-      </choose>
+      <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"/>
-    <dataelements type="rest"/>
-    <endpoints type="rest"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
   </transformation>
 </properties>

data/server/instances/12/properties.xml

@@ -1,21 +1,23 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <theme>default</theme>
-    <info>ss</info>
+    <uuid>c4e4e1a5-29ed-4c79-8812-4d484e1e0105</uuid>
+    <info>Enter info here</info>
     <modeltype>CPEE</modeltype>
-    <uuid>13145dde-e314-4317-a5df-21686b73d747</uuid>
+    <theme>default</theme>
   </attributes>
-  <state>ready</state>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
     <persons>3</persons>
     <card>Visa_12345</card>
-    <airline>null</airline>
+    <airline>Lufthansa</airline>
     <hotels>[]</hotels>
     <from>Vienna</from>
     <to>Prague</to>
-    <costs>0</costs>
+    <costs>505.0</costs>
   </dataelements>
   <endpoints>
     <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
@@ -24,15 +26,15 @@
   </endpoints>
   <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :arguments =&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'
+  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, :arguments =&gt; {:to =&gt; data.to} }, finalize: &lt;&lt;-END
         data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f
+        data.costs += result.value('costs').to_f
       END
     end
     manipulate :a3, &lt;&lt;-END
@@ -57,9 +59,9 @@ end
             <persons>data.persons</persons>
           </arguments>
         </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
       </call>
       <parallel>
         <loop mode="pre_test" condition="data.persons &gt; 0">
@@ -71,11 +73,11 @@ end
                   <to>data.to</to>
                 </arguments>
               </parameters>
-              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</finalize>
+              <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>
+          <manipulate id="a3">data.persons -= 1</manipulate>
         </loop>
       </parallel>
       <choose>
@@ -107,9 +109,9 @@ end
             <persons>data.persons</persons>
           </arguments>
         </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
       </call>
       <parallel>
         <loop mode="pre_test" condition="data.persons &gt; 0">
@@ -121,11 +123,11 @@ end
                   <to>data.to</to>
                 </arguments>
               </parameters>
-              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</finalize>
+              <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>
+          <manipulate id="a3">data.persons -= 1</manipulate>
         </loop>
       </parallel>
       <choose>

data/server/instances/13/properties.xml

@@ -1,95 +1,38 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info>Enter info here</info>
+    <uuid>fbe9f08b-fec4-4db6-a14f-ee202b7c2437</uuid>
+    <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
-    <theme>promise</theme>
-    <uuid>e5010ae6-38d2-4825-809d-6763bce393fb</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, :arguments =&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, :arguments =&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, :arguments =&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>
-          <arguments>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </arguments>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </call>
-      <parallel>
-        <loop mode="pre_test" condition="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
-              <parameters>
-                <method>:post</method>
-                <arguments>
-                  <to>data.to</to>
-                </arguments>
-              </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>
-              <arguments>
-                <costs>data.costs</costs>
-              </arguments>
-            </parameters>
-          </call>
-        </alternative>
-      </choose>
+      <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>
@@ -98,48 +41,17 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>:post</method>
-          <arguments>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </arguments>
-        </parameters>
-        <finalize output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</finalize>
-      </call>
-      <parallel>
-        <loop mode="pre_test" condition="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
-              <parameters>
-                <method>:post</method>
-                <arguments>
-                  <to>data.to</to>
-                </arguments>
-              </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>
-              <arguments>
-                <costs>data.costs</costs>
-              </arguments>
-            </parameters>
-          </call>
-        </alternative>
-      </choose>
+      <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>