cpee 1.3.173 → 1.3.174

data/cockpit/lib/custommenu.js

@@ -0,0 +1,101 @@
+/*
+  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/>.
+*/
+
+function CustomMenu(e) {
+  var target = $(e.target);
+  var x = e.pageX;
+  var y = e.pageY;
+  var remove = function(event) {};
+  this.remove = remove;
+  e.stopPropagation();
+
+  this.contextmenu = function(items) {
+    remove = function(event) {
+      if (!event) {
+        $('.contextmenu:first').remove();
+        $('body', document).unbind('mousedown',remove);
+        return;
+      }  
+
+      if($(event.target).parent('tr.contextmenuitem') && (event.button == 0)) { $(event.target).click(); } 
+      $('.contextmenu:first').remove();
+      $('body', document).unbind('mousedown',remove);
+    }
+    $('body', document).bind('mousedown',remove); 
+
+    if($('div.contextmenu').length > 0) remove();
+    var div = $('<div class="contextmenu"><table class="contextmenu"/></div>');
+    for(head in items) {
+      div.children(':first').append('<tr class="contextmenuheader"><td colspan="2">' + head + '</td></tr>');
+      for(item in items[head]) {
+        var icon = null;
+        if(items[head][item].menu_icon) {
+          icon = $X('<svg xmlns="http://www.w3.org/2000/svg" version="1.1">' +
+                      '<g transform="translate(1,1) scale(0.5, 0.5)"/>' +
+                    '</svg>');
+          icon.children('g').append(items[head][item].menu_icon().children());
+          icon = icon.serializeXML();
+        }
+        var row = $('<tr class="contextmenuitem"><td class="contextmenuicon"><div>' + (icon == null ? '' : icon) + '</div></td><td>' + items[head][item].label + '</td></tr>');
+        div.children(':first').append(row);
+        row.bind('click', items[head][item], function(event){
+          event.data.function_call.apply(null, event.data.params);
+        });
+      }
+    }
+    div.css({'left':x+5,'top':y+5, 'display':'block'});
+    $('body', document).append(div);
+    if(($(window).height() < (y + div.height()))) { // contextmenu is position
+      div.css({'top':$(window).height()-div.height()-5});
+    }
+    if((document.body.clientWidth < (x + div.width())) && (x-div.width()-5 >= 0)) { // contextmenu is position
+      div.css({'left':x-div.width()-5});
+    }
+  }
+
+  this.menu = function(menu,call) {
+    remove = function(event) {
+      if ($(event.target).parent('div.menu') && (event.button == 0)) { $(event.target).click(); } 
+      menu.hide();
+      $('body', document).unbind('mousedown',remove);
+      $("div.menuitem",$(menu)).each(function(ind,ele){
+        $(ele).unbind('click',mitemclick);
+      });
+    }
+
+    menu.show();
+    var mitemclick = function(ele){ 
+      $("div.menuitem[data-selected=selected]",$(menu)).each(function(ind,rem){ $(rem).removeAttr('data-selected'); });
+      $(ele.target).attr('data-selected','selected'); 
+      call(ele.target);
+    };
+    $('body', document).bind('mousedown',remove); 
+
+    $("div.menuitem",$(menu)).each(function(ind,ele){
+      $(ele).bind('click',mitemclick);
+    });
+
+    var off = target.offset();
+
+    menu.css({'left':off.left,'top':off.top+target.outerHeight() + 1,'min-width': target.width()});
+    if(($(window).height() < (y + menu.height()))) {
+      menu.css({'top':$(window).height()-menu.height()-5});
+    }
+    if((document.body.clientWidth < (x + menu.width())) && (x-menu.width()-5 >= 0)) {
+      menu.css({'left':x-menu.width()-5});
+    }
+  }
+}  

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.173"
+  s.version          = "1.3.174"
   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

@@ -154,7 +154,7 @@ module CPEE
     end # }}}
 
     def info
-      @properties.data.find("string(/p:properties/p:info)")
+      @properties.data.find("string(/p:properties/p:attributes/p:info)")
     end
 
     def serialize_dataelements! #{{{

data/lib/cpee/handler_properties.rb

@@ -32,6 +32,8 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
       when 'positions'  
         @data.unserialize_positions!
         @data.notify('properties/position/change', :instance => @data.instance)
+      when 'transformation'  
+        @data.notify('properties/transformation/change', :instance => @data.instance)
       when 'state'  
         @data.unserialize_state!
       else

data/lib/cpee/implementation.rb

@@ -45,7 +45,8 @@ module CPEE
       end unless opts[:handlerwrappers].strip == ''
 
       controller = {}
-      Dir[opts[:instances] + '/*/properties.xml'].map{|e|::File::basename(::File::dirname(e))}.each do |id|
+      Dir[opts[:instances] + '/*/properties.xml'].each do |e|
+        id = ::File::basename(::File::dirname(e))
         controller[id.to_i] = Controller.new(id,opts)
       end
 
@@ -116,7 +117,7 @@ module CPEE
       Riddl::Parameter::Complex.new("wis","text/xml") do
         ins = XML::Smart::string('<instances/>')
         controller.each do |k,v|
-          name = v.properties.data.find("string(/p:properties/p:info)")
+          name = v.properties.data.find("string(/p:properties/p:attributes/p:info)")
           state = v.properties.data.find("string(/p:properties/p:state)")
           ins.root.add('instance',name, 'id' => k, 'state' => state)
         end
@@ -138,7 +139,8 @@ module CPEE
         break
       end  
       controller[id] = Controller.new(id,opts)
-      controller[id].properties.data.find("/p:properties/p:info").first.text = name
+      info = controller[id].properties.data.find("/p:properties/p:attributes/p:info")
+      info.first.text = name if info.length == 1
 
       Riddl::Parameter::Simple.new("id", id)
     end

data/server/handlerwrappers/default.rb

@@ -42,6 +42,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       params << Riddl::Header.new("CPEE_BASE",@controller.base_url)
       params << Riddl::Header.new("CPEE_INSTANCE",@controller.instance_url)
       params << Riddl::Header.new("CPEE_CALLBACK",@controller.instance_url + '/callbacks/' + callback)
+      params << Riddl::Header.new("CPEE_ACTIVITY",@handler_position)
+      params << Riddl::Header.new("CPEE_LABEL",parameters[:label])
+      @controller.attributes.each do |key,value|
+        params << Riddl::Header.new("CPEE_ATTR_#{key}",value)
+      end  
 
       type = parameters[:method] || 'post'
       client = Riddl::Client.new(@handler_endpoint)

data/server/instances/12/notifications/7ace1a6f6974fe3574107a19b5e9d036/consumer-secret

@@ -0,0 +1 @@
+5a3dd27ff4700c5ac8845e72fad3de33

data/server/instances/12/notifications/7ace1a6f6974fe3574107a19b5e9d036/producer-secret

@@ -0,0 +1 @@
+e562fbbd02da263a1fe4487ddec14718

data/server/instances/12/notifications/7ace1a6f6974fe3574107a19b5e9d036/subscription.xml

@@ -0,0 +1,33 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
+  <topic id="running">
+    <event>activity_calling</event>
+    <event>activity_manipulating</event>
+    <event>activity_failed</event>
+    <event>activity_done</event>
+  </topic>
+  <topic id="properties/position">
+    <event>change</event>
+  </topic>
+  <topic id="properties/description">
+    <event>change</event>
+    <event>error</event>
+  </topic>
+  <topic id="properties/state">
+    <event>change</event>
+  </topic>
+  <topic id="properties/dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="properties/endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="properties/transformation">
+    <event>change</event>
+  </topic>
+  <topic id="properties/handlerwrapper">
+    <event>result</event>
+  </topic>
+  <topic id="properties/handlers">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/15/properties.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  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/>.
+-->
+
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <info/>
+  <properties/>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</properties>

data/server/instances/16/properties.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  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/>.
+-->
+
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <info/>
+  <properties/>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</properties>

data/server/instances/17/properties.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  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/>.
+-->
+
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <info/>
+  <properties/>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</properties>

data/server/instances/18/properties.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+  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/>.
+-->
+
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info/>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</properties>

data/server/instances/19/properties.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+  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/>.
+-->
+
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info/>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</properties>

data/server/instances/20/properties.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+  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/>.
+-->
+
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements/>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </description>
+  <transformation>
+    <description type='copy'/>
+    <dataelements type='none'/>
+    <endpoints type='none'/>
+  </transformation>
+</properties>