cpee 2.0.28 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446d47727cd6450b4206d4ec787bbf052fef6ca9684535e8b4710aefe35f1e04
-  data.tar.gz: 984c42f0438d5bacfab15a20358bf549be38ab73928265656eb978c8c22fce28
+  metadata.gz: b53cb9f8e98081958903b4e747c373d41e9dcee3bbe5538827840e2f53b99a76
+  data.tar.gz: 40d78337aae0539ced2265c1e06aa5fd6835ab65bc911ef3e177ee4fbefa354a
 SHA512:
-  metadata.gz: b24734fdd7d03290bdfafc2cb1362e531216b069ea4e7e8c77ca6a668f79bbd9bf9c3e4648bb9583eab7ef3a2e07deecbb29f5e76966d18ebdc1a56ff1b1ce40
-  data.tar.gz: 4366443cc3fe3f3bbdc7beb4179b8c1573111ff22fd515bcb815ad80ddf3c44f35ba2a96fb82dff54a73a983348461e7bc5653c8827661cc9ec317ebe85cdcbe
+  metadata.gz: e054275ba62f4d1212f0fa4dcb78d498bd3c22dfe827dab1b77bd7425f28afff5148603710252500d39a4205bf2cba051d25d5ae1bdf652ddf09d898125d8db0
+  data.tar.gz: 7442466d0aa7a6f71ff5dbfbf52373ef784a2ad3fefa6c34410c447abeac2856630e257e7099ef2217b9497ce2c8164548950aa60b4aacdb859f7c29bb666095

data/cockpit/config.json

@@ -1,3 +1,3 @@
 {
-  "res-url": "https://cpee.org/flow/resources/"
+  "res-url": "https://tango.wst.univie.ac.at/flow/resources/"
 }

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/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/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'));
@@ -401,12 +406,12 @@ function monitor_instance_values(val) {// {{{
         $(res).find(" > endpoints > *").each(function(k,v) {
           save['endpoints_list'][v.localName] = v.lastChild.nodeValue;
           $.ajax({
-            url: rep + encodeURIComponent($(v).text()),
+            url: rep + 'endpoints/' + encodeURIComponent($(v).text()),
             success: function() {
               tmp[v.tagName] = {};
               var deferreds = [new $.Deferred(), new $.Deferred(), new $.Deferred()];
               $.ajax({
-                url: rep + encodeURIComponent($(v).text()) + "/symbol.svg",
+                url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/symbol.svg",
                 success: function(res) {
                   tmp[v.tagName]['symbol'] = res;
                   deferreds[0].resolve(true);
@@ -414,7 +419,7 @@ function monitor_instance_values(val) {// {{{
                 error: deferreds[0].resolve
               })
               $.ajax({
-                url: rep + encodeURIComponent($(v).text()) + "/schema.rng",
+                url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/schema.rng",
                 success: function(res) {
                   tmp[v.tagName]['schema'] = res;
                   deferreds[1].resolve(true);
@@ -422,7 +427,7 @@ function monitor_instance_values(val) {// {{{
                 error: deferreds[1].resolve
               })
               $.ajax({
-                url: rep + encodeURIComponent($(v).text()) + "/properties.json",
+                url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/properties.json",
                 success: function(res) {
                   tmp[v.tagName]['properties'] = res;
                   deferreds[2].resolve(true);
@@ -726,7 +731,6 @@ function monitor_instance_state_change(notification) { //{{{
     }
 
     if (notification != "ready" && notification != "stopped" && notification != "running") {
-      console.log('rrr');
       $('#parameters ui-content ui-area > button').attr('disabled','disabled');
       $('#state_any').hide();
     } else {
@@ -840,7 +844,36 @@ function get_testset(deferred) {// {{{
           ele.removeAttribute('xmlns');
         }
       });
-      deferred.resolve(name,testset);
+      $.ajax({
+        type: "GET",
+        url: url + "/notifications/subscriptions/",
+        success: async function(res){
+          let values = $("subscriptions > subscription[url]",res);
+          let subs = $X('<subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0"/>');
+          let promises = [];
+          let scount = 0;
+          values.each(function(){
+            let sid = $(this).attr('id');
+            if (sid.match(/^_/)) {
+              scount += 1;
+              promises.push(
+                $.ajax({
+                  type: "GET",
+                  url: url + "/notifications/subscriptions/" + sid,
+                  error: report_failure
+                }).then(function(a) {
+                  subs.append($(a.documentElement));
+                })
+              );
+            };
+          });
+          await Promise.all(promises);
+          if (scount > 0) { testset.append(subs); }
+          deferred.resolve(name,testset);
+        },
+        error: function() { deferred.reject(); report_failure(); }
+      });
+
     },
     error: function() { deferred.reject(); report_failure(); }
   });
@@ -899,7 +932,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));
@@ -914,11 +947,10 @@ async function set_testset(testset,exec) {// {{{
       url: url + "/notifications/subscriptions/",
       error: report_failure
     }).then(async function(res) {
-      var rcount = 0;
       var values = $("subscriptions > subscription[url]",res);
-      var vals = [];
+      var vals = {};
       values.each(function(){
-        vals.push($(this).attr('url'));
+        vals[$(this).attr('url')] = $(this).attr('id');
       });
       await load_testset_handlers(url,testset,vals);
     })
@@ -1078,24 +1110,67 @@ async function load_des(url,model) { //{{{
     error: report_failure
   });
 } //}}}
+
+function load_testset_extract_handlers(inp,han,suburl) { //{{{
+  inp.push("url="+encodeURIComponent(suburl).replace(/~/,'%7E'));
+  $(">*",han).each(function(_,top){
+    let events = [];
+    let votes = [];
+    $(">*",top).each(function(_,it){
+      if (it.nodeName == 'event') {
+        events.push($(it).text());
+      }
+      if (it.nodeName == 'vote') {
+        votes.push($(it).text());
+      }
+    });
+    if (events.length > 0) {
+      inp.push("topic=" + $(top).attr('id'));
+      inp.push("events=" + events.join(','));
+    }
+    if (votes.length > 0) {
+      inp.push("topic=" + $(top).attr('id'));
+      inp.push("votes=" + votes.join(','));
+    }
+  });
+  return inp;
+} //}}}
+
 async function load_testset_handlers(url,testset,vals) {// {{{
   var promises = [];
-  $("testset > handlers > *",testset).each(async function(){
-    var han = this;
-    var suburl = $(han).attr('url');
-    if ($.inArray(suburl,vals) == -1) {
-      var inp = "url="+encodeURIComponent(suburl).replace(/~/,'%7E');
-      $("*",han).each(function(){
-        inp += "&topic=" + $(this).attr('topic');
-        inp += "&" + this.nodeName + "=" + $(this).text();
-      });
-      promises.push(
+  $("testset > subscriptions > *",testset).each(async function(){
+    let han = this;
+    let sid = $(han).attr('id');
+    let suburl = $(han).attr('url');
+    if (typeof(vals[suburl]) == 'undefined') {
+      if ($("*",han).length > 0) {
+        let inp = [];
+        if (sid) { inp.push("id="+encodeURIComponent(sid)); }
+        inp = load_testset_extract_handlers(inp,han,suburl);
+        promises.push(
+          $.ajax({
+            type: "POST",
+            url: url + "/notifications/subscriptions/",
+            data: inp.join('&')
+          })
+        )
+      }
+    } else {
+      if ($("*",han).length == 0) {
         $.ajax({
-          type: "POST",
-          url: url + "/notifications/subscriptions/",
-          data: inp
+          type: "DELETE",
+          url: url + "/notifications/subscriptions/" + vals[suburl],
         })
-      )
+      } else {
+        let inp = load_testset_extract_handlers([],han,suburl);
+        promises.push(
+          $.ajax({
+            type: "PUT",
+            url: url + "/notifications/subscriptions/" + vals[suburl],
+            data: inp.join('&')
+          })
+        )
+      }
     }
   });
   return Promise.all(promises);

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"/>