cpee 1.3.175 → 1.3.176

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70225433763cb242babcee10a600ef4c1c93608e
-  data.tar.gz: 656cdb6a210f034042af3286da1becec952e7e30
+  metadata.gz: de1fddafb011348e2cf5975eaa7ed99e84557fe1
+  data.tar.gz: ff8a410e8ea13badaec15f85fb5fa5e8ef8edf3e
 SHA512:
-  metadata.gz: da3e0654adf834fdaa9b10268a31639516865fb80d9828a716679fc5d60e3c87147528ba16942254ce8ec81c25700b4533f1eddc049cc27aec8dfb8d15d6e623
-  data.tar.gz: 8b3493514a48f2fe03a7a1662ad71cacaedf124f92fa457bf179dbb6572c3d1d0ac12402c5cf0570ddcd82633de4e667d6364cc2944b9a0975ad049b34f610c0
+  metadata.gz: 14341e5d08dfbdd33aafcfd60d858011a7c849bbafcee32d3b4e74b71b28e62948822911ec2236bbaf0fbca8192b85da6a104c3e4ab2cb70e6990a22e4e07a37
+  data.tar.gz: aa0691f830b06cc49d31399e9a8bd19cac8d11e61e2171dbc80edaf82484095b86f6427f5c3f1a2afab24c93a31aa2c79dd0805b27f87230e801d763cb31a9a7

data/cockpit/index.html

@@ -173,7 +173,7 @@
           <td class="tab"                 id="tabnew"       ><h1>New</h1></td>
           <td class="tab inactive hidden" id="tabinstance"  ><h1>Instance</h1></td>
           <td class="tab inactive hidden" id="tabexecution" ><h1>Execution</h1></td>
-          <td class="tabbehind"><input name="current-instance" type="text" value="" readonly='readonly' style='display:none'/><a id='current-instance'></a></td>
+          <td class="tabbehind"><input name="current-instance" type="text" value="" readonly='readonly' style='display:none'/><a id='current-instance'></a><a id='current-instance-properties'>P</a>|<a id='current-instance-subscriptions'>S</a>|<a id='current-instance-callbacks'>C</a></td>
         </tr>
         <tr class="border hidden"><td colspan="5"></td></tr>
       </table>

data/cockpit/js/instance.js

@@ -10,43 +10,43 @@ var save = {};
     save['dataelements'] = undefined;
     save['details'] = undefined;
 var node_state = {};
-var sub_more = 'topic'  + '=' + 'running' + '&' +// {{{
-               'events' + '=' + 'activity_calling,activity_manipulating,activity_failed,activity_done' + '&' +
-               'topic'  + '=' + 'running' + '&' +
+var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
+               'events' + '=' + 'calling,status,manipulating,failed,done' + '&' +
+               'topic'  + '=' + 'activity' + '&' +
                'votes'  + '=' + 'syncing_after' + '&' +
-               'topic'  + '=' + 'properties/description' + '&' +
+               'topic'  + '=' + 'description' + '&' +
                'events' + '=' + 'change,error' + '&' +
-               'topic'  + '=' + 'properties/position' + '&' +
+               'topic'  + '=' + 'position' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/state' + '&' +
+               'topic'  + '=' + 'state' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/dataelements' + '&' +
+               'topic'  + '=' + 'dataelements' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/endpoints' + '&' +
+               'topic'  + '=' + 'endpoints' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/transformation' + '&' +
+               'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/handlerwrapper' + '&' +
+               'topic'  + '=' + 'handlerwrapper' + '&' +
                'events' + '=' + 'result' + '&' +
-               'topic'  + '=' + 'properties/handlers' + '&' +
+               'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
-var sub_less = 'topic'  + '=' + 'running' + '&' +// {{{
-               'events' + '=' + 'activity_calling,activity_manipulating,activity_failed,activity_done' + '&' +
-               'topic'  + '=' + 'properties/position' + '&' +
+var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
+               'events' + '=' + 'calling,status,manipulating,failed,done' + '&' +
+               'topic'  + '=' + 'position' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/description' + '&' +
+               'topic'  + '=' + 'description' + '&' +
                'events' + '=' + 'change,error' + '&' +
-               'topic'  + '=' + 'properties/state' + '&' +
+               'topic'  + '=' + 'state' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/dataelements' + '&' +
+               'topic'  + '=' + 'dataelements' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/endpoints' + '&' +
+               'topic'  + '=' + 'endpoints' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/transformation' + '&' +
+               'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'properties/handlerwrapper' + '&' +
+               'topic'  + '=' + 'handlerwrapper' + '&' +
                'events' + '=' + 'result' + '&' +
-               'topic'  + '=' + 'properties/handlers' + '&' +
+               'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
 
 $(document).ready(function() {// {{{
@@ -60,8 +60,8 @@ $(document).ready(function() {// {{{
   $("button[name=savetestset]").click(function(){ save_testset(); });
   $("button[name=savesvg]").click(function(){ save_svg(); });
   $("input[name=votecontinue]").click(check_subscription);
-  $("input[name=testsetfile]").change(load_testsetfile);
-  $("input[name=modelfile]").change(load_modelfile);
+  $("input[name=testsetfile]").change(load_testsetfile_after);
+  $("input[name=modelfile]").change(load_modelfile_after);
 
   $.ajax({ 
     url: "testsets/testsets.xml", 
@@ -173,6 +173,9 @@ function monitor_instance(load) {// {{{
       $("input[name=current-instance]").val(url);
       $("#current-instance").text(url);
       $("#current-instance").attr('href',url);
+      $("#current-instance-properties").attr('href',url + 'properties/');
+      $("#current-instance-subscriptions").attr('href',url + 'subscriptions/');
+      $("#current-instance-callbacks").attr('href',url + 'callbacks/');
       history.replaceState({}, '', '?monitor='+url);
 
       // Change url to return to current instance when reloading (because new subscription is made)
@@ -201,25 +204,25 @@ function monitor_instance(load) {// {{{
             data = $.parseXML(e.data);
             if ($('event > topic',data).length > 0) {
               switch($('event > topic',data).text()) {
-                case 'properties/dataelements':
+                case 'dataelements':
                   monitor_instance_dataelements();
                   break;
-                case 'properties/description':
+                case 'description':
                   monitor_instance_dsl();
                   break;
-                case 'properties/endpoints':
+                case 'endpoints':
                   monitor_instance_endpoints();
                   break;
-                case 'properties/state':
+                case 'state':
                   monitor_instance_state_change(JSON.parse($('event > notification',data).text()).state);
                   break;
-                case 'properties/position':
+                case 'position':
                   monitor_instance_pos_change($('event > notification',data).text());
                   break;
-                case 'properties/transformation':
+                case 'transformation':
                   monitor_instance_transformation();
                   break;
-                case 'running':
+                case 'activity':
                   monitor_instance_running($('event > notification',data).text(),$('event > event',data).text());
                   break;
               }
@@ -392,9 +395,9 @@ function monitor_instance_pos() {// {{{
 function monitor_instance_running(notification,event) {// {{{
   if (save['state'] == "stopping") return;
   var parts = JSON.parse(notification);
-  if (event == "activity_calling")
+  if (event == "calling")
     format_visual_add(parts.activity,"active")
-  if (event == "activity_done")
+  if (event == "done")
     format_visual_remove(parts.activity,"active")
 } // }}}
 function monitor_instance_state_change(notification) { //{{{
@@ -539,11 +542,10 @@ function save_testset() {// {{{
                         type: "GET", 
                         url: base + "/properties/values/attributes/",
                         success: function(res){
+                          var name = $("value > info",res).text();
                           var pars = $X('<attributes/>');
-                          pars.append($(res.documentElement));
+                          pars.append($(res.documentElement).children());
                           testset.append(pars);
-                          var name = $("values > info",res);
-                          console.log(res);
                           $('#savetestset').attr('download',name + '.xml');
                           $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + window.btoa(testset.serializeXML()));
                           document.getElementById('savetestset').click();
@@ -565,7 +567,7 @@ function save_testset() {// {{{
     },
     error: report_failure
   });  
-}// }}}
+}// }}} 
 function save_svg() {// {{{
   var base = $("input[name=current-instance]").val();
   var params = { mimetype: 'image/svg+xml' };
@@ -580,7 +582,7 @@ function save_svg() {// {{{
         type: "GET", 
         url: base + "/properties/values/attributes/info/",
         success: function(res){
-          var name = res;
+          var name = $(res.documentElement).text();
 
           $('#savesvg').attr('download',name + '.svg');
           $('#savesvg').attr('href','data:application/xml;charset=utf-8;base64,' + window.btoa(gc.serializeXML()));
@@ -651,6 +653,7 @@ function set_testset(testset) {// {{{
 
 function load_testsetfile_after() { //{{{
   if (running) return;
+  console.log('rrrr');
   running = true;
   if (typeof window.FileReader !== 'function') {
     alert('FileReader not yet supportet');

data/cockpit/lib/relaxngui.js

@@ -0,0 +1,4 @@
+var RelaxNGui = function(doc) {
+  
+
+};

data/cockpit/lib/ui.css

@@ -173,11 +173,6 @@ div.tabbed .tabbelow {
 }
 
 div.tabbed.rest .tabbelow {
-  /* to correctly set the height when resizing with changing height with $.height() -> include padding */
-  -moz-box-sizing:    border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing:         border-box;
-
   padding: 1em;
   margin: 0;
   border-radius: 0;

data/cockpit/lib/ui.js

@@ -48,8 +48,12 @@ function ui_toggle_vis_tab(moi) {// {{{
 function ui_rest_resize() {
   if ($('div.tabbed.rest .tabbar')) {
     var theight = $(window).height() - $('div.tabbed.rest .tabbar').offset().top - $('div.tabbed.rest .tabbar').height();
-    $('div.tabbed.rest .tabbelow').height(theight);
-    $('div.tabbed.rest .tabbelow .column').height(theight);
+    $('div.tabbed.rest .tabbelow').each(function(key,ele){
+      $(ele).height(theight - parseInt($(ele).css('padding-top')) - parseInt($(ele).css('padding-bottom')) );
+    });  
+    $('div.tabbed.rest .tabbelow .column').each(function(key,ele){
+      $(ele).height(theight - parseInt($(ele).css('padding-top')) - parseInt($(ele).css('padding-bottom')) );
+    });  
   }  
 }  
 

data/cockpit/rngtest.html

@@ -0,0 +1,74 @@
+<!--
+  This file is part of CPEE.
+
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>CPEE Cockpit</title>
+
+    <!-- libs, do not modify -->
+
+    <script type="text/javascript" src="lib/jquery.min.js"></script>
+    <script type="text/javascript" src="lib/jquery.browser.js"></script>
+    <script type="text/javascript" src="lib/jquery.svg.min.js"></script>
+    <script type="text/javascript" src="lib/jquery.svgdom.min.js"></script>
+    <script type="text/javascript" src="lib/jquery-ui.custom.min.js"></script>
+    <script type="text/javascript" src="lib/util.js"></script>
+    <script type="text/javascript" src="lib/printf.js"></script>
+    <script type="text/javascript" src="lib/strftime.min.js"></script>
+    <script type="text/javascript" src="lib/parsequery.js"></script>
+    <script type="text/javascript" src="lib/underscore.min.js"></script>
+    <script type="text/javascript" src="lib/jquery.caret.min.js"></script>
+    <script type="text/javascript" src="lib/jquery.cookie.js"></script>
+    <script type="text/javascript" src="lib/jquery.redraw.js"></script>
+
+    <script type="text/javascript" src="lib/custommenu.js"></script>
+    <script type="text/javascript" src="lib/wfadaptor.js"></script>
+    <script type="text/javascript" src="lib/ui.js"></script>
+
+    <link rel="stylesheet" href="lib/wfadaptor.css" type="text/css"/>
+    <link rel="stylesheet" href="lib/custommenu.css" type="text/css"/>
+    <link rel="stylesheet" href="lib/ui.css" type="text/css"/>
+
+    <script type="text/javascript" src="lib/relaxngui.js"></script>
+    <!-- custom stuff, play arround  -->
+
+    <script type="text/javascript" src="js/ui.js"></script>
+    <script type="text/javascript" src="js/instance.js"></script>
+    <script type="text/javascript" src="js/details.js"></script>
+    <script type="text/javascript" src="js/parameters.js"></script>
+    <script type="text/javascript" src="js/wfadaptor.cpee.js"></script>
+    <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+    <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+    <script type="text/javascript">
+      $("body").ready(function(){
+        $.ajax({
+          type: "GET", 
+          url: "rngtest.rng",
+          success: function(res){
+            console.log(res);
+            new RelaxNGui($('#show'),res);
+          }
+        });  
+      });
+    </script>
+  </head>
+  <body data-defaultport="9298">
+    <div id="show">
+    </div>
+  </body>
+</html>

data/cockpit/rngtest.rng

@@ -0,0 +1,60 @@
+<element rngui:version="1.2" name="data" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org"> 
+  <rngui:ui/>
+  <element name="type">
+    <rngui:ui>
+      <rngui:readonly/>
+      <rngui:label>Type</rngui:label>
+    </rngui:ui>
+    <data type="string"/>
+  </element>
+  <element name="position">
+    <rngui:ui>
+      <rngui:readonly/>
+      <rngui:label>ID</rngui:label>
+    </rngui:ui>
+    <data type="string"/>
+  </element>
+  <element name="endpoint">
+    <rngui:ui>
+      <rngui:label>Endpoint</rngui:label>
+    </rngui:ui>
+    <data type="string"/>
+  </element>
+  <element name="code">
+    <rngui:ui>
+      <rngui:label>Script</rngui:label>
+    </rngui:ui>
+    <text/>
+  </element>
+  <element name='parameters'>
+    <rngui:ui/>
+    <element name="label">
+      <rngui:ui>
+        <rngui:label>Label</rngui:label>
+      </rngui:ui>
+      <data type="string"/>
+    </element>
+    <element name="method">
+      <rngui:ui>
+        <rngui:label>Method</rngui:label>
+      </rngui:ui>
+      <choice>
+        <value>:post</value>
+        <value>:get</value>
+        <value>:put</value>
+        <value>:delete</value>
+      </choice>
+    </element>
+    <element name="parameters">
+      <zeroOrMore>
+        <rngui:ui>
+          <rngui:heading>Label</rngui:heading>
+        </rngui:ui>
+        <element>
+          <anyName/>
+          <data type="string"/>
+        </element>
+      </zeroOrMore>
+    </element>  
+  </element>
+</element>

data/cockpit/rngtest.xml

@@ -0,0 +1,15 @@
+<data>
+  <type></type>
+  <position></position>
+  <endpoint></endpoint>
+  <code></code>
+  <parameters>
+    <label></label>
+    <method>:get</method>
+    <parameters>
+      <a/>
+      <b/>
+      <c/>
+    </parameters>
+  </parameters>
+</data>

data/cockpit/testsets/Concurrent.xml

@@ -21,8 +21,8 @@
                 <to>"Vienna"</to>
               </parameters>
             </parameters>
-            <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
-        data.costs += result.value('costs').to_f</manipulate>
+            <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+        data.costs += result.value('costs').to_f</finalize>
           </call>
         </parallel_branch>
         <manipulate id="a3">      data.persons -= 1</manipulate>  

data/cockpit/testsets/Coopis Testset.xml

@@ -27,9 +27,9 @@
             <persons>data.persons</persons>
           </parameters>
         </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
+        <finalize output="result">  data.airline = result.value('id')
     data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
+    status.update 1, 'Hotel'</finalize>
       </call>
       <parallel>
         <loop pre_test="data.persons > 0">
@@ -41,8 +41,8 @@
                   <to>data.to</to>
                 </parameters>
               </parameters>
-              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</manipulate>
+              <finalize output="result">        data.hotels &lt;&lt; result.value('id')
+          data.costs += result.value('costs').to_f</finalize>
             </call>
           </parallel_branch>
           <manipulate id="a3">      data.persons -= 1</manipulate>  

data/cockpit/testsets/Linear.xml

@@ -20,7 +20,7 @@
             <timeout>2</timeout>
           </parameters>
         </parameters><!--}}}-->
-        <manipulate output="result">  data.x += "a1,"</manipulate>  
+        <finalize output="result">  data.x += "a1,"</finalize>  
       </call>  
       <call id="a2" endpoint="timeout">
         <parameters><!--{{{-->
@@ -29,7 +29,7 @@
             <timeout>4</timeout>
           </parameters>
         </parameters><!--}}}-->
-        <manipulate output="result">  data.x += "a2,"</manipulate>
+        <finalize output="result">  data.x += "a2,"</finalize>
       </call>
       <call id="a3" endpoint="timeout">
         <parameters><!--{{{-->
@@ -38,7 +38,7 @@
             <timeout>4</timeout>
           </parameters>
         </parameters><!--}}}-->
-        <manipulate output="result">  data.x += "a3,"</manipulate>  
+        <finalize output="result">  data.x += "a3,"</finalize>  
       </call>  
     </description><!--}}}-->
   </description>

data/cockpit/testsets/Mangler 1.xml

@@ -19,7 +19,7 @@
             <bug>data.nasty</bug>
           </parameters>
         </parameters><!--}}}-->
-        <manipulate output="result">  data.x += "done"</manipulate>  
+        <finalize output="result">  data.x += "done"</finalize>  
       </call>  
       <parallel wait="2">
         <parallel_branch>