cpee 1.3.207 → 1.3.208

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25f955ce4d025a56dd90b97e7aff04983aa79c7
-  data.tar.gz: 5166ac6d0dce705032203a3752c484b449918313
+  metadata.gz: 5453f81e3a3bda812e94981852ad22da749cb603
+  data.tar.gz: d5708c8da1f13063648a41d12d5cd67419b1c5d4
 SHA512:
-  metadata.gz: e8a5abd2641fce0f5e6dccc5bcd4d82948918f0b3d95277d24af3a43b5a0fc3e252b49c1c23a9486233e71b138e5df0472752b8433f63437e50e05f5b6fee625
-  data.tar.gz: fb26385147cdac4639ca8207c740852b3685faf68fc221d4c0f0ed729dc23db71ff76cb39f3576d73e84304d79be57ac8c3f0df9e90b44af172ae64d57e7532e
+  metadata.gz: d0dd5a928797f51e4672f2e5b7baf6c368abc146b24811946927677a59336be623dd03947b0b46f7e3b5eb5a5b95d105ce9e9170d07a9e533e1fb5635a7eb488
+  data.tar.gz: c8e2db4b9faefbf84ba5dda344b1a3a4141cc2f792b65ef47fb7f0f52d18715e7e9668aa22bb7af038143b8f8091033e9d4722dba046cdee94d8c1f90db50cb0

data/cpee.gemspec

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

data/lib/cpee/controller.rb

@@ -492,6 +492,8 @@ module CPEE
               params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
               params << Riddl::Header.new("CPEE_BASE",self.base)
               params << Riddl::Header.new("CPEE_INSTANCE",self.instance)
+              params << Riddl::Header.new("CPEE-BASE",self.base)
+              params << Riddl::Header.new("CPEE-INSTANCE",self.instance)
               client.post params
             elsif url.class == Riddl::Utils::Notifications::Producer::WS
               e = XML::Smart::string("<event/>")
@@ -532,6 +534,9 @@ module CPEE
               params << Riddl::Header.new("CPEE_BASE",self.base_url)
               params << Riddl::Header.new("CPEE_INSTANCE",self.instance_url)
               params << Riddl::Header.new("CPEE_CALLBACK",self.instance_url + '/callbacks/' + callback)
+              params << Riddl::Header.new("CPEE-BASE",self.base_url)
+              params << Riddl::Header.new("CPEE-INSTANCE",self.instance_url)
+              params << Riddl::Header.new("CPEE-CALLBACK",self.instance_url + '/callbacks/' + callback)
               @mutex.synchronize do
                 status, result, headers = client.post params
                 if headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'

data/server/handlerwrappers/default.rb

@@ -13,15 +13,15 @@
 # <http://www.gnu.org/licenses/>.
 
 class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
-  def self::inform_syntax_error(arguments,err,code)# {{{
-    controller = arguments[0]
-    controller.notify("description/error", :instance => controller.instance, :message => err.message)
-  end# }}}
   def self::inform_state_change(arguments,newstate) # {{{
     controller = arguments[0]
 		controller.serialize_state!
 		controller.notify("state/change", :instance => controller.instance, :state => newstate)
   end # }}}
+  def self::inform_syntax_error(arguments,err,code)# {{{
+    controller = arguments[0]
+    controller.notify("description/error", :instance => controller.instance, :message => err.message)
+  end# }}}
   def self::inform_handlerwrapper_error(arguments,err) # {{{
     controller = arguments[0]
     controller.notify("handlerwrapper/error", :instance => controller.instance, :message => err.message)
@@ -60,8 +60,15 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       params << Riddl::Header.new("CPEE_CALLBACK_ID",callback)
       params << Riddl::Header.new("CPEE_ACTIVITY",@handler_position)
       params << Riddl::Header.new("CPEE_LABEL",parameters[:label])
+      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-CALLBACK_ID",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)
+        params << Riddl::Header.new("CPEE-ATTR-#{key.gsub(/_/,'-')}",value)
       end
 
       type = parameters[:method] || 'post'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.207
+  version: 1.3.208
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl