cpee 1.5.27 → 2.0

data/cockpit/templates/BPM 2020 Solution View.xml

@@ -1,15 +1,14 @@
-<testset>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
   <dataelements/>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
-    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
-    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
-    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
-    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
-    <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
-    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
-    <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
-    <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
+    <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
+    <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
+    <move_camera>http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
+    <get_items_base>http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
+    <get_items_neural>http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
+    <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
+    <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
   </endpoints>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
@@ -42,33 +41,7 @@
             </_notes>
           </annotations>
         </call>
-        <call id="a7" endpoint="wait">
-          <parameters>
-            <label>Wait for camera stream delay</label>
-            <method>:post</method>
-            <arguments>
-              <timeout>5</timeout>
-            </arguments>
-            <stream>
-              <sensors/>
-              <aggregators/>
-              <costs/>
-            </stream>
-          </parameters>
-          <annotations>
-            <_timing>
-              <_timing_wait/>
-              <_timing_threshold/>
-              <_timing_min/>
-              <_timing_max/>
-              <_timing_avg/>
-            </_timing>
-            <_notes>
-              <_notes_general/>
-            </_notes>
-          </annotations>
-        </call>
-        <call id="a3" endpoint="get_items_neural">
+        <call id="a3" endpoint="get_items_base">
           <parameters>
             <label>Get item positions</label>
             <arguments/>
@@ -124,33 +97,7 @@ data.item = result[0]</finalize>
             </_notes>
           </annotations>
         </call>
-        <call id="a4" endpoint="wait">
-          <parameters>
-            <label>Wait for camera stream delay</label>
-            <method>:post</method>
-            <arguments>
-              <timeout>5</timeout>
-            </arguments>
-            <stream>
-              <sensors/>
-              <aggregators/>
-              <costs/>
-            </stream>
-          </parameters>
-          <annotations>
-            <_timing>
-              <_timing_wait/>
-              <_timing_threshold/>
-              <_timing_min/>
-              <_timing_max/>
-              <_timing_avg/>
-            </_timing>
-            <_notes>
-              <_notes_general/>
-            </_notes>
-          </annotations>
-        </call>
-        <call id="a6" endpoint="get_offset_neural">
+        <call id="a6" endpoint="get_offset_base">
           <parameters>
             <label>Get item offset</label>
             <arguments/>
@@ -162,10 +109,7 @@ data.item = result[0]</finalize>
           </parameters>
           <code>
             <prepare/>
-            <finalize output="result">data.adjusted = {
-  'x' =&gt; data.item['x'] + result['adjust_x'],
-  'y' =&gt; data.item['y'] + result['adjust_y']
-}</finalize>
+            <finalize output="result">data.adjusted = result</finalize>
             <update output="result"/>
             <rescue output="result"/>
           </code>
@@ -192,9 +136,9 @@ data.item = result[0]</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">BPM 2020 Solution View</info>
-    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
-    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
-    <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
+    <info>BPM 2020 Solution View</info>
+    <modeltype>CPEE</modeltype>
+    <theme>preset</theme>
+    <resource>ur51</resource>
   </attributes>
 </testset>

data/cockpit/templates/BPM 2020.xml

@@ -1,15 +1,26 @@
 <testset>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
   <endpoints>
-    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
-    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
-    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
-    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
+    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
+    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
+    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
+    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
     <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
-    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
+    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
     <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
     <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
-    <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
+    <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
     <subprocess xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9296/url/</subprocess>
+    <adjust xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/cpee-cockpit/templates/BPM%202020%20Manual%20Adjust.xml</adjust>
   </endpoints>
+  <attributes>
+    <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
+  </attributes>
 </testset>

data/cockpit/templates/Coopis 2010.xml

@@ -1,7 +1,16 @@
 <testset>
-  <positions/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <dataelements>
+  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://localhost:9299/">
+      <events topic="activity">calling,receiving,done</events>
+      <events topic="dataelements">change</events>
+      <events topic="endpoints">change</events>
+      <events topic="attributes">change</events>
+      <events topic="task">instantiation</events>
+    </handler>
+  </handlers>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <persons>3</persons>
     <card>Visa_12345</card>
     <airline>null</airline>
@@ -10,12 +19,12 @@
     <to>Prague</to>
     <costs>0</costs>
   </dataelements>
-  <endpoints>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <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>
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="bookAir">
         <parameters>
@@ -68,9 +77,9 @@ data.costs += result.value('costs').to_f</finalize>
       </choose>
     </description>
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml

@@ -1,13 +1,12 @@
 <testset>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info>Syncing Instance 1</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
   </attributes>
-  <positions/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <dataelements>
-    <!--{{{-->
+  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <x/>
   </dataelements>
   <!--}}}-->
@@ -18,13 +17,12 @@
     </handler>
   </handlers>
   <!--}}}-->
-  <endpoints>
-    <!--{{{-->
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
     <timeouts>http://gruppe.wst.univie.ac.at/~mangler/services/timeout-sync.php</timeouts>
   </endpoints>
   <!--}}}-->
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <!--{{{-->
       <call id="a1" endpoint="timeout">
@@ -70,11 +68,10 @@
         </code>
       </call>
     </description>
-    <!--}}}-->
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml

@@ -1,13 +1,12 @@
 <testset>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info>Syncing Instance 2</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
   </attributes>
-  <positions/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <dataelements>
-    <!--{{{-->
+  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <x/>
   </dataelements>
   <!--}}}-->
@@ -18,13 +17,12 @@
     </handler>
   </handlers>
   <!--}}}-->
-  <endpoints>
-    <!--{{{-->
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
     <timeouts>http://gruppe.wst.univie.ac.at/~mangler/services/timeout-sync.php</timeouts>
   </endpoints>
   <!--}}}-->
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <!--{{{-->
       <call id="a1" endpoint="timeout">
@@ -70,11 +68,10 @@
         </code>
       </call>
     </description>
-    <!--}}}-->
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml

@@ -1,13 +1,12 @@
 <testset>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info>Syncing Instance 3</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
   </attributes>
-  <positions/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <dataelements>
-    <!--{{{-->
+  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <x/>
   </dataelements>
   <!--}}}-->
@@ -18,13 +17,12 @@
     </handler>
   </handlers>
   <!--}}}-->
-  <endpoints>
-    <!--{{{-->
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
     <timeouts>http://gruppe.wst.univie.ac.at/~mangler/services/timeout-sync.php</timeouts>
   </endpoints>
   <!--}}}-->
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <!--{{{-->
       <call id="a1" endpoint="timeout">
@@ -70,11 +68,10 @@
         </code>
       </call>
     </description>
-    <!--}}}-->
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/Worklist.xml

@@ -1,14 +1,14 @@
 <testset>
-  <dataelements>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
     <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9398</worklist>
   </endpoints>
-  <positions/>
-  <description>
+  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="worklist">
         <parameters>
@@ -29,12 +29,12 @@
       </call>
     </description>
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
     <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>

data/cockpit/templates/convert_cpee2.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+require 'xml/smart'
+
+Dir['*.xml'].each do |f|
+  XML::Smart.modify(f) do |doc|
+    doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+    doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
+    if doc.root.qname.name == 'testset'
+      doc.find('//attributes | //endpoints | //dataelements | //positions | //transformation | //handlerwrapper | //description').each do |e|
+        e.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
+        e.namespace = nil
+      end
+    end
+  end
+end

data/cockpit/themes/compact/rngs/alternative.rng

@@ -0,0 +1,25 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label="Min in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label="Max in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label="Avg in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>

data/cockpit/themes/compact/rngs/call.rng

@@ -1,11 +1,11 @@
-<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
     <data type="string"/>
   </attribute>
-  <element name='parameters' rngui:header="Properties">
+  <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
       <data type="string" rngui:label="Short description of the task"/>
     </element>
@@ -19,7 +19,7 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name' rngui:labeltype='xml'>
+        <element rngui:label="Name" rngui:labeltype="xml">
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>
@@ -43,7 +43,7 @@
             </element>
             <element name="visualizer_params" rngui:header="Visualizer Arguments">
               <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
-                <element rngui:label='Name'>
+                <element rngui:label="Name">
                   <anyName/>
                   <data type="string" rngui:label="Value / Json"/>
                 </element>
@@ -69,7 +69,7 @@
       </element>
       <element name="costs" rngui:header="Costs" rngui:fold="closed">
         <zeroOrMore rngui:label="Create Cost Factor">
-          <element name='cost_factor'>
+          <element name="cost_factor">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
@@ -92,26 +92,26 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_wait" rngui:label='ω - Wait'>
-        <data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
       </element>
-      <element name="_timing_threshold" rngui:label='κ - Threshold'>
-        <data type='float' rngui:label='[0,3,n]' rngui:default='3'/>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
       </element>
-      <element name="_timing_min" rngui:label='Min in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_min" rngui:label="Min in min">
+        <data type="float" rngui:label="Minutes"/>
       </element>
-      <element name="_timing_max" rngui:label='Max in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_max" rngui:label="Max in min">
+        <data type="float" rngui:label="Minutes"/>
       </element>
-      <element name="_timing_avg" rngui:label='Avg in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_avg" rngui:label="Avg in min">
+        <data type="float" rngui:label="Minutes"/>
       </element>
     </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
-      <element name="_notes_general" rngui:label='General'>
-        <text rngui:wrap='true' rngui:label='Notes'/>
+      <element name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
       </element>
     </element>
   </element>
-</element>
+</element>