cpee 1.3.177 → 1.3.178

data/cockpit/js/wfadaptor.cpee.js

@@ -216,23 +216,6 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
-    'description': '<call id="###" endpoint="" xmlns="http://this.org/ns/description/1.0"><parameters><label>""</label><method>:post</method><parameters/></parameters><finalize output="result"/><update output="result"/></call>',
-    'permissible_children': function(node) { //{{{
-      if(node.children('manipulate').lenght < 1)
-        return [
-         {'label': 'Scripts', 
-          'function_call': adaptor.description.insert_last_into, 
-          'menu_icon': elements.callmanipulate.illustrator.svg, 
-          'params': [adaptor.description.elements.manipulate, node]}
-        ];
-      return [];
-    }, //}}}
-    'adaptor' : {//{{{
-      'mousedown': function (node, e) {
-        events.mousedown(node,e,true, true);
-      },
-      'click': events.click,
-    }//}}}
   }; /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'illustrator': {//{{{
@@ -270,7 +253,7 @@ function CPEE(adaptor) {
           return 'callcorrelation'; 
         } else if($('parameters > service', node).length > 0) {
           return 'callinjection'; 
-        } else if($('manipulate', node).length > 0) {
+        } else if($('finalize,update', node).length > 0) {
           return 'callmanipulate'; 
         } else {
           return'call';
@@ -285,7 +268,7 @@ function CPEE(adaptor) {
     },//}}}
     'description': '<call id="###" endpoint="" xmlns="http://cpee.org/ns/description/1.0"><parameters xmlns="http://cpee.org/ns/description/1.0"><label>""</label><method>:post</method><parameters/></parameters></call>',
     'permissible_children': function(node) { //{{{
-      if(node.children('manipulate').length < 1) 
+      if(node.children('finalize,update').length < 1) 
         return [
          {'label': 'Scripts', 
           'function_call': adaptor.description.insert_last_into, 
@@ -313,7 +296,7 @@ function CPEE(adaptor) {
                   '</svg>');
       }
     },//}}}
-    'description': '<finalize xmlns="http://cpee.org/ns/description/1.0"/><update xmlns="http://cpee.org/ns/description/1.0"/>',
+    'description': ['<finalize xmlns="http://cpee.org/ns/description/1.0"/>','<update xmlns="http://cpee.org/ns/description/1.0"/>'],
     'permissible_children': function(node) { //{{{
       return [];
     }, //}}}

data/cockpit/{lib → js}/wfadaptor.js

@@ -253,31 +253,55 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     var newn = $('*[new=true]',description);
     newn.removeAttr('new');
 
-    if (newn.attr('svg-id') != undefined)
-      adaptor.notify(newn.attr('svg-id'));
-    else if (svgid != undefined)
-      adaptor.notify(svgid);
-    else
-      console.info('Something went horribly wrong');
+    $.each(newn,function(k,nn){
+      if ($(nn).attr('svg-id') != undefined)
+        adaptor.notify($(nn).attr('svg-id'));
+      else if (svgid != undefined)
+        adaptor.notify(svgid);
+    });
   } // }}}
   // }}}
   // Adaption functions {{{
   this.insert_after = function(new_node, target) { // {{{
-    var nn = $X(new_node.replace(/###/,get_free_id()));
-    target.after(nn);
-    nn.attr('new','true');
+    if ($.isArray(new_node)) {
+      $.each(new_node,function(k,v){
+        var nn = $X(v.replace(/###/,get_free_id()));
+        target.after(nn);
+        nn.attr('new','true');
+      });
+    } else {
+      var nn = $X(new_node.replace(/###/,get_free_id()));
+      target.after(nn);
+      nn.attr('new','true');
+    }
     update();
   } // }}}
   this.insert_first_into = function(new_node, target, selector) { // {{{
-    var nn = $X(new_node.replace(/###/,get_free_id()));
-    target.prepend(nn);
-    nn.attr('new','true');
+    if ($.isArray(new_node)) {
+      $.each(new_node,function(k,v){
+        var nn = $X(v.replace(/###/,get_free_id()));
+        target.prepend(nn);
+        nn.attr('new','true');
+      });
+    } else {
+      var nn = $X(new_node.replace(/###/,get_free_id()));
+      target.prepend(nn);
+      nn.attr('new','true');
+    }
     update();
   } // }}}
   this.insert_last_into = function(new_node, target, selector) { // {{{
-    var nn = $X(new_node.replace(/###/,get_free_id()));
-    target.append(nn);
-    nn.attr('new','true');
+    if ($.isArray(new_node)) {
+      $.each(new_node,function(k,v){
+        var nn = $X(v.replace(/###/,get_free_id()));
+        target.append(nn);
+        nn.attr('new','true');
+      });
+    } else {
+      var nn = $X(new_node.replace(/###/,get_free_id()));
+      target.append(nn);
+      nn.attr('new','true');
+    }
     update();
   } // }}}
   this.remove = function(selector, target) {//{{{

data/cockpit/rngtest.html

@@ -21,54 +21,33 @@
     <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>
+    <script type="text/javascript" src="http://localhost/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="http://localhost/js_libs/relaxngui.js"></script>
+    <link rel="stylesheet" href="http://localhost/js_libs/relaxngui.css" type="text/css"/>
+    <script type="text/javascript" src="http://localhost/js_libs/util.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);
+            $.ajax({
+              type: "GET", 
+              url: "rngtest.xml",
+              success: function(xml){
+                var rngui = new RelaxNGui($('> data',xml),res,$('#show'));
+                $('#saveall').on('click',rngui.save);
+              }
+            });
           }
         });  
       });
     </script>
   </head>
   <body data-defaultport="9298">
-    <div id="show">
-    </div>
+    <div id="show"></div>
+    <button id='saveall'>save it all to console</button>
   </body>
 </html>

data/cockpit/rngtest.rng

@@ -1,43 +1,24 @@
 <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 name="type" rngui:label="Type">
+    <data type="string" rngui:readonly="true"/>
   </element>
-  <element name="position">
-    <rngui:ui>
-      <rngui:readonly/>
-      <rngui:label>ID</rngui:label>
-    </rngui:ui>
-    <data type="string"/>
+  <element name="position" rngui:label="ID">
+    <data type="string" rngui:readonly="true"/>
   </element>
-  <element name="endpoint">
-    <rngui:ui>
-      <rngui:label>Endpoint</rngui:label>
-    </rngui:ui>
+  <element name="endpoint" rngui:label="Endpoint">
     <data type="string"/>
   </element>
-  <element name="code">
-    <rngui:ui>
-      <rngui:label>Script</rngui:label>
-    </rngui:ui>
-    <text/>
+  <element name="finalize" rngui:label="Finalize">
+    <text rngui:label='Script that is executed, when a service returns data'/>
+  </element>
+  <element name="update" rngui:label="Update">
+    <text rngui:label='Script that is executed, when a service send intermediate data'/>
   </element>
   <element name='parameters'>
-    <rngui:ui/>
-    <element name="label">
-      <rngui:ui>
-        <rngui:label>Label</rngui:label>
-      </rngui:ui>
-      <data type="string"/>
+    <element name="label" rngui:label="Label">
+      <data type="string" rngui:label="Short description of the task"/>
     </element>
-    <element name="method">
-      <rngui:ui>
-        <rngui:label>Method</rngui:label>
-      </rngui:ui>
+    <element name="method" rngui:label="Method">
       <choice>
         <value>:post</value>
         <value>:get</value>
@@ -45,14 +26,11 @@
         <value>:delete</value>
       </choice>
     </element>
-    <element name="parameters">
-      <zeroOrMore>
-        <rngui:ui>
-          <rngui:heading>Label</rngui:heading>
-        </rngui:ui>
-        <element>
+    <element name="parameters" rngui:header="Parameters">
+      <zeroOrMore rngui:label="Create Parameter Pairs">
+        <element rngui:label='Name'>
           <anyName/>
-          <data type="string"/>
+          <data type="string" rngui:label="Value"/>
         </element>
       </zeroOrMore>
     </element>  

data/cockpit/rngtest.xml

@@ -1,13 +1,14 @@
 <data>
-  <type></type>
-  <position></position>
-  <endpoint></endpoint>
-  <code></code>
+  <type>:activity</type>
+  <position>a1</position>
+  <endpoint>xyz</endpoint>
+  <finalize>abc = 1</finalize>
+  <update>def = 2</update>
   <parameters>
-    <label></label>
+    <label>alalala</label>
     <method>:get</method>
     <parameters>
-      <a/>
+      <a>1</a>
       <b/>
       <c/>
     </parameters>

data/cockpit/test.html

@@ -0,0 +1,46 @@
+<!--
+  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="http://gruppe.wst.univie.ac.at/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/relaxngui.js"></script>
+    <link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/relaxngui.css" type="text/css"/>
+    <!-- custom stuff, play arround  -->
+
+    <script type="text/javascript">
+      $("body").ready(function(){
+        $.ajax({
+          type: "GET", 
+          url: "rngtest.rng",
+          success: function(res){
+            var rngui = new RelaxNGui(null,res);
+            $('#show').append(rngui.result);
+          }
+        });  
+      });
+    </script>
+  </head>
+  <body data-defaultport="9298">
+    <div id="show">
+    </div>
+  </body>
+</html>

data/cockpit/testsets/Infinity.xml

@@ -0,0 +1,28 @@
+<testset>
+  <endpoints>
+    <infinity xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/infinity.php</infinity>
+  </endpoints>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <manipulate id="man">
+        data.pid = Digest::MD5.hexdigest(Kernel::rand().to_s)
+      </manipulate>
+      <loop pre_test="data.progress != 'END'">
+        <call id="a4" endpoint="infinity">
+          <parameters>
+            <label>"Warten auf Fortschritt"</label>
+            <method>:post</method>
+            <parameters>
+              <pid>data.pid</pid>          
+            </parameters>
+          </parameters>
+          <finalize>data.progress = result["progress"]</finalize>
+        </call>
+      </loop>
+    </description>
+  </description>
+  <attributes>
+    <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>
+</testset>

data/cockpit/testsets/testsets.xml

@@ -1,4 +1,5 @@
 <testsets>
+  <testset>Infinity</testset>
   <testset>SOPROMO Test Sonification</testset>
   <testset>Linear</testset>
   <testset>Coopis Testset</testset>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.177"
+  s.version          = "1.3.178"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -283,16 +283,16 @@ module CPEE
       end
     end #}}}
     def unserialize_dataelements! #{{{
-        @instance.data.clear
-        @properties.data.find("/p:properties/p:dataelements/p:*").each do |e|
-          @instance.data[e.qname.to_sym] = ValueHelper::parse(e.text)
-        end
+      @instance.data.clear
+      @properties.data.find("/p:properties/p:dataelements/p:*").each do |e|
+        @instance.data[e.qname.to_sym] = ValueHelper::parse(e.text)
+      end
     end #}}}
     def unserialize_endpoints! #{{{
-        @instance.endpoints.clear
-        @properties.data.find("/p:properties/p:endpoints/p:*").each do |e|
-          @instance.endpoints[e.qname.to_sym] = e.text
-        end
+      @instance.endpoints.clear
+      @properties.data.find("/p:properties/p:endpoints/p:*").each do |e|
+        @instance.endpoints[e.qname.to_sym] = e.text
+      end
     end #}}}
     def unserialize_state! #{{{ 
       state = @properties.data.find("string(/p:properties/p:state)")

data/lib/cpee/handler_properties.rb

@@ -31,6 +31,7 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
         @data.notify('dataelements/change', :instance => @data.instance)
       when 'attributes'
         @data.unserialize_attributes!
+        @data.notify('attributes/change', :instance => @data.instance)
       when 'positions'  
         @data.unserialize_positions!
         @data.notify('position/change', :instance => @data.instance)

data/lib/cpee/implementation.rb

@@ -35,6 +35,15 @@ module CPEE
     opts[:transformation_dslx]        ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/transformation_dslx.xsl')
     opts[:transformation_service]     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/transformation.xml')
     opts[:empty_dslx]                 ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/empty_dslx.xml')
+    opts[:infinite_loop_stop]         ||= 10000
+
+    opts[:runtime_options]            << [ 
+      "startclean", "delete instances before starting.", Proc.new { |status|
+        Dir.glob(File.expand_path(File.dirname(__FILE__) + '/../../server/instances/*')).each do |d|
+          FileUtils.rm_r(d) if File.basename(d) =~ /^\d+$/
+        end
+      }
+    ]
 
     Proc.new do
       Dir[opts[:global_handlerwrappers] + "/*.rb"].each do |h|

data/lib/engine.xml

@@ -27,9 +27,9 @@
     <parameter name="id" type="integer"/>
   </message>
 
- <message name="instance-new">
-   <parameter name="info" type="string"/>
- </message>
+  <message name="instance-new">
+    <parameter name="info" type="string"/>
+  </message>
 
   <message name="instance-info">
     <parameter name="info" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">

data/server/resources/topics.xml

@@ -45,6 +45,9 @@
   <topic id='endpoints'>
     <event>change</event>
   </topic>
+  <topic id='attributes'>
+    <event>change</event>
+  </topic>
   <topic id='handlerwrapper'>
     <event>change</event>
   </topic>