cpee 1.3.187 → 1.3.188

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54e4d196d652abc94c82dddaa76fe4358562c6e
-  data.tar.gz: d44189598cbc4a914fa6b33d70a7f0cdbbd9ffb7
+  metadata.gz: '0945c717914907e42fc04e35d1c7abbb7ced2bc6'
+  data.tar.gz: 584bf95746c861682ddaf116bb55fd74f374df5f
 SHA512:
-  metadata.gz: ad3d4d6c8df9ca4e8cf77a1d00561687e155f8e14a5d6fdd51649040e4978e560b4196b6189e36723a0661d5cb061ceac1e549d25cd6d32652de134a5197794a
-  data.tar.gz: e32c47e5f74aa049cb63bf2e05dfc1b38319b0a4f926ea5734e7909c6e9223f0038f31a77db6d3ced7308c47e447e2189df749aff5ade534085d1b8c11a97ead
+  metadata.gz: 1f4160c8856b0dffc7fab55faf5480c4d0f83e4e2459f0cf6585e8b27d3af4be5ee39617732a4893c916859c17363f2790b962eab9da02e0793ad7d7c1dfd5c4
+  data.tar.gz: a3f92e0823d40f34c4802df8ed2e0d21269490e0ab4315259b53e6fe2167ab9552b132e6e8c87230dd4a7638e4dacfca35fceef8af6774dc1bd06afff58b39cd

data/cockpit/js/instance.js

@@ -532,7 +532,7 @@ function save_testset() {// {{{
                       var pars = $X('<description/>');
                       pars.append($(res.documentElement));
                       testset.append(pars);
-                      pars = $X('<transformation><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>');
+                      pars = $X("<transformation><description type='copy'/><dataelements type='none'/><endpoints type='none'/></transformation>");
                       testset.append(pars);
                       $.ajax({
                         type: "GET",
@@ -543,7 +543,7 @@ function save_testset() {// {{{
                           pars.append($(res.documentElement).children());
                           testset.append(pars);
                           $('#savetestset').attr('download',name + '.xml');
-                          $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + window.btoa(testset.serializeXML()));
+                          $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + window.btoa(testset.serializePrettyXML()));
                           document.getElementById('savetestset').click();
                         },
                         error: report_failure

data/cockpit/themes/default/theme.js

@@ -9,7 +9,12 @@ function WFAdaptorManifestation(adaptor) {
   this.source = function(rng) {
     $('#relaxngworker').empty();
     var rngw = new RelaxNGui(rng,$('#relaxngworker'),self.adaptor.description.context_eval);
-    return $(rngw.save().documentElement);
+    var nnew = $(rngw.save().documentElement);
+        nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
+    var ntxt = nnew.serializeXML();
+    ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
+
+    return($X(ntxt));
   };
 
   // Events

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.187"
+  s.version          = "1.3.188"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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"
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README']
   s.test_files       = Dir['{test/*,test/*/tc_*.rb}']
 
-  s.required_ruby_version = '>=1.9.3'
+  s.required_ruby_version = '>=2.0.0'
 
   s.authors          = ['Juergen eTM Mangler','Ralph Vigne','Gerhard Stuermer','Florian Stertz']
 

data/lib/cpee/controller.rb

@@ -1,13 +1,13 @@
 # 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/>.
@@ -29,7 +29,7 @@ module CPEE
         JSON::generate(value)
       elsif value.respond_to?(:to_s)
         value.to_s
-      end  
+      end
     end
 
     def self::parse(value)
@@ -40,13 +40,13 @@ module CPEE
           false
         when 'nil', 'null'
           nil
-        else  
+        else
           begin
             JSON::parse(value)
           rescue
             (Integer value rescue nil) || (Float value rescue nil) || value.to_s rescue nil || ''
           end
-      end    
+      end
     end
   end
 
@@ -67,7 +67,7 @@ module CPEE
       @mutex = Mutex.new
       @opts = opts
 
-      @properties = Riddl::Utils::Properties::Backend.new( 
+      @properties = Riddl::Utils::Properties::Backend.new(
         {
           :inactive => opts[:properties_schema_inactive],
           :active   => opts[:properties_schema_active],
@@ -87,7 +87,7 @@ module CPEE
       unless ['stopped','ready','finished'].include?(@properties.data.find("string(/p:properties/p:state)"))
         @properties.modify do |doc|
           doc.find("/p:properties/p:state").first.text = 'stopped'
-        end  
+        end
       end
       unserialize_handlerwrapper!
       unserialize_dataelements!
@@ -104,19 +104,19 @@ module CPEE
     attr_reader :mutex
     attr_reader :attributes
 
-    def base_url 
+    def base_url
       @opts[:url]
     end
     def base_jid
       @opts[:jid]
     end
-    def instance_url 
+    def instance_url
       "#{@opts[:url]}/#{@id}"
     end
     def instance_jid
       "#{@opts[:jid]}/#{@id}"
     end
-    def xmpp 
+    def xmpp
       @opts[:xmpp]
     end
     def base
@@ -125,7 +125,7 @@ module CPEE
     def instance
       @opts[:jid] ? instance_url + "," + instance_jid : instance_url
     end
-    
+
     def sim # {{{
       @thread.join if !@thread.nil? && @thread.alive?
       @thread = @instance.sim
@@ -142,16 +142,16 @@ module CPEE
     def stop # {{{
       t = @instance.stop
       t.run
-      @callbacks.delete_if do |k,c| 
+      @callbacks.delete_if do |k,c|
         # only remove vote_callbacks, the other stuff is removed by
         # the instance stopping cleanup
         if c.method == :vote_callback
           c.callback
           true
-        else  
+        else
           false
         end
-      end  
+      end
       @thread.join if !@thread.nil? && @thread.alive?
       @callback = [] # everything should be empty now
     end # }}}
@@ -186,8 +186,8 @@ module CPEE
         @properties.modify do |doc|
           node = doc.find("/p:properties/p:state").first
           node.text = @instance.state
-        end 
-      end  
+        end
+      end
     end # }}}
     def serialize_positions! # {{{
       @properties.modify do |doc|
@@ -212,22 +212,22 @@ module CPEE
       case op
         when :del
           @notifications.subscriptions[key].delete if @notifications.subscriptions.include?(key)
-            
+
           @communication[key].io.close_connection if @communication[key].class == Riddl::Utils::Notifications::Producer::WS
           @communication.delete(key)
 
           @events.each do |eve,keys|
             keys.delete_if{|k,v| key == k}
-          end  
+          end
           @votes.each do |eve,keys|
             keys.delete_if do |k,v|
               if key == k
                 @callbacks.each{|voteid,cb|cb.delete_if!(eve,k)}
                 true
-              end  
+              end
             end
-          end  
-        when :upd 
+          end
+        when :upd
           if @notifications.subscriptions.include?(key)
             url = @communication[key]
             evs = []
@@ -235,7 +235,7 @@ module CPEE
             @events.each { |e,v| evs << e }
             @votes.each { |e,v| vos << e }
             @notifications.subscriptions[key].read do |doc|
-              turl = doc.find('string(/n:subscription/@url)') 
+              turl = doc.find('string(/n:subscription/@url)')
               url = turl == '' ? url : turl
               @communication[key] = url
               doc.find('/n:subscription/n:topic').each do |t|
@@ -252,14 +252,14 @@ module CPEE
               end
             end
             evs.each { |e| @events[e].delete(key) if @events[e] }
-            vos.each do |e| 
+            vos.each do |e|
               @callbacks.each{|voteid,cb|cb.delete_if!(e,key)}
               @votes[e].delete(key) if @votes[e]
-            end  
-          end  
+            end
+          end
         when :cre
           @notifications.subscriptions[key].read do |doc|
-            turl = doc.find('string(/n:subscription/@url)') 
+            turl = doc.find('string(/n:subscription/@url)')
             url = turl == '' ? nil : turl
             @communication[key] = url
             doc.find('/n:subscription/n:topic').each do |t|
@@ -272,10 +272,10 @@ module CPEE
                 @votes["#{t.attributes['id']}/#{e}"][key] = url
               end
             end
-          end  
-      end    
-    end # }}} 
-    
+          end
+      end
+    end # }}}
+
     def unserialize_attributes! #{{{
       @attributes = {}
       @properties.data.find("/p:properties/p:attributes/p:*").map do |ele|
@@ -294,7 +294,7 @@ module CPEE
         @instance.endpoints[e.qname.to_sym] = e.text
       end
     end #}}}
-    def unserialize_state! #{{{ 
+    def unserialize_state! #{{{
       state = @properties.data.find("string(/p:properties/p:state)")
       if call_vote("state/change", :instance => @id, :info => info, :state => state)
         case state
@@ -302,7 +302,7 @@ module CPEE
             stop
           when 'running'
             start
-          when 'simulating'  
+          when 'simulating'
             sim
           when 'ready'
             @instance.state_signal
@@ -318,14 +318,14 @@ module CPEE
       begin
         hw = eval(@properties.data.find("string(/p:properties/p:handlerwrapper)"))
         @instance.handlerwrapper = hw
-      rescue => e  
+      rescue => e
         @instance.handlerwrapper = DefaultHandlerWrapper
-      end  
+      end
       if hw != @instance.handlerwrapper
         @properties.modify do |doc|
           node = doc.find("/p:properties/p:handlerwrapper").first
           node.text = @instance.handlerwrapper.to_s
-        end 
+        end
       end
     end #}}}
     def unserialize_positions! #{{{
@@ -356,7 +356,7 @@ module CPEE
 
           if desc.children.empty?
             tdesctype = tdatatype = tendptype = 'clean'
-          end  
+          end
 
           ### description transformation, including dslx to dsl
           addit = if tdesctype == 'copy' || tdesc.empty?
@@ -367,17 +367,17 @@ module CPEE
               Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
               Riddl::Parameter::Simple.new("type","description")
             ]
-            if status >= 200 && status < 300 
-              XML::Smart::string(res[0].value.read).root 
-            else  
-              raise 'Could not extract dslx' 
-            end  
+            if status >= 200 && status < 300
+              XML::Smart::string(res[0].value.read).root
+            else
+              raise 'Could not extract dslx'
+            end
           elsif tdesctype == 'xslt' && !tdesc.empty?
             trans = XML::Smart::open_unprotected(tdesc.text)
             desc.children.first.to_doc.transform_with(trans).root
           elsif tdesctype == 'clean'
             XML::Smart::open_unprotected(@opts[:empty_dslx]).root
-          else  
+          else
             nil
           end
           unless addit.nil?
@@ -391,15 +391,15 @@ module CPEE
           ### dataelements extraction
           addit = if tdatatype == 'rest' && !tdata.empty?
             srv = Riddl::Client.interface(tdata.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
-            status, res = srv.post [ 
+            status, res = srv.post [
               Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
               Riddl::Parameter::Simple.new("type","dataelements")
             ]
-            if status >= 200 && status < 300 
+            if status >= 200 && status < 300
               res
-            else  
-              raise 'Could not extract dataelements' 
-            end  
+            else
+              raise 'Could not extract dataelements'
+            end
           elsif tdatatype == 'xslt' && !tdata.empty?
             trans = XML::Smart::open_unprotected(tdata.text)
             desc.children.first.to_doc.transform_with(trans)
@@ -407,7 +407,7 @@ module CPEE
             []
           else
             nil
-          end  
+          end
           unless addit.nil?
             node = doc.find("/p:properties/p:dataelements").first
             node.children.delete_all!
@@ -415,22 +415,22 @@ module CPEE
             addit.each_slice(2).each do |k,v|
               @instance.data[k.value.to_sym] = ValueHelper::parse(v.value)
               node.add(k.value,ValueHelper::generate(v.value))
-            end  
+            end
             nots << ["dataelements/change", {:instance => instance, :changed => JSON::generate(@instance.data)}]
-          end  
+          end
 
           ### endpoints extraction
           addit = if tendptype == 'rest' && !tdata.empty?
             srv = Riddl::Client.interface(tendp.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
-            status, res = srv.post [ 
+            status, res = srv.post [
               Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
               Riddl::Parameter::Simple.new("type","endpoints")
             ]
-            if status >= 200 && status < 300 
+            if status >= 200 && status < 300
               res
-            else  
-              raise 'Could not extract endpoints' 
-            end  
+            else
+              raise 'Could not extract endpoints'
+            end
           elsif tendptype == 'xslt' && !tdata.empty?
             trans = XML::Smart::open_unprotected(tendp.text)
             desc.children.first.to_doc.transform_with(trans)
@@ -438,7 +438,7 @@ module CPEE
             []
           else
             nil
-          end  
+          end
           unless addit.nil?
             node = doc.find("/p:properties/p:endpoints").first
             node.children.delete_all!
@@ -446,9 +446,9 @@ module CPEE
             addit.each_slice(2).each do |k,v|
               @instance.endpoints[k.value.to_sym] = ValueHelper::parse(v.value)
               node.add(k.value,ValueHelper::generate(v.value))
-            end  
+            end
             nots << ["endpoints/change", {:instance => instance, :changed => JSON::generate(@instance.endpoints)}]
-          end  
+          end
           nots << ["description/change", { :instance => instance }]
         rescue => err
           nots << ["description/error", { :instance => instance, :message => err.message }]
@@ -475,7 +475,7 @@ module CPEE
                 e.root.add(k,v)
               end
               url.send(e.to_s) rescue nil
-            end  
+            end
           end
         end
       end
@@ -493,7 +493,7 @@ module CPEE
             inum += 1
           elsif url.class == Riddl::Utils::Notifications::Producer::WS
             inum += 1 unless url.closed?
-          end  
+          end
         end
 
         item.each do |key,url|
@@ -515,7 +515,7 @@ module CPEE
                 else
                   vote_callback(result,nil,continue,voteid,callback,inum)
                 end
-              end  
+              end
             elsif u.class == Riddl::Utils::Notifications::Producer::WS
               @callbacks[callback] = Callback.new("vote #{notf.find{|a,b| a == 'notification'}[1]}", self, :vote_callback, what, k, :ws, continue, voteid, callback, inum)
               e = XML::Smart::string("<vote/>")
@@ -530,7 +530,7 @@ module CPEE
         continue.wait
 
         !@votes_results.delete(voteid).include?(false)
-      else  
+      else
         true
       end
     end # }}}
@@ -541,10 +541,10 @@ module CPEE
         @votes_results[voteid] << true
       else
         @votes_results[voteid] << (result && result[0] && result[0].value == 'true')
-      end  
+      end
       if (num == @votes_results[voteid].length)
         continue.continue
-      end  
+      end
     end # }}}
 
     def add_websocket(key,socket)# {{{
@@ -552,12 +552,12 @@ module CPEE
       @events.each do |a|
         if a[1].has_key?(key)
           a[1][key] = socket
-        end  
+        end
       end
       @votes.each do |a|
         if a[1].has_key?(key)
           a[1][key] = socket
-        end  
+        end
       end
     end # }}}
 
@@ -576,4 +576,4 @@ module CPEE
 
   end
 
-end  
+end