cpee 2.0.26 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9eaa9ba4b50b494dee99870c5564dd6213d0f614203bbbbe991cb2703ba1bf
-  data.tar.gz: 051df4a536afda04e8db5d1de5811fd2c228a27e5bb39d8c2fd46e361aeeb8a6
+  metadata.gz: b954fb6ff9aa92c7bd21f89333033b125c5a0e98a80d3790bc11e64a9b4897c7
+  data.tar.gz: d595b12d073fb81f8da205fad06536457fcdb8eef5ef7978e234cd5d3e2873f8
 SHA512:
-  metadata.gz: 36e1c5bcc5c4b3db2dcdbde03e443e771b7a72f1b7b9ce4364275840ef5c1cb7043ddb45f64aae182b6f4087fe6deaa3b340db841d1dc159595317006c17075c
-  data.tar.gz: b3cad1cbf594d0d7d5df34a026332fcfbaccaca613fbbb5e7bc348601360ca099e323ef107aa56d9f7f5f75dbe807d3cf8374d1c39c53f7e39e6d09dd53e15e2
+  metadata.gz: b206450ff31331811ea38ef50696cbe3266104e3ce84269760deedcfc9df251b507b65d3b75b3d7ce6d7c1e7c878ff14bee8eeae03617ca331490b09887344fc
+  data.tar.gz: 0e2feeae09f44385eb3b3c50807d4a5adb18388225ccc6d840b0a1ee668263fba34119e04a31bf5b776944fff76392b0511c194c6f38bf77deed22ec785245a3

data/cockpit/config.json.example

@@ -0,0 +1,7 @@
+{
+  "log-url": "https://cpee.org/logs/",
+  "templates-url": "https://cpee.org/design/server/Templates.dir/?stage=developm
+  "res-url": "https://cpee.org/flow/resources/",
+  "base-url": "https://cpee.org/flow/engine/",
+  "save-url": "https://cpee.org/design/server/"
+}

data/cockpit/css/ui.css

@@ -74,6 +74,7 @@ body {
 
 #instance ui-content { height: 7em; }
 
+#areanew td:nth-child(2)       { padding-top: 0.4em; padding-bottom: 0.4em; }
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }
 #areanew td:nth-child(3)       { width: 16em; padding-left: 1em; }
 #areanew input                 {

data/cockpit/css/wfadaptor.css

@@ -108,6 +108,17 @@ svg .stand {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
+svg .standthin {
+  fill: var(--wfadaptor-background);
+  fill-opacity:1;
+  stroke: var(--wfadaptor-base);
+  stroke-width:1.0;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
 svg .standfat {
   fill: var(--wfadaptor-background);
   fill-opacity:1;

data/cockpit/edit.html

@@ -120,7 +120,7 @@
     <ui-tabbed id="instance">
       <ui-tabbar>
         <ui-tab class="switch"                                                ></ui-tab>
-        <ui-tab class=""                data-tab="new"       id="tabnew"      >New</ui-tab>
+        <ui-tab class=""                data-tab="new"       id="tabnew"      >Config</ui-tab>
         <ui-tab class="inactive hidden" data-tab="instance"  id="tabinstance" >Instance</ui-tab>
         <ui-tab class="inactive hidden" data-tab="execution" id="tabexecution">Execution</ui-tab>
         <ui-behind                                                            ><a style='display:none' target='_blank' id='current-instance'></a><a style='display:none' target='_blank' id='current-instance-properties'>P</a><a style='display:none' target='_blank' id='current-instance-subscriptions'>S</a><a style='display:none' target='_blank' id='current-instance-callbacks'>C</a></ui-behind>
@@ -132,17 +132,14 @@
           <tr>
             <td>Resources:</td>
             <td><input name="res-url" type="text" value=""/></td>
-            <td></td>
           </tr>
           <tr>
             <td>Engine:</td>
             <td><input name="base-url" type="text" value=""/></td>
-            <td><button name="base">create new instance</button></td>
           </tr>
           <tr>
             <td>Instance:</td>
             <td><input name="instance-url" type="text" value=""/></td>
-            <td><button name="instance">monitor instance</button></td>
           </tr>
           </table>
         </ui-area> <!--}}}-->

data/cockpit/js/instance.js

@@ -53,7 +53,7 @@ var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'handlerwrapper' + '&' +
+               'topic'  + '=' + 'connectionwrapper' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -75,7 +75,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'handlerwrapper' + '&' +
+               'topic'  + '=' + 'connectionwrapper' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -105,6 +105,11 @@ function cockpit() { //{{{
           $('#templates').append($("<div class='menuitem'></div>").text(this.name.replace(/\.xml/,'')));
         }
       });
+    },
+    error: function() {
+      $("button[name=loadtestset]").attr('disabled','disabled');
+    },
+    complete: function() {
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
         uidash_toggle_vis_tab($('#instance'));
@@ -141,7 +146,7 @@ function cockpit() { //{{{
         uidash_activate_tab("#tabinstance");
         create_instance($("body").attr('current-base'),"Plain Instance",false,false);
       } else if (q.monitor) {
-        uidash_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabinstance");
         monitor_instance(q.monitor,$("body").attr('current-resources'),false,false);
       } else if (q.exec) {
         if (q.exec.match(/https?:\/\//)) {
@@ -899,7 +904,7 @@ async function set_testset(testset,exec) {// {{{
   var promises = [];
 
   var tset = $X('<properties xmlns="http://cpee.org/ns/properties/2.0"/>');
-  tset.append($("testset > handlerwrapper",testset));
+  tset.append($("testset > executionwrapper",testset));
   tset.append($("testset > positions",testset));
   tset.append($("testset > dataelements",testset));
   tset.append($("testset > endpoints",testset));

data/cockpit/js/wfadaptor.js

@@ -559,6 +559,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     if(root.tagName == 'description') { // First parsing {{{
       pos.row++;
       $(root).attr('svg-id','description');
+      $(root).attr('svg-type','description');
+      $(root).attr('svg-subtype','description');
       group.attr('element-id','group-description');
       if (illustrator.elements[sname].label) {
         labels.push({row: pos.row, element_id: 'start', tname: 'start', label: illustrator.elements[sname].label(root)});

data/cockpit/templates.legacy/Async.xml

@@ -1,12 +1,12 @@
-<testset>
-  <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>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <test>http://localhost:9301/</test>
   </endpoints>
-  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <positions/>
+  <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="test">
         <parameters>
@@ -34,13 +34,13 @@
       </call>
     </description>
   </description>
-  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <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">Async</info>
-    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+  <attributes>
+    <info>Async</info>
+    <modeltype>CPEE</modeltype>
   </attributes>
 </testset>

data/cockpit/templates.legacy/BCO.xml

@@ -1,21 +1,19 @@
-<testset>
-  <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>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <attributes>
+    <info>Linear</info>
+    <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <bc>operate</bc>
   </attributes>
-  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
-  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
     <x/>
   </dataelements>
-  <!--}}}-->
   <handlers/>
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
+  <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <!--}}}-->
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <!--{{{-->
       <call id="a1" endpoint="timeout">
@@ -62,7 +60,7 @@
       </call>
     </description>
   </description>
-  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates.legacy/BCS.xml

@@ -1,21 +1,19 @@
-<testset>
-  <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>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <attributes>
+    <info>Linear</info>
+    <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <bc>start</bc>
   </attributes>
-  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
-  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
     <x/>
   </dataelements>
-  <!--}}}-->
   <handlers/>
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
+  <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <!--}}}-->
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <!--{{{-->
       <call id="a1" endpoint="timeout">
@@ -62,7 +60,7 @@
       </call>
     </description>
   </description>
-  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates.legacy/Centurio.xml

@@ -1,7 +1,7 @@
-<testset>
-  <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">
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <positions/>
+  <dataelements>
     <losgroesse>3</losgroesse>
     <spec>12345</spec>
     <qualitaet>null</qualitaet>
@@ -9,12 +9,12 @@
     <typ>Typ A</typ>
     <score>0</score>
   </dataelements>
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
+  <endpoints>
     <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 xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <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 xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates.legacy/Concurrent.xml

@@ -1,15 +1,15 @@
-<testset>
-  <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">
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <positions/>
+  <dataelements>
     <persons>3</persons>
     <hotels>[]</hotels>
     <costs>0</costs>
   </dataelements>
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
+  <endpoints>
     <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
   </endpoints>
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <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 xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

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

@@ -1,7 +1,7 @@
-<testset>
-  <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">
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <positions/>
+  <dataelements>
     <persons>3</persons>
     <card>Visa_12345</card>
     <airline>null</airline>
@@ -10,12 +10,12 @@
     <to>Prague</to>
     <costs>0</costs>
   </dataelements>
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
+  <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>
   </endpoints>
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <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 xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

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

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

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

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

data/cockpit/templates.legacy/Infinity.xml

@@ -1,8 +1,8 @@
-<testset>
-  <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>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <endpoints>
+    <infinity>http://gruppe.wst.univie.ac.at/~mangler/infinity.php</infinity>
   </endpoints>
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <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,8 +21,8 @@
       </loop>
     </description>
   </description>
-  <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>
+    <info>Inifinity Example</info>
+    <modeltype>CPEE</modeltype>
   </attributes>
 </testset>

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

@@ -1,12 +1,12 @@
-<testset>
-  <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>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <dispense>http://boxer.wst.univie.ac.at:9200/dispense</dispense>
   </endpoints>
-  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <positions/>
+  <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="dispense">
         <parameters>
@@ -17,15 +17,15 @@
       </call>
     </description>
   </description>
-  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <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">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>
+  <attributes>
+    <info>boxxxxxer</info>
+    <modeltype>CPEE</modeltype>
+    <theme>preset</theme>
     <bc>operate</bc>
   </attributes>
 </testset>