cpee 1.4.7 → 1.4.8

data/server/instances/1/properties.xml

@@ -1,95 +1,38 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>44cfec5e-ae21-4948-8a84-bffc76209842</uuid>
-    <info>Other Test</info>
+    <uuid/>
+    <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
-    <theme>default</theme>
   </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; [⭐(:name =&gt; :from, :value =&gt; data.from), ⭐(:name =&gt; :to, :value =&gt; data.to), ⭐(:name =&gt; :persons, :value =&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; [⭐(:name =&gt; :to, :value =&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; [⭐(:name =&gt; :costs, :value =&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 @@ data.costs += result.value('costs').to_f</finalize>
   </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/10/notifications/182434032285ca1d06a8b6554b8889c8/consumer-secret

@@ -0,0 +1 @@
+67c4f55a8651a9e6638dabb3162e59c5

data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/producer-secret

@@ -0,0 +1 @@
+a80086de3fde314651e73260eef88b7f

data/server/instances/{76/notifications/a59df784fab648f5327915fc6cf012ab → 10/notifications/182434032285ca1d06a8b6554b8889c8}/subscription.xml

@@ -1,38 +1,23 @@
-<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/events">
   <topic id="activity">
     <event>calling</event>
-    <event>status</event>
-    <event>manipulating</event>
     <event>failed</event>
+    <event>manipulating</event>
     <event>done</event>
   </topic>
-  <topic id="position">
-    <event>change</event>
-  </topic>
-  <topic id="description">
-    <event>change</event>
-    <event>error</event>
-  </topic>
-  <topic id="state">
-    <event>change</event>
-  </topic>
   <topic id="dataelements">
     <event>change</event>
   </topic>
   <topic id="endpoints">
     <event>change</event>
   </topic>
-  <topic id="attributes">
-    <event>change</event>
-  </topic>
-  <topic id="transformation">
-    <event>change</event>
-  </topic>
-  <topic id="handlerwrapper">
+  <topic id="description">
     <event>error</event>
+  </topic>
+  <topic id="state">
     <event>change</event>
   </topic>
-  <topic id="handlers">
+  <topic id="status">
     <event>change</event>
   </topic>
 </subscription>

data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/consumer-secret

@@ -0,0 +1 @@
+f1b893f930441651cf29a0d5cc655934

data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/producer-secret

@@ -0,0 +1 @@
+27c304e972512ee874969576adcf3c6c

data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/subscription.xml

@@ -0,0 +1,6 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://solo.wst.univie.ac.at:9299/log">
+  <topic id="activity">
+    <event>calling</event>
+    <event>done</event>
+  </topic>
+</subscription>

data/server/instances/10/properties.xml

@@ -1,102 +1,108 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>0e4f3926-7e59-4d64-84aa-a8aef708eb75</uuid>
-    <info>Eigenspannungsmessung 140</info>
-    <modeltype>CPEE</modeltype>
-    <theme>labels</theme>
+    <uuid>cb9f41ef-e119-43a5-b8fa-5851ec3faef1</uuid>
+    <info>s</info>
+    <modeltype>Signavio</modeltype>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
-  <dataelements/>
+  <dataelements>
+    <x>_begin</x>
+    <nasty>What a nasty bug</nasty>
+  </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>call :a1, nil, parameters: { :label =&gt; "Grunddaten erfassen UI", :method =&gt; :post, :arguments =&gt; nil }, update: &lt;&lt;-END
-  data.scheibenmaterial = result.scheibenmaterial
-  data.scheibenbauform = result.scheibenbauform
-  data.eigenspannungswert = result.eigenspannungswert
-  data.taetigkeiten = []
+  <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4), ⭐(:name =&gt; :bug, :value =&gt; data.nasty)] }, finalize: &lt;&lt;-END
+  data.x += "done"
 END
-call :a2, nil, parameters: { :label =&gt; "max Eigenspannungswert festellen", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :scheibenbauform, :value =&gt; "data.scheibenbauform"), ⭐(:name =&gt; :scheibenmaterial, :value =&gt; "data.scheibenmaterial")] }, finalize: &lt;&lt;-END
-  data.maxeigenspannungswert = result.maxeigenspannungswert
-  data.mineigenspannungswert = result.mineigenspannungswert
+parallel :wait =&gt; 2 do
+  parallel_branch do
+    call :a2_1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 6)] }
+  end
+  parallel_branch do
+    call :a2_2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }
+  end
+end
+manipulate :a3, &lt;&lt;-END
+  data.x += '_end'
 END
-choose :exclusive do
-  alternative test{data.eigenspannungswert &lt; data.mineigenspannungswert || data.eigenspannungswert &gt; data.maxeigenspannunswert} do
-    choose :exclusive do
-      alternative test{data.tauschgruppe["regenerieren"]} do
-        manipulate :a4, &lt;&lt;-END
-          data.taetigkeiten &lt;&lt; "Radsatz regenerieren"
-        END
-      end
-      otherwise  do
-        manipulate :a3, &lt;&lt;-END
-          data.taetigkeiten &lt;&lt; "Abpressen"
-        END
-      end
-    end
+choose :inclusive do
+  alternative "data.x != nil" do
+    call :a4_1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }
+  end
+  otherwise  do
+    call :a4_2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 10)] }
   end
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="">
-        <parameters>
-          <label>Grunddaten erfassen UI</label>
-          <method>:post</method>
-          <arguments/>
-        </parameters>
-        <finalize output="result"/>
-        <update output="result">data.scheibenmaterial = result.scheibenmaterial
-data.scheibenbauform = result.scheibenbauform
-data.eigenspannungswert = result.eigenspannungswert
-data.taetigkeiten = []</update>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_notes_output/>
-          <_attachments/>
-        </_notes>
-      </call>
-      <call id="a2" endpoint="">
+      <call id="a1" endpoint="timeout">
         <parameters>
-          <label>max Eigenspannungswert festellen</label>
+          <!--{{{-->
           <method>:post</method>
           <arguments>
-            <scheibenbauform>data.scheibenbauform</scheibenbauform>
-            <scheibenmaterial>data.scheibenmaterial</scheibenmaterial>
+            <timeout>4</timeout>
+            <bug>data.nasty</bug>
           </arguments>
         </parameters>
-        <finalize output="result">data.maxeigenspannungswert = result.maxeigenspannungswert
-data.mineigenspannungswert = result.mineigenspannungswert</finalize>
-        <update output="result"/>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_notes_output/>
-          <_attachments/>
-        </_notes>
+        <!--}}}-->
+        <finalize output="result">data.x += "done"</finalize>
       </call>
-      <choose mode="exclusive">
-        <alternative condition="data.eigenspannungswert &lt; data.mineigenspannungswert || data.eigenspannungswert &gt; data.maxeigenspannunswert">
-          <choose mode="exclusive">
-            <alternative condition="data.tauschgruppe[&quot;regenerieren&quot;]">
-              <manipulate id="a4" label="Regenerieren hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Radsatz regenerieren"</manipulate>
-            </alternative>
-            <otherwise>
-              <manipulate id="a3" label="Abpressen hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Abpressen"</manipulate>
-            </otherwise>
-          </choose>
+      <parallel wait="2">
+        <parallel_branch>
+          <call id="a2_1" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>6</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
+        </parallel_branch>
+        <parallel_branch>
+          <call id="a2_2" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>2</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
+        </parallel_branch>
+      </parallel>
+      <manipulate id="a3">data.x += '_end'</manipulate>
+      <choose>
+        <alternative condition="data.x != nil">
+          <call id="a4_1" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>4</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
         </alternative>
+        <otherwise>
+          <call id="a4_2" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>10</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
+        </otherwise>
       </choose>
     </description>
   </dslx>
@@ -106,68 +112,76 @@ data.mineigenspannungswert = result.mineigenspannungswert</finalize>
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="">
-        <parameters>
-          <label>Grunddaten erfassen UI</label>
-          <method>:post</method>
-          <arguments/>
-        </parameters>
-        <finalize output="result"/>
-        <update output="result">data.scheibenmaterial = result.scheibenmaterial
-data.scheibenbauform = result.scheibenbauform
-data.eigenspannungswert = result.eigenspannungswert
-data.taetigkeiten = []</update>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_notes_output/>
-          <_attachments/>
-        </_notes>
-      </call>
-      <call id="a2" endpoint="">
+      <call id="a1" endpoint="timeout">
         <parameters>
-          <label>max Eigenspannungswert festellen</label>
+          <!--{{{-->
           <method>:post</method>
           <arguments>
-            <scheibenbauform>data.scheibenbauform</scheibenbauform>
-            <scheibenmaterial>data.scheibenmaterial</scheibenmaterial>
+            <timeout>4</timeout>
+            <bug>data.nasty</bug>
           </arguments>
         </parameters>
-        <finalize output="result">data.maxeigenspannungswert = result.maxeigenspannungswert
-data.mineigenspannungswert = result.mineigenspannungswert</finalize>
-        <update output="result"/>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_notes_output/>
-          <_attachments/>
-        </_notes>
+        <!--}}}-->
+        <finalize output="result">data.x += "done"</finalize>
       </call>
-      <choose mode="exclusive">
-        <alternative condition="data.eigenspannungswert &lt; data.mineigenspannungswert || data.eigenspannungswert &gt; data.maxeigenspannunswert">
-          <choose mode="exclusive">
-            <alternative condition="data.tauschgruppe[&quot;regenerieren&quot;]">
-              <manipulate id="a4" label="Regenerieren hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Radsatz regenerieren"</manipulate>
-            </alternative>
-            <otherwise>
-              <manipulate id="a3" label="Abpressen hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Abpressen"</manipulate>
-            </otherwise>
-          </choose>
+      <parallel wait="2">
+        <parallel_branch>
+          <call id="a2_1" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>6</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
+        </parallel_branch>
+        <parallel_branch>
+          <call id="a2_2" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>2</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
+        </parallel_branch>
+      </parallel>
+      <manipulate id="a3">data.x += '_end'</manipulate>
+      <choose>
+        <alternative condition="data.x != nil">
+          <call id="a4_1" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>4</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
         </alternative>
+        <otherwise>
+          <call id="a4_2" endpoint="timeout">
+            <parameters>
+              <!--{{{-->
+              <method>:post</method>
+              <arguments>
+                <timeout>10</timeout>
+              </arguments>
+            </parameters>
+            <!--}}}-->
+          </call>
+        </otherwise>
       </choose>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>