cpee 1.5.24 → 2.0.1

data/cockpit/{testsets/Syncing P34 2.xml → 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,9 +68,8 @@
         </code>
       </call>
     </description>
-    <!--}}}-->
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/{testsets/Syncing P34 3.xml → 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,9 +68,8 @@
         </code>
       </call>
     </description>
-    <!--}}}-->
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates/Worklist.xml

@@ -0,0 +1,42 @@
+<testset>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
+    <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
+  </dataelements>
+  <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 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>
+          <label>"OK OR NOT OK"</label>
+          <method>:post</method>
+          <arguments>
+            <orgmodel>"organisation1"</orgmodel>
+            <domain>"Virtual Business 1"</domain>
+            <form>"http://cpee.org/~demo/form/form-f.html"</form>
+            <role>"Regular"</role>
+            <schaden>"55546"</schaden>
+            <text>"fetzen hin"</text>
+          </arguments>
+        </parameters>
+        <code>
+          <finalize>data.bla = result</finalize>
+        </code>
+      </call>
+    </description>
+  </description>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <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>
+  </attributes>
+</testset>

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,19 +92,25 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_min" rngui:label='Min in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
       </element>
-      <element name="_timing_max" rngui:label='Max in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
       </element>
-      <element name="_timing_avg" rngui:label='Avg 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>
+      <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>

data/cockpit/themes/compact/rngs/callmanipulate.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>
@@ -91,44 +91,50 @@
     </element>
   </element>
   <element name="code" rngui:header="Implementation">
-    <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold='closed_conditional'>
-      <text rngui:label='Script that is executed, before a service call'/>
+    <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
+      <text rngui:label="Script that is executed, before a service call"/>
     </element>
-    <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold='closed_conditional'>
+    <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold="closed_conditional">
       <attribute name="output" rngui:label="Access Variable" rngui:default="result">
         <data type="string" rngui:readonly="true"/>
       </attribute>
-      <text rngui:label='Script that is executed, when a service returns data'/>
+      <text rngui:label="Script that is executed, when a service returns data"/>
     </element>
-    <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold='closed_conditional'>
+    <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold="closed_conditional">
       <attribute name="output" rngui:label="Access Variable" rngui:default="result">
         <data type="string" rngui:readonly="true"/>
       </attribute>
-      <text rngui:label='Script that is executed, when a service sends intermediate data'/>
+      <text rngui:label="Script that is executed, when a service sends intermediate data"/>
     </element>
-    <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold='closed_conditional'>
+    <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold="closed_conditional">
       <attribute name="output" rngui:label="Access Variable" rngui:default="result">
         <data type="string" rngui:readonly="true"/>
       </attribute>
-      <text rngui:label='Script that is executed, if a service call fails'/>
+      <text rngui:label="Script that is executed, if a service call fails"/>
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_min" rngui:label='Min in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]"/>
       </element>
-      <element name="_timing_max" rngui:label='Max in min'>
-        <data type='float' rngui:label='Minutes'/>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]"/>
       </element>
-      <element name="_timing_avg" rngui:label='Avg 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>
+      <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>

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

@@ -0,0 +1,14 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="choose" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="mode" rngui:label="Mode" rngui:default="exclusive">
+    <choice>
+      <value>exclusive</value>
+      <value>inclusive</value>
+    </choice>
+  </attribute>
+  <element rngui:ignore="true" name="alternative">
+    <attribute name="condition">
+      <data type="string"/>
+    </attribute>
+  </element>
+  <element rngui:ignore="true" name="otherwise"/>
+</element>

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

@@ -0,0 +1,5 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="critical" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="sid" rngui:label="SID" rngui:default="section" rngui:hint="Identical SID's shared by between differnt 'critical' elements define mutual exclusive areas.">
+    <data type="string"/>
+  </attribute>
+</element>

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

@@ -0,0 +1 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="escape" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0"/>

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

@@ -0,0 +1,3 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" name="group" rngui:version="1.2" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <text rngui:label="A group of tasks, that belongs together"/>
+</element>

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

@@ -0,0 +1,22 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="mode" rngui:label="Mode" rngui:default="pre_test">
+    <choice>
+      <value>pre_test</value>
+      <value>post_test</value>
+    </choice>
+  </attribute>
+  <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 times">
+      <data type="nonNegativeInteger" rngui:label="Times"/>
+    </element>
+    <element name="_probability_max" rngui:label="Max times">
+      <data type="nonNegativeInteger" rngui:label="Times"/>
+    </element>
+    <element name="_probability_avg" rngui:label="Avg times">
+      <data type="nonNegativeInteger" rngui:label="Times"/>
+    </element>
+  </element>
+</element>

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

@@ -0,0 +1,9 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="label" rngui:label="Label">
+    <data type="string" rngui:label="Short description of the task"/>
+  </attribute>
+  <text rngui:label="Script that is executed"/>
+</element>

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

@@ -0,0 +1,22 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <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/parallel.rng

@@ -0,0 +1,21 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
+    <data type="integer"/>
+  </attribute>
+  <element rngui:ignore="true" name="parallel_branch">
+    <attribute name="pass">
+      <data type="string"/>
+    </attribute>
+    <attribute name="local">
+      <data type="string"/>
+    </attribute>
+  </element>
+  <element rngui:ignore="true" name="parallel_branch">
+    <attribute name="pass">
+      <data type="string"/>
+    </attribute>
+    <attribute name="local">
+      <data type="string"/>
+    </attribute>
+  </element>
+</element>