diff --git a/bin/wsdl2ruby.rb b/bin/wsdl2ruby.rb index 0c200a25..5b1e5133 100755 --- a/bin/wsdl2ruby.rb +++ b/bin/wsdl2ruby.rb @@ -2,6 +2,9 @@ require 'getoptlong' require 'logger' +unless defined?(Logger::Application) + require 'logger-application' +end require 'wsdl/soap/wsdl2ruby' diff --git a/bin/xsd2ruby.rb b/bin/xsd2ruby.rb index b5de712f..d89f43dc 100755 --- a/bin/xsd2ruby.rb +++ b/bin/xsd2ruby.rb @@ -2,6 +2,9 @@ require 'getoptlong' require 'logger' +unless defined?(Logger::Application) + require 'logger-application' +end require 'wsdl/xmlSchema/xsd2ruby' diff --git a/lib/soap/rpc/cgistub.rb b/lib/soap/rpc/cgistub.rb index 233f59f6..38fddb88 100644 --- a/lib/soap/rpc/cgistub.rb +++ b/lib/soap/rpc/cgistub.rb @@ -10,6 +10,9 @@ require 'webrick/httpresponse' require 'webrick/httpstatus' require 'logger' +unless defined?(Logger::Application) + require 'logger-application' +end require 'soap/rpc/soaplet' @@ -113,7 +116,7 @@ def initialize(appname, default_namespace) @soaplet = ::SOAP::RPC::SOAPlet.new(@router) on_init end - + def on_init # do extra initialization in a derived class if needed. end diff --git a/lib/soap/rpc/httpserver.rb b/lib/soap/rpc/httpserver.rb index 41e8f398..f7663d70 100644 --- a/lib/soap/rpc/httpserver.rb +++ b/lib/soap/rpc/httpserver.rb @@ -7,6 +7,9 @@ require 'logger' +unless defined?(Logger::Application) + require 'logger-application' +end require 'soap/attrproxy' require 'soap/rpc/soaplet' require 'soap/streamHandler' @@ -76,7 +79,7 @@ def add_rpc_request_servant(factory, namespace = @default_namespace) def add_rpc_servant(obj, namespace = @default_namespace) @router.add_rpc_servant(obj, namespace) end - + def add_request_headerhandler(factory) @router.add_request_headerhandler(factory) end diff --git a/soap2r.gemspec b/soap2r.gemspec index 766ee853..d01cd475 100644 --- a/soap2r.gemspec +++ b/soap2r.gemspec @@ -9,5 +9,6 @@ Gem::Specification.new "soap2r", SOAP::VERSION do |s| s.files = `git ls-files lib bin`.split("\n") s.executables = [ "wsdl2ruby.rb", "xsd2ruby.rb" ] s.add_dependency("httpclient", ">= 2.1.1") + s.add_dependency("logger-application", "~> 0.0.2") s.licenses = ["RUBY", "GPLv2"] end diff --git a/test/interopR2/simonReg.rb b/test/interopR2/simonReg.rb index 552702c7..2c3b9c71 100644 --- a/test/interopR2/simonReg.rb +++ b/test/interopR2/simonReg.rb @@ -4,6 +4,9 @@ require 'soap/driver' require 'logger' +unless defined?(Logger::Application) + require 'logger-application' +end require 'iSimonReg'