cpee 1.3.175 → 1.3.176

data/server/instances/17/properties.xml

@@ -1,146 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  This file is part of CPEE.
+
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>Enter info here</info>
+  <info/>
   <properties/>
   <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, { :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
-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>
+  <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>
-        <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>
+    <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>
-        <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 xmlns="http://cpee.org/ns/description/1.0"/>
   </description>
   <transformation>
-    <description type="copy"/>
-    <dataelements type="rest"/>
-    <endpoints type="rest"/>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
   </transformation>
-</properties>
+</properties>

data/server/instances/18/properties.xml

@@ -16,8 +16,9 @@
 -->
 
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info/>
-  <properties/>
+  <attributes>
+    <info/>
+  </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>

data/server/instances/19/properties.xml

@@ -18,7 +18,6 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
     <info/>
-    <modeltype>CPEE</modeltype>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>

data/server/instances/2/properties.xml

@@ -1,51 +1,127 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>Enter info here</info>
-  <state>finished</state>
+  <info>asdads</info>
+  <state>ready</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>
-  </dataelements>
+  <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>
   </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 :a58, :timeout, { :label =&gt; "A", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819", :parameters =&gt; { :timeout =&gt; 1 } }, &lt;&lt;-end 
+data.a += 1
 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)')
+call :a61, :timeout, { :label =&gt; "B", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E", :parameters =&gt; { :timeout =&gt; 1 } }
+loop pre_test{true} do
+  choose :exclusive do
+    alternative "data.a &gt;= 3 &amp;&amp; data.a &lt; 6" do
+      call :a62, :timeout, { :label =&gt; "D", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-0937F905-A975-4DB2-A8C9-CD523611AEF5", :parameters =&gt; { :timeout =&gt; 1 } }
+      call :a58, :timeout, { :label =&gt; "A", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819", :parameters =&gt; { :timeout =&gt; 1 } }, &lt;&lt;-end 
+data.a += 1
+      end
+      call :a61, :timeout, { :label =&gt; "B", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E", :parameters =&gt; { :timeout =&gt; 1 } }
+    end
+    alternative "data.a &lt; 3" do
+      call :a60, :timeout, { :label =&gt; "C", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-7E70A0D7-660E-4C1B-B377-64387F99BD87", :parameters =&gt; { :timeout =&gt; 1 } }
+      call :a61, :timeout, { :label =&gt; "B", :method =&gt; nil, :type =&gt; "serviceTask", :mid =&gt; "sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E", :parameters =&gt; { :timeout =&gt; 1 } }
+    end
+    otherwise do
+      break
+    end
+  end
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="json" svg-label="Get JSON">
+      <call id="a58" endpoint="timeout">
         <parameters>
-          <label>Get JSON</label>
-          <method>get</method>
-          <parameters/>
+          <label>A</label>
+          <method/>
+          <type>serviceTask</type>
+          <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+          <parameters>
+            <timeout>1</timeout>
+          </parameters>
         </parameters>
-        <manipulate>data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']</manipulate>
+        <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
       </call>
-      <call id="a2" endpoint="xml">
+      <call id="a61" endpoint="timeout">
         <parameters>
-          <label>Get XML</label>
-          <method>get</method>
-          <parameters/>
+          <label>B</label>
+          <method/>
+          <type>serviceTask</type>
+          <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+          <parameters>
+            <timeout>1</timeout>
+          </parameters>
         </parameters>
-        <manipulate>data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
       </call>
+      <loop pre_test="true">
+        <choose mode="exclusive">
+          <alternative condition="data.a &gt;= 3 &amp;&amp; data.a &lt; 6" language="text/javascript">
+            <call id="a62" endpoint="timeout">
+              <parameters>
+                <label>D</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-0937F905-A975-4DB2-A8C9-CD523611AEF5</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a58" endpoint="timeout">
+              <parameters>
+                <label>A</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+              <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <alternative condition="data.a &lt; 3" language="text/javascript">
+            <call id="a60" endpoint="timeout">
+              <parameters>
+                <label>C</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-7E70A0D7-660E-4C1B-B377-64387F99BD87</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <otherwise>
+            <break/>
+          </otherwise>
+        </choose>
+      </loop>
     </description>
   </dslx>
   <status>
@@ -54,25 +130,96 @@ 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">
+      <call id="a58" endpoint="timeout">
         <parameters>
-          <label>Get JSON</label>
-          <method>get</method>
-          <parameters/>
+          <label>A</label>
+          <method/>
+          <type>serviceTask</type>
+          <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+          <parameters>
+            <timeout>1</timeout>
+          </parameters>
         </parameters>
-        <manipulate>data.json = result
-data.json_lv = result['lv']
-data.json_lvnr = result['lv']['lvnr']</manipulate>
+        <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
       </call>
-      <call id="a2" endpoint="xml">
+      <call id="a61" endpoint="timeout">
         <parameters>
-          <label>Get XML</label>
-          <method>get</method>
-          <parameters/>
+          <label>B</label>
+          <method/>
+          <type>serviceTask</type>
+          <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+          <parameters>
+            <timeout>1</timeout>
+          </parameters>
         </parameters>
-        <manipulate>data.xml_lv = result.find('string(/data/lv)')
-data.xml_lvnr = result.find('string(/data/lv/@id)')</manipulate>
       </call>
+      <loop pre_test="true">
+        <choose mode="exclusive">
+          <alternative condition="data.a &gt;= 3 &amp;&amp; data.a &lt; 6" language="text/javascript">
+            <call id="a62" endpoint="timeout">
+              <parameters>
+                <label>D</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-0937F905-A975-4DB2-A8C9-CD523611AEF5</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a58" endpoint="timeout">
+              <parameters>
+                <label>A</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-49FC5AAA-6F02-4F10-9379-6AB4AADDF819</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+              <manipulate output="result" language="application/javascript">data.a += 1</manipulate>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <alternative condition="data.a &lt; 3" language="text/javascript">
+            <call id="a60" endpoint="timeout">
+              <parameters>
+                <label>C</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-7E70A0D7-660E-4C1B-B377-64387F99BD87</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+            <call id="a61" endpoint="timeout">
+              <parameters>
+                <label>B</label>
+                <method/>
+                <type>serviceTask</type>
+                <mid>sid-D16D28EC-08D9-4FA6-92F4-D533E21C9C5E</mid>
+                <parameters>
+                  <timeout>1</timeout>
+                </parameters>
+              </parameters>
+            </call>
+          </alternative>
+          <otherwise>
+            <break/>
+          </otherwise>
+        </choose>
+      </loop>
     </description>
   </description>
   <transformation>