cpee 1.5.27 → 2.0

data/cockpit/js/parameters.js

@@ -56,6 +56,10 @@ $(document).ready(function() {
     clearTimeout(timer);
     do_parameters_save(event);
   });
+  $(document).on('relaxngui_move', '#dat_dataelements, #dat_endpoints, #dat_attributes', function(event){
+    clearTimeout(timer);
+    do_parameters_save(event);
+  });
 });
 
 function do_parameters_save(event) { //{{{
@@ -63,10 +67,16 @@ function do_parameters_save(event) { //{{{
   if (save[visid].has_changed()) {
     var url = $('body').attr('current-instance');
     save[visid].set_checkpoint();
+    var send = save[visid].save_text();
     $.ajax({
-       type: "PUT",
-       url: url + "/properties/values/" + visid + "/",
-       data: ({'content': save[visid].save_text()}),
+      type: "PUT",
+      url: url + "/properties/" + visid + "/",
+      contentType: 'text/xml',
+      headers: {
+        'Content-ID': visid,
+        'CPEE-Event-Source': myid
+      },
+      data: send
     });
   }
 } //}}}

data/cockpit/js/ui.js

@@ -23,11 +23,11 @@ $(document).ready(function() {
         $("body").attr('current-resources',res['res-url']);
         $("body").attr('current-base',res['base-url']);
         $("body").attr('current-save',res['save-url']);
-        $("body").attr('current-testsets',res['testsets-url']);
+        $("body").attr('current-templates',res['testsets-url']);
         cockpit();
       },
       error: function(){
-        $("body").attr('current-testsets','testsets/');
+        $("body").attr('current-templates','templates/');
         if (location.protocol.match(/^file/)) {
           $("body").attr('current-resources',"http://localhost:" + $('body').data('res-port'));
           $("body").attr('current-base',"http://localhost:" + $('body').data('base-port'));

data/cockpit/rngs/attributes.rng

@@ -1,4 +1,4 @@
-<element rngui:version="1.2" name="value" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element rngui:version="1.2" name="attributes" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
   <zeroOrMore rngui:label="Create Attributes">
     <element rngui:label='name'>
       <anyName/>

data/cockpit/rngs/dataelements.rng

@@ -1,4 +1,4 @@
-<element rngui:version="1.2" name="value" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element rngui:version="1.2" name="dataelements" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
   <zeroOrMore rngui:label="Create Data Element">
     <element rngui:label='name'>
       <anyName/>

data/cockpit/rngs/endpoints.rng

@@ -1,4 +1,4 @@
-<element rngui:version="1.2" name="value" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element rngui:version="1.2" name="endpoints" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
   <zeroOrMore rngui:label="Create Endpoint">
     <element rngui:label='name'>
       <anyName/>

data/cockpit/templates.legacy/Async.xml

@@ -1,12 +1,12 @@
 <testset>
-  <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0"/>
+  <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>
     <test xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://localhost:9301/</test>
   </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="test">
         <parameters>
@@ -34,12 +34,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">Async</info>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
   </attributes>

data/cockpit/templates.legacy/BCO.xml

@@ -1,23 +1,21 @@
 <testset>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
     <theme>preset</theme>
     <bc>operate</bc>
   </attributes>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <dataelements>
-    <!--{{{-->
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <x/>
   </dataelements>
   <!--}}}-->
   <handlers/>
-  <endpoints>
-    <!--{{{-->
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </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">
@@ -63,11 +61,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.legacy/BCS.xml

@@ -1,23 +1,21 @@
 <testset>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
     <theme>preset</theme>
     <bc>start</bc>
   </attributes>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <dataelements>
-    <!--{{{-->
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <x/>
   </dataelements>
   <!--}}}-->
   <handlers/>
-  <endpoints>
-    <!--{{{-->
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </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">
@@ -63,11 +61,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.legacy/Centurio.xml

@@ -1,7 +1,7 @@
 <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>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <losgroesse>3</losgroesse>
     <spec>12345</spec>
     <qualitaet>null</qualitaet>
@@ -9,12 +9,12 @@
     <typ>Typ A</typ>
     <score>0</score>
   </dataelements>
-  <endpoints>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <cut>http://gruppe.wst.univie.ac.at/~mangler/services/cut.php</cut>
     <drill>http://gruppe.wst.univie.ac.at/~mangler/services/drill.php</drill>
     <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="cut">
         <parameters>
@@ -67,7 +67,7 @@ data.score += result.value('score').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"/>

data/cockpit/templates.legacy/Concurrent.xml

@@ -1,15 +1,15 @@
 <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>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <persons>3</persons>
     <hotels>[]</hotels>
     <costs>0</costs>
   </dataelements>
-  <endpoints>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
   </endpoints>
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <parallel>
         <loop mode="pre_test" condition="data.persons &gt; 0">
@@ -32,7 +32,7 @@ data.costs += result.value('costs').to_f</finalize>
       </parallel>
     </description>
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates.legacy/Coopis Testset.xml

@@ -1,7 +1,7 @@
 <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>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <persons>3</persons>
     <card>Visa_12345</card>
     <airline>null</airline>
@@ -10,12 +10,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,7 +68,7 @@ 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"/>

data/cockpit/templates.legacy/Endpoints and Data Manipulation.xml

@@ -1,15 +1,15 @@
 <testset>
-  <positions/>
-  <handlerwrapper>RescueHandlerWrapper</handlerwrapper>
-  <dataelements>
+  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
+  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">RescueHandlerWrapper</handlerwrapper>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <input>4</input>
     <data_stores_endpoint/>
     <output/>
   </dataelements>
-  <endpoints>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <ep1>Somewhere over the rainbow</ep1>
   </endpoints>
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <manipulate id="endpoints">
         endpoints.a_new_one = "new Endpoint"
@@ -22,7 +22,7 @@ data[:input] = "dataelement changed"
 data.output = data[:input]</manipulate>
     </description>
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="external"/>
     <dataelements type="external"/>
     <endpoints type="external"/>

data/cockpit/templates.legacy/ICSOC Testset.xml

@@ -1,13 +1,13 @@
 <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>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
     <feedback>true</feedback>
   </dataelements>
-  <endpoints>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <parallel>
         <parallel_branch>
@@ -87,7 +87,7 @@
       </parallel>
     </description>
   </description>
-  <transformation>
+  <transformation xmlns="http://cpee.org/ns/properties/2.0">
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates.legacy/Infinity.xml

@@ -1,8 +1,8 @@
 <testset>
-  <endpoints>
+  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
     <infinity xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/infinity.php</infinity>
   </endpoints>
-  <description>
+  <description xmlns="http://cpee.org/ns/properties/2.0">
     <description xmlns="http://cpee.org/ns/description/1.0">
       <manipulate id="man">data.pid = Digest::MD5.hexdigest(Kernel::rand().to_s)</manipulate>
       <loop mode="pre_test" condition="data.progress != 'END'">
@@ -21,7 +21,7 @@
       </loop>
     </description>
   </description>
-  <attributes>
+  <attributes xmlns="http://cpee.org/ns/properties/2.0">
     <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Inifinity Example</info>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
   </attributes>

data/cockpit/templates.legacy/Lego Boxer.xml

@@ -1,12 +1,12 @@
 <testset>
-  <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0"/>
+  <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>
     <dispense xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://boxer.wst.univie.ac.at:9200/dispense</dispense>
   </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="dispense">
         <parameters>
@@ -17,12 +17,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">boxxxxxer</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>

data/cockpit/templates.legacy/Lego Conveyor.xml

@@ -1,12 +1,12 @@
 <testset>
-  <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0"/>
+  <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>
     <conveyor xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://conveyor.wst.univie.ac.at:9200/centering</conveyor>
   </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="conveyor">
         <parameters>
@@ -17,12 +17,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">sdas</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>

data/cockpit/templates.legacy/Lego Crane.xml

@@ -1,15 +1,15 @@
 <testset>
-  <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
+  <dataelements xmlns="http://cpee.org/ns/properties/2.0"/>
+  <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>
     <cranepos xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cranex.wst.univie.ac.at:9200/pos</cranepos>
     <onoff xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://craney.wst.univie.ac.at:9200/onoff</onoff>
     <raise xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://craney.wst.univie.ac.at:9200/raise</raise>
     <lower xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://craney.wst.univie.ac.at:9200/lower</lower>
   </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="onoff">
         <parameters>
@@ -73,12 +73,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">s</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>