cpee 1.5.26 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b1a776ad1f01c2ed0d5c7340211b3dafde7f9551d97e42c5115ceccb4c20fc
-  data.tar.gz: c38b3495ea50ee3f4018e4e4f050ca0a53184a651481cf93e026e46d1774ffcd
+  metadata.gz: 6d1d7e6a27a9a6609e6ae2efd391e71595a36d6a5672bbfc6fbb615dcf2b66cd
+  data.tar.gz: 2c4628fb7fac4f492ca00f3215fdfa361c461550243b8fbc5c24b32f1f396b3f
 SHA512:
-  metadata.gz: a0959aca5925b61680097b2b062610f284d7ff060aca74cda8e092897a0fc378526a99ed28cd2232c7985fcf6a0a08b243451ec841d4743fad2f83f930598c39
-  data.tar.gz: be8d21b1ba43dd09b4e2ab499c294d72a79c62f34ebd34a654c770487e3a5789772215d2fdf5da07d9f35422e1419ef130f40ed30118a162d257068f85df0b93
+  metadata.gz: 05f3c482d24f650988760431222f8f1ee4aa320b78edb60d31705d0e8bcc7baa84a8c41fcdd36006411a27f40cb77bbdf6f7664fc6305ed4ac7bafcc6e4aff56
+  data.tar.gz: 756a3209ebf911c8407804ba5f0a88b86827578bd0d29435c8ee711c79cbbbbbe581791f6cb233cd520d72074dc7a160e6ba58fd8b35591efaef9cc72898e138

data/{FEATURES → FEATURES.md}

@@ -1,4 +1,4 @@
-CPEE Features
+# CPEE Features
 * The engine itself is a RESTful web service for simple integration into
   websites and existing information systems.
 * Instances can be created, started, stopped, and modified through simple HTTP
@@ -12,18 +12,19 @@ CPEE Features
 * It provides better coverage of workflow patterns compared to Oracle BPELPM,
   jBOSS jBPM, and Apache Ode.
 
-CPEE Technical Details
+# CPEE Technical Details
 * Reuses an existing virtual machine for executing control flow
 * Supports BPEL and other languages through transformation to a directly
   executable DSL.
 * The engine (named WEEL and available as a separate package) has a core size
-  of ~ 700 LOC.
-* Uses ~ 2 MiB of RAM per instance (depending on storage backend and data
+  of ~ 1110 LOC.
+* Each instance runs in its own OS process, can be seperately monitored and killed.
+* Uses ~ 50 MiB of RAM per instance (depending on storage backend and data
   available in instance)
 * Can utilize multiple threads per instance.
-* Cold starts an instance in less than 50ms.
+* Can be restarted in while instances are running.
 
-CPEE Applied Benefits
+# CPEE Applied Benefits
 * Interprocess Synchronization as a Service
 * Service Replacement (Repair) Service
 * Plain HTML & JavaScript instance editor that allows to modify all aspects of

data/INSTALL.md

@@ -0,0 +1 @@
+# TODO

data/{README → README.md}

@@ -1,7 +1,7 @@
 All code in this package is provided under the LGPL-3 license.
-Please read the file COPYING.
+Please read the file COPYING in the main directory.
 
-Tested for MRI >= 1.9.3
+Tested for MRI 2.6, 2.7
 
 Searching for mem-leaks:
-  valgrind --num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no ./server.rb -v start
+  valgrind --num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no ./server/server.rb -v start

data/Rakefile

@@ -12,6 +12,7 @@ spec = eval(File.read('cpee.gemspec'))
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
+  puts `ls -al pkg/*`
   `rm pkg/* -rf`
   `ln -sf #{pkg.name}.gem pkg/cpee.gem`
 end

data/cockpit/index.html

@@ -149,7 +149,7 @@
               <form id='fuckchrome'>
                 <input type='file' name='testsetfile' id='testsetfile'/>
               </form>
-              <button title='a testset includes various settings, subscriptions and a model' name="loadtestset">load template</button><button title='a testset includes various settings, subscriptions and a model' name="loadtestsetfile">load testset</button>
+              <button title='a template includes various settings, subscriptions or a (partial) model' name="loadtestset">load template</button><button title='a testset includes various settings, subscriptions or a model' name="loadtestsetfile">load testset</button>
             </div>
             <div>
               <input type='file' name='modelfile' id='modelfile'/>
@@ -182,15 +182,15 @@
                 <td>State:</td>
                 <td id='state'>
                   <span id="state_text"></span>
-                  <span id="state_any">
+                  <span id="state_any" style='display:none'>
                     <span> ⇒ </span>
-                    <button name="state_start" title='start'>Start</button>
-                    <button name="state_stop" title='stop'>Stop</button>
-                    <span id="state_extended">
+                    <button name="state_start" title='start' style='display:none'>Start</button>
+                    <button name="state_stop" title='stop' style='display:none'>Stop</button>
+                    <span id="state_extended" style='display:none'>
                       <span> / </span>
-                      <button name="state_replay" title='replay'>Replay</button>
+                      <button name="state_replay" title='replay' style='display:none'>Replay</button>
                       <span> / </span>
-                      <button name="state_abandon" title='abandon'>Abandon</button>
+                      <button name="state_abandon" title='abandon' style='display:none'>Abandon</button>
                     </span>
                   </span>
                 </td>

data/cockpit/js/details.js

@@ -48,27 +48,21 @@ function do_main_work() { //{{{
   var orignode = save['graph_adaptor'].illustrator.get_node_by_svg_id(svgid).parents('g.element[element-id]');
   var origtype = orignode.attr('element-type') + '_' + orignode.attr('element-endpoint');
 
-
   var url = $('body').attr('current-instance');
   $('#main ui-tabbar ui-behind button').removeClass('highlight');
   save['details'].set_checkpoint();
 
-  // pull out xml and add XMLNS
-  // sadly we have to serialze, add in string and then parse again
-  // as adding namespaces to nodes is not supported
-  // serialization and reparsing is faster and more robust than xslt option
   var nnew = $(save['details'].save().documentElement);
       nnew.attr('svg-id',svgid);
-      nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
 
   if ($('*[svg-id]',node).length > 0) {
     nnew.append(node.children().filter(function(){ return this.attributes['svg-id'] != undefined; }));
   }
 
-  var ntxt = nnew.serializeXML();
-      ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
-
-  node.replaceWith($X(ntxt));
+  if (node[0].namespaceURI == nnew.attr('xmlns')) { // remove xmlns when it is the same as in the parent node
+    nnew[0].removeAttribute('xmlns');
+  }
+  node.replaceWith(nnew);
 
   var ttarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
   var tnewnode = ttarget.parents('g.element[element-id]');
@@ -86,7 +80,10 @@ function do_main_work() { //{{{
     var newtype = newnode.attr('element-type') + '_' + newnode.attr('element-endpoint');
     var g = graphrealization.get_description();
     save['graph'] = $X(g);
-    save['graph'].find('[xmlns]').removeAttr('xmlns');
+    save['graph'].removeAttr('svg-id');
+    save['graph'].removeAttr('svg-type');
+    save['graph'].removeAttr('svg-subtype');
+    save['graph'].removeAttr('svg-label');
 
     if (newtype != origtype) {
       manifestation.update_details(svgid);
@@ -94,11 +91,13 @@ function do_main_work() { //{{{
     } else {
       $.ajax({
         type: "PUT",
-        url: url + "/properties/values/description/",
+        url: url + "/properties/description/",
+        contentType: 'text/xml',
         headers: {
-          "Event-Source": myid
+          'Content-ID': 'description',
+          'CPEE-Event-Source': myid
         },
-        data: ({'content': '<content>' + desc.get_description() + '</content>'})
+        data: desc.get_description()
       });
       adaptor_update();
       format_instance_pos();

data/cockpit/js/instance.js

@@ -1,4 +1,4 @@
-var ws;
+var es;
 var suspended_monitoring = false;
 var myid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
 var paths = '#dat_details input, #dat_details textarea, #dat_details select, #dat_details button, #dat_details [contenteditable], #dat_dataelements input, #dat_dataelements textarea, #dat_dataelements select, #dat_dataelements button, #dat_dataelements [contenteditable], #dat_endpoints input, #dat_endpoints textarea, #dat_endpoints select, #dat_endpoints button, #dat_endpoints [contenteditable], #dat_attributes input, #dat_attributes textarea, #dat_attributes select, #dat_attributes button, #dat_attributes [contenteditable]';
@@ -7,20 +7,32 @@ var subscription;
 var subscription_state = 'less';
 var graph_changed = new Event("graph:changed", {"bubbles":true, "cancelable":false});
 var save = {};
-    save['state']= undefined;
-    save['dsl'] = undefined;
-    save['graph'] = undefined;
-    save['graph_theme'] = undefined;
-    save['graph_adaptor'] = undefined;
     save['endpoints'] = undefined;
-    save['endpoints_cache'] = {};
-    save['endpoints_list'] = {};
     save['dataelements'] = undefined;
     save['attributes'] = undefined;
-    save['details'] = undefined;
-    save['details_target'] = undefined;
-    save['instance_pos'] = [];
 var node_state = {};
+
+function global_init() {
+  suspended_monitoring = false;
+  loading = false;
+  subscription = undefined;
+  subscription_state = 'less';
+  save['state']= undefined;
+  save['dsl'] = undefined;
+  save['activity_states'] = {}
+  save['graph'] = undefined;
+  save['graph_theme'] = undefined;
+  save['graph_adaptor'] = undefined;
+  save['endpoints_cache'] = {};
+  save['endpoints_list'] = {};
+  save['details'] = undefined;
+  save['details_target'] = undefined;
+  save['instance_pos'] = [];
+  node_state = {};
+}
+
+global_init();
+
 var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'calling,status,manipulating,failed,done' + '&' +
                'topic'  + '=' + 'activity' + '&' +
@@ -77,16 +89,16 @@ function cockpit() { //{{{
   $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
   $("button[name=savetestsetfile]").click(function(){ save_testsetfile(); });
   $("button[name=savesvgfile]").click(function(){ save_svgfile(); });
-  $("button[name=state_start]").click(function(){ $(this).attr("disabled","disabled");start_instance(); });
-  $("button[name=state_stop]").click(function(){ $(this).attr("disabled","disabled");stop_instance(); });
-  $("button[name=state_replay]").click(function(){ $(this).attr("disabled","disabled");replay_instance(); });
+  $("button[name=state_start]").click(function(){ $(this).parent().find('button').attr("disabled","disabled");start_instance(); });
+  $("button[name=state_stop]").click(function(){ $(this).parent().find('button').attr("disabled","disabled");stop_instance(); });
+  $("button[name=state_replay]").click(function(){ $(this).parent().find('button').attr("disabled","disabled");replay_instance(); });
   $("button[name=state_abandon]").click(function(){ aba_instance(); });
   $("input[name=votecontinue]").click(check_subscription);
   $("input[name=testsetfile]").change(load_testsetfile_after);
   $("input[name=modelfile]").change(load_modelfile_after);
 
   $.ajax({
-    url: $('body').attr('current-testsets') + "testsets.xml",
+    url: $('body').attr('current-templates') + ".templates.xml",
     dataType: 'xml',
     success: function(res){
       $('testset',res).each(function(){
@@ -145,7 +157,7 @@ function cockpit() { //{{{
     }
   });
   $.ajax({
-    url: $('body').attr('current-testsets') + "transformations.xml",
+    url: $('body').attr('current-templates') + ".transformations.xml",
     dataType: 'xml',
     success: function(res){
       $('transformation',res).each(function(){
@@ -171,27 +183,18 @@ function check_subscription() { // {{{
   if (num > 0 && subscription_state == 'less') {
     $.ajax({
       type: "PUT",
-      url: url + "/notifications/subscriptions/" + subscription,
-      data: (
-        sub_more + '&' +
-        'message-uid' + '=' + 'xxx' + '&' +
-        'fingerprint-with-producer-secret' + '=' + 'xxx'
-      )
+      url: url + "/notifications/subscriptions/" + subscription + '/',
+      data: sub_more
     });
     subscription_state = 'more';
   }
   if (num == 0 && subscription_state == 'more') {
     $.ajax({
       type: "PUT",
-      url: url + "/notifications/subscriptions/" + subscription,
-      data: (
-        sub_less + '&' +
-        'message-uid' + '=' + 'xxx' + '&' +
-        'fingerprint-with-producer-secret' + '=' + 'xxx'
-      )
+      url: url + "/notifications/subscriptions/" + subscription + '/',
+      data: sub_less
     });
     subscription_state = 'less';
-    format_visual_vote_clear();
   }
 }// }}}
 
@@ -246,18 +249,16 @@ function create_instance(base,name,load,exec) {// {{{
   }
 }// }}}
 
-function websocket() { //{{{
+function sse() { //{{{
   var url = $('body').attr('current-instance');
-  var Socket = "MozWebSocket" in window ? MozWebSocket : WebSocket;
-  if (ws) ws.close();
-  ws = new Socket(url.replace(/http/,'ws') + "/notifications/subscriptions/" + subscription + "/ws/");
-  ws.onopen = function() {
+  es = new EventSource(url + "/notifications/subscriptions/" + subscription + "/sse/");
+  es.onopen = function() {
     append_to_log("monitoring", "opened", "");
   };
-  ws.onmessage = function(e) {
-    data = $.parseXML(e.data);
-    if ($('event > topic',data).length > 0) {
-      switch($('event > topic',data).text()) {
+  es.onmessage = function(e) {
+    data = JSON.parse(e.data);
+    if (data['type'] == 'event') {
+      switch(data['topic']) {
         case 'dataelements':
           monitor_instance_values("dataelements");
           break;
@@ -270,39 +271,34 @@ function websocket() { //{{{
         case 'attributes':
           monitor_instance_values("attributes");
           monitor_instance_transformation();
-          if (!suspended_monitoring) { // or else it would load twice, because dsl changes also
+          if (!suspended_monitoring) { // or else it would load twice, because dsl changes also trigger
             monitor_graph_change(true);
           }
           break;
         case 'task':
           if ($('#trackcolumn').length > 0) {
-            var details = JSON.parse($('event > notification',data).text());
-            $('#trackcolumn').append($('<iframe src="track.html?monitor=' + details.received['CPEE-INSTANCE-URL'].replace(/\/*$/,'/') + '"></iframe>'));
+            $('#trackcolumn').append($('<iframe src="track.html?monitor=' + data.content.received['CPEE-INSTANCE-URL'].replace(/\/*$/,'/') + '"></iframe>'));
           }
           break;
         case 'state':
-          monitor_instance_state_change(JSON.parse($('event > notification',data).text()).state);
+          monitor_instance_state_change(data['content']['state']);
           break;
         case 'position':
-          monitor_instance_pos_change($('event > notification',data).text());
-          break;
-        case 'transformation':
-          monitor_instance_transformation();
+          monitor_instance_pos_change(data['content']);
           break;
         case 'activity':
-          monitor_instance_running($('event > notification',data).text(),$('event > event',data).text());
+          monitor_instance_running(data['content'],data['name']);
           break;
       }
-      append_to_log("event", $('event > topic',data).text() + "/" + $('event > event',data).text(), $('event > notification',data).text());
     }
-    if ($('vote > topic',data).length > 0) {
-      var notification = $('vote > notification',data).text();
-      append_to_log("vote", $('vote > topic',data).text() + "/" + $('vote > vote',data).text(), notification);
-      monitor_instance_vote_add(notification);
+    if (data['type'] == 'vote') {
+      monitor_instance_vote_add(data['content']);
     }
+    append_to_log(data['type'], data['topic'] + '/' + data['name'], JSON.stringify(data['content']));
   };
-  ws.onclose = function() {
+  es.onerror = function() {
     append_to_log("monitoring", "closed", "server down i assume.");
+    // setTimeout(sse,10000);
   };
 
   monitor_instance_values("dataelements");
@@ -314,6 +310,10 @@ function websocket() { //{{{
 } //}}}
 
 function monitor_instance(cin,rep,load,exec) {// {{{
+  global_init();
+  format_visual_clear();
+  format_visual_vote_clear();
+
   $("body").attr('current-instance',sanitize_url(cin));
   $("body").attr('current-resources',sanitize_url(rep));
 
@@ -327,7 +327,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
 
   $.ajax({
     type: "GET",
-    url: url + "/properties/schema/",
+    url: url,
     success: function(res){
       $("ui-tabbed.hidden, ui-rest.hidden").removeClass("hidden");
       $("ui-resizehandle.hidden").removeClass("hidden");
@@ -347,21 +347,15 @@ function monitor_instance(cin,rep,load,exec) {// {{{
 
       // Change url to return to current instance when reloading (because new subscription is made)
       $("input[name=votecontinue]").prop( "checked", false );
-      subscription_state = 'less';
 
       $.ajax({
         type: "POST",
         url: url + "/notifications/subscriptions/",
         data: sub_less,
         success: function(res){
-          res = res.unserialize();
-          $.each(res,function(a,b){
-            if (b[0] == 'key') {
-              subscription = b[1];
-            }
-          });
+          subscription = res;
           append_to_log("monitoring", "id", subscription);
-          websocket();
+          sse();
           if (load || exec) {
             load_testset(exec);
           }
@@ -382,13 +376,13 @@ function monitor_instance_values(val) {// {{{
 
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/" + val + "/",
+    url: url + "/properties/" + val + "/",
     success: function(res){
       save[val].content(res);
       if (val == "endpoints") {
         save['endpoints_list'] = {};
         var tmp = {};
-        $(res).find(" > value > *").each(function(k,v) {
+        $(res).find(" > endpoints > *").each(function(k,v) {
           save['endpoints_list'][v.localName] = v.lastChild.nodeValue;
           $.ajax({
             url: rep + encodeURIComponent($(v).text()),
@@ -429,7 +423,7 @@ function monitor_instance_values(val) {// {{{
           });
         });
       } else if(val == "attributes") {
-        var text = $(" > value > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
+        var text = $(" > attributes > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
         $('#title').text(text);
         document.title = text;
       }
@@ -511,12 +505,21 @@ function adaptor_init(url,theme,dslx) { //{{{
       graphrealization.notify = function(svgid) {
         var g = graphrealization.get_description();
         save['graph'] = $X(g);
-        save['graph'].find('[xmlns]').removeAttr('xmlns');
+        save['graph'].removeAttr('svg-id');
+        save['graph'].removeAttr('svg-type');
+        save['graph'].removeAttr('svg-subtype');
+        save['graph'].removeAttr('svg-label');
         document.dispatchEvent(graph_changed);
         $.ajax({
           type: "PUT",
-          url: url + "/properties/values/description/",
-          data: ({'content': '<content>' + g + '</content>'})
+          url: url + "/properties/description/",
+          contentType: 'text/xml',
+          headers: {
+            'Content-ID': 'description',
+            'CPEE-Event-Source': myid
+          },
+          data: g,
+          error: report_failure
         });
         adaptor_update();
         manifestation.events.click(svgid);
@@ -544,14 +547,14 @@ function monitor_graph_change(force) { //{{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/dslx/",
+    url: url + "/properties/dslx/",
     success: function(dslx){
-      if (force || !save['graph'] || (save['graph'] && save['graph'].serializePrettyXML() != $(dslx).serializePrettyXML())) {
+      if (force || !save['graph'] || (save['graph'] && save['graph'].serializePrettyXML() != $(dslx.documentElement).serializePrettyXML())) {
         $.ajax({
           type: "GET",
-          url: url + "/properties/values/attributes/theme/",
+          url: url + "/properties/attributes/theme/",
           success: function(res){
-            adaptor_init(url,$('value',res).text(),dslx);
+            adaptor_init(url,res,dslx);
           },
           error: function() {
             adaptor_init(url,'preset',dslx);
@@ -567,7 +570,7 @@ function monitor_instance_dsl() {// {{{
   $.ajax({
     type: "GET",
     dataType: "text",
-    url: url + "/properties/values/dsl/",
+    url: url + "/properties/dsl/",
     success: function(res){
       if (res != save['dsl']) {
         save['dsl'] = res;
@@ -589,7 +592,7 @@ function monitor_instance_state() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/state/",
+    url: url + "/properties/state/",
     dataType: "text",
     success: function(res){
       monitor_instance_state_change(res);
@@ -600,9 +603,9 @@ function monitor_instance_transformation() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/attributes/modeltype",
+    url: url + "/properties/attributes/modeltype",
     success: function(res){
-      $("#currentmodel").text($(res.documentElement).text());
+      $("#currentmodel").text(res);
     },
     error: function() {
       $("#currentmodel").text('???');
@@ -614,22 +617,30 @@ function monitor_instance_pos() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/positions/",
+    url: url + "/properties/positions/",
     success: function(res){
-      save['instance_pos'] = $("value > *",res);
+      save['instance_pos'] = $("positions > *",res);
       format_visual_clear();
       format_instance_pos();
     }
   });
 }// }}}
 
-function monitor_instance_running(notification,event) {// {{{
+function monitor_instance_running(content,event) {// {{{
   if (save['state'] == "stopping") return;
-  var parts = JSON.parse(notification);
-  if (event == "calling")
-    format_visual_add(parts.activity,"active")
-  if (event == "done")
-    format_visual_remove(parts.activity,"active")
+  if (event == "calling") {
+    save['activity_states'][content.activity_uuid] = true
+    format_visual_add(content.activity,"active")
+  }
+  if (event == "manipulating") {
+    if (!save['activity_states'][content.activity_uuid]) {
+      format_visual_add(content.activity,"active")
+    }
+  }
+  if (event == "done") {
+    delete save['activity_states'][content.activity_uuid];
+    format_visual_remove(content.activity,"active")
+  }
 } // }}}
 function monitor_instance_state_change(notification) { //{{{
   if ($('#trackcolumn').length > 0) {
@@ -668,6 +679,12 @@ function monitor_instance_state_change(notification) { //{{{
       $("button[name=state_stop]").show();
       $("button[name=state_replay]").hide();
       $("button[name=state_abandon]").hide();
+    } else {
+      $('#state_extended').hide();
+      $("button[name=state_start]").hide();
+      $("button[name=state_stop]").hide();
+      $("button[name=state_replay]").hide();
+      $("button[name=state_abandon]").hide();
     }
 
     // disable all input, also check themes
@@ -677,40 +694,39 @@ function monitor_instance_state_change(notification) { //{{{
       save['graph_adaptor'].illustrator.get_elements().removeClass('marked');
     }
 
-    if (notification == "finished" || notification == "abandoned") {
+    if (notification != "ready" && notification != "stopped" && notification != "running") {
       $('.tabbehind button').hide();
       $('#state_any').hide();
     } else {
       $('#parameters .tabbehind button').show();
+      $('#state_any').show();
     }
 
     $("#state_text").text(notification);
   }
 }   //}}}
-function monitor_instance_pos_change(notification) {// {{{
-  var parts = JSON.parse(notification);
-  if (parts['unmark']) {
-    $.each(parts['unmark'],function(a,b){
+function monitor_instance_pos_change(content) {// {{{
+  if (content['unmark']) {
+    $.each(content['unmark'],function(a,b){
       format_visual_remove(b.position,"passive")
     });
   }
-  if (parts['at']) {
-    $.each(parts['at'],function(a,b){
-      format_visual_add(b.position,"passive")
+  if (content['at']) {
+    $.each(content['at'],function(a,b){
+      format_visual_add(b.position,"passive");
     });
   }
-  if (!parts['at'] && !parts['unmark'] && !parts['after'] && !parts['wait']) {
+  if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
     monitor_instance_pos();
   }
 } // }}}
 
-function monitor_instance_vote_add(notification) {// {{{
-  var parts = JSON.parse(notification);
+function monitor_instance_vote_add(parts) {// {{{
   var ctv = $("#votes");
 
   astr = '';
   if ($("input[name=votecontinue]").is(':checked'))
-    astr += "<button id='vote_to_continue-" + parts.activity + "-" + parts.callback + "' onclick='$(this).attr(\"disabled\",\"disabled\");monitor_instance_vote_remove(\"" + parts.activity + "\",\"" + parts.callback + "\",\"true\");'>" + parts.activity + "</button>";
+    astr += "<button id='vote_to_continue-" + parts.activity + "-" + parts.key + "' onclick='$(this).attr(\"disabled\",\"disabled\");monitor_instance_vote_remove(\"" + parts.activity + "\",\"" + parts.key + "\",\"true\");'>" + parts.activity + "</button>";
   ctv.append(astr);
   format_visual_add(parts.activity,"vote")
 }// }}}
@@ -730,7 +746,7 @@ function start_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/values/state",
+    url: url + "/properties/state",
     data: ({value: "running"}),
     error: report_failure
   });
@@ -739,7 +755,7 @@ function replay_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/values/state",
+    url: url + "/properties/state",
     data: ({value: "replaying"}),
     error: report_failure
   });
@@ -749,7 +765,7 @@ function aba_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/values/state",
+    url: url + "/properties/state",
     data: ({value: "abandoned"}),
     error: report_failure
   });
@@ -758,7 +774,7 @@ function stop_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
-    url: url + "/properties/values/state",
+    url: url + "/properties/state",
     data: ({value: "stopping"}),
     error: report_failure
   });
@@ -768,7 +784,7 @@ function save_testsetfile() {// {{{
   var def = new $.Deferred();
   def.done(function(name,testset) {
     var ct = new Date();
-    $('#savetestsetfile').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
+    $('#savetestsetfile').attr('download',name + '.xml');
     $('#savetestsetfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
     document.getElementById('savetestsetfile').click();
   });
@@ -777,59 +793,30 @@ function save_testsetfile() {// {{{
 
 function get_testset(deferred) {// {{{
   var url = $('body').attr('current-instance');
-  var testset = $X('<testset/>');
 
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/dataelements/",
+    url: url + "/properties/",
     success: function(res){
-      var pars = $X('<dataelements/>');
-      pars.append($(res.documentElement).children());
-      testset.append(pars);
-      $.ajax({
-        type: "GET",
-        url: url + "/properties/values/handlerwrapper/",
-        success: function(res){
-          var pars = $X('<handlerwrapper>' + res + '</handlerwrapper>');
-          testset.append(pars);
-          $.ajax({
-            type: "GET",
-            url: url + "/properties/values/endpoints/",
-            success: function(res){
-              var pars = $X('<endpoints/>');
-              pars.append($(res.documentElement).children());
-              testset.append(pars);
-              $.ajax({
-                type: "GET",
-                url: url + "/properties/values/dslx/",
-                success: function(res){
-                  var pars = $X('<description/>');
-                  pars.append($(res.documentElement));
-                  testset.append(pars);
-                  pars = $X("<transformation><description type='copy'/><dataelements type='none'/><endpoints type='none'/></transformation>");
-                  testset.append(pars);
-                  $.ajax({
-                    type: "GET",
-                    url: url + "/properties/values/attributes/",
-                    success: function(res){
-                      var name = $("value > info",res).text();
-                      var pars = $X('<attributes/>');
-                      pars.append($(res.documentElement).children());
-                      pars.find('uuid').remove();
-                      testset.append(pars);
-                      deferred.resolve(name,testset);
-                    },
-                    error: function() { deferred.reject(); report_failure(); }
-                  });
-                },
-                error: function() { deferred.reject(); report_failure(); }
-              });
-            },
-            error: function() { deferred.reject(); report_failure(); }
-          });
-        },
-        error: function() { deferred.reject(); report_failure(); }
+      var testset = $X('<testset xmlns="http://cpee.org/ns/properties/2.0"/>');
+      testset.append($(res.documentElement).children());
+      $('testset > state',testset).remove();
+      $('testset > status',testset).remove();
+      $('testset > positions',testset).remove();
+      $('testset > dsl',testset).remove();
+      $('testset > description > *',testset).remove();
+      $('testset > description',testset).append($('testset > dslx',testset).children());
+      $('testset > transformation',testset).remove();
+      $('testset > dsl',testset).remove();
+      $('testset > dslx',testset).remove();
+      testset.append($X('<transformation xmlns="http://cpee.org/ns/properties/2.0"><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>'));
+      var name =  $('testset > attributes > info',testset).text();
+      $('[xmlns]',testset).each((idx,ele) => {
+        if (ele.parentNode.namespaceURI == ele.getAttribute('xmlns')) {
+          ele.removeAttribute('xmlns');
+        }
       });
+      deferred.resolve(name,testset);
     },
     error: function() { deferred.reject(); report_failure(); }
   });
@@ -870,7 +857,7 @@ function save_svgfile() {// {{{
       });
       $.ajax({
         type: "GET",
-        url: url + "/properties/values/attributes/info/",
+        url: url + "/properties/attributes/info/",
         success: function(res){
           var name = $(res.documentElement).text();
 
@@ -889,6 +876,15 @@ 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 > positions",testset));
+  tset.append($("testset > dataelements",testset));
+  tset.append($("testset > endpoints",testset));
+  tset.append($("testset > attributes",testset));
+  tset.append($("testset > description",testset));
+  tset.append($("testset > transformation",testset));
+
   promises.push(
     $.ajax({
       type: "GET",
@@ -903,44 +899,32 @@ async function set_testset(testset,exec) {// {{{
       });
       await load_testset_handlers(url,testset,vals);
     })
-  )
-  promises.push(load_testset_dataelements(url,testset));
-  promises.push(load_testset_attributes(url,testset));
-  promises.push(load_testset_endpoints(url,testset));
-  promises.push(load_testset_pos(url,testset));
-
-  if ($("testset > transformation",testset).length > 0) {
-    var ser = '';
-    $("testset > transformation > *",testset).each(function(){
-      ser += $(this).serializeXML() + "\n";
-    });
-    var val = "<content>" + ser + "</content>";
-    promises.push(
-      $.ajax({
-        type: "PUT",
-        url: url + "/properties/values/transformation",
-        data: ({content: val}),
-        error: report_failure
-      }).then(async function(){
-        await load_testset_des(url,testset);
-      })
-    );
-  } else {
-    promises.push(load_testset_des(url,testset));
-  }
+  );
+  promises.push(
+    $.ajax({
+      type: 'PATCH',
+      url: url + "/properties/",
+      contentType: 'text/xml',
+      headers: {
+       'Content-ID': 'properties',
+       'CPEE-Event-Source': myid
+      },
+      data: tset.serializeXML(),
+      error: report_failure
+    })
+  );
 
-  promises.push(load_testset_hw(url,testset));
   await Promise.all(promises);
   suspended_monitoring = false;
 
   $.ajax({
     type: "GET",
-    url: url + "/properties/values/state/",
+    url: url + "/properties/state/",
     dataType: "text",
     success: function(res){
       $.ajax({
         type: "PUT",
-        url: url + "/properties/values/state",
+        url: url + "/properties/state",
         data: ({value: res}),
         error: report_failure,
         success: function(res){
@@ -1004,7 +988,7 @@ function load_testset(exec) {// {{{
   var name = $("#templates div.menuitem[data-selected=selected]").text();
   var url;
   if (name) {
-    url = $('body').attr('current-testsets') + name + ".xml";
+    url = $('body').attr('current-templates') + name + ".xml";
   } else {
     if ($('body').attr('load-testset').length > 0) {
       url = $('body').attr('load-testset');
@@ -1038,11 +1022,11 @@ function load_modeltype() {// {{{
   $.ajax({
     cache: false,
     dataType: 'xml',
-    url: $('body').attr('current-testsets') + "." + name + ".xml",
+    url: $('body').attr('current-templates') + "." + name + ".xml",
     success: function(res){
       $.ajax({
         type: "PUT",
-        url: url + "/properties/values/attributes/modeltype",
+        url: url + "/properties/attributes/modeltype",
         data: ({value: name}),
         success: function(){
           set_testset(res,false);
@@ -1057,116 +1041,25 @@ function load_modeltype() {// {{{
 }// }}}
 
 async function load_des(url,model) { //{{{
-  model = model.replace(/<\?[^\?]+\?>/,'');
-  var val = "<content>" + model + "</content>";
   return $.ajax({
     type: "PUT",
-    url: url + "/properties/values/description",
-    data: ({content: val}),
+    url: url + "/properties/description/",
+    contentType: 'text/xml',
+    headers: {
+      'Content-ID': 'description',
+      'CPEE-Event-Source': myid
+    },
+    data: model,
     error: report_failure
   });
 } //}}}
-
-async function load_testset_des(url,testset) {// {{{
-  if ($("testset > description",testset).length == 0) { return; }
-  var ser = '';
-  $("testset > description > *",testset).each(function(){
-    ser += $(this).serializeXML() + "\n";
-  });
-  return load_des(url,ser);
-} // }}}
-async function load_testset_hw(url,testset) {// {{{
-  var promises = [];
-  $("testset > handlerwrapper",testset).each(function(){
-    var val = $(this).text();
-    promises.push(
-      $.ajax({
-        type: "PUT",
-        url: url + "/properties/values/handlerwrapper",
-        data: ({value: val}),
-        error: report_failure
-      })
-    );
-  });
-  return Promise.all(promises);
-} // }}}
-async function load_testset_dataelements(url,testset) {// {{{
-  if ($("testset > dataelements",testset).length == 0) { return; }
-  var ser = '';
-  $("testset > dataelements > *",testset).each(function(){
-    ser += $(this).serializeXML() + "\n";
-  });
-  var val = "<content>" + ser + "</content>";
-  return $.ajax({
-    type: "PUT",
-    url: url + "/properties/values/dataelements",
-    data: ({content: val}),
-    error: report_failure
-  });
-}// }}}
-async function load_testset_attributes(url,testset) {// {{{
-  var promises = [];
-  if ($("testset > attributes",testset).length == 0) { return; }
-  var ser = '';
-  $.ajax({
-    type: "GET",
-    url: url + "/properties/values/attributes/uuid",
-    success: function(res){
-      var uuid = $X('<uuid xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>');
-          uuid.text($('value',res).text());
-      $("testset > attributes",testset).prepend(uuid);
-      $("testset > attributes > *",testset).each(function(){
-        ser += $(this).serializeXML() + "\n";
-      });
-      var val = "<content>" + ser + "</content>";
-      promises.push(
-        $.ajax({
-          type: "PUT",
-          url: url + "/properties/values/attributes",
-          data: ({content: val}),
-          error: report_failure
-        })
-      );
-    }
-  });
-  return Promise.all(promises);
-}// }}}
-async function load_testset_endpoints(url,testset) {// {{{
-  if ($("testset > endpoints",testset).length == 0) { return; }
-  var ser = '';
-  $("testset > endpoints > *",testset).each(function(){
-    ser += $(this).serializeXML() + "\n";
-  });
-  var val = "<content>" + ser + "</content>";
-  return $.ajax({
-    type: "PUT",
-    url: url + "/properties/values/endpoints/",
-    data: ({content: val}),
-    error: report_failure
-  });
-}// }}}
-async function load_testset_pos(url,testset) {// {{{
-  if ($("testset > positions",testset).length == 0) { return; }
-  var ser = '';
-  $("testset > positions > *",testset).each(function(){
-    ser += $(this).serializeXML() + "\n";
-  });
-  var val = "<content>" + ser + "</content>";
-  return $.ajax({
-    type: "PUT",
-    url: url + "/properties/values/positions/",
-    data: ({content: val}),
-    success: monitor_instance_pos,
-    error: report_failure
-  });
-}// }}}
 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);
+      var inp = "url="+encodeURIComponent(suburl).replace(/~/,'%7E');
       $("*",han).each(function(){
         inp += "&topic=" + $(this).attr('topic');
         inp += "&" + this.nodeName + "=" + $(this).text();
@@ -1197,6 +1090,8 @@ function format_visual_remove(what,cls) {//{{{
   if (node_state[what][cls] == undefined)
     node_state[what][cls] = 0;
   node_state[what][cls] -= 1;
+  if (node_state[what][cls] < 0)
+    node_state[what][cls] = 0;
   format_visual_set(what);
 }//}}}
 
@@ -1280,6 +1175,7 @@ function format_visual_clear() {//{{{
     }
   });
   $('#votes').empty();
+
 }//}}}
 function format_visual_vote_clear() {//{{{
   node_state = {};
@@ -1371,7 +1267,13 @@ function append_to_log(what,type,message) {//{{{
   message = message.replace(/:\"/g,': "');
   message = message.replace(/:\{/g,': {');
   message = message.replace(/:\[/g,': [');
-  $("#dat_log").append("<tr><td class='fixed top'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'>" +  type + "</td><td class='fixed'>&#160;-&#160;</td><td class='long'>" +  message + "</td></tr>");
+  $("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'>" +  type + "</td><td class='fixed'>&#160;-&#160;</td><td class='long'>" +  message + "</td></tr>");
+  var dle = $("#dat_log").children();
+  if (dle.length > 100) {
+    dle.slice(100).each((k,ele) => {
+      $(ele).remove();
+    });
+  }
 }//}}}
 
 function report_failure(){}
@@ -1387,11 +1289,16 @@ function ui_pos(e,bl) {
   $(coll).each(function(k,ele){
     vals += "<" + ele + ">at</"  + ele + ">";
   });
-  vals = "<content>" + vals + "</content>";
+  vals = "<positions xmlns='http://cpee.org/ns/properties/2.0'>" + vals + "</positions>";
   $.ajax({
     type: "PUT",
-    url: url + "/properties/values/positions/",
-    data: ({content: vals}),
+    url: url + "/properties/positions/",
+    contentType: 'application/xml',
+    headers: {
+     'Content-ID': 'positions',
+     'CPEE-Event-Source': myid
+    },
+    data: vals,
     success: monitor_instance_pos,
     error: report_failure
   });