* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.

	  == SOAP client and server ==

	  === for both client side and server side ===

	  * improved document/literal service support.
	    style(rpc,document)/use(encoding, literal) combination are all
	    supported.  for the detail about combination, see
	    test/soap/test_style.rb.

	  * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
	    WSDL as well as obj2soap.  closes #70.

	  * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
	    you can set/get XML attribute via accessor methods which as a name
	    'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).

	  === client side ===

	  * WSDLDriver capitalized name operation bug fixed.  from
	    1.5.3-ruby1.8.2, operation which has capitalized name (such as
	    KeywordSearchRequest in AWS) is defined as a method having
	    uncapitalized name. (converted with GenSupport.safemethodname
	    to handle operation name 'foo-bar').  it introduced serious
	    incompatibility; in the past, it was defined as a capitalized.
	    define capitalized method as well under that circumstance.

	  * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
	    to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
	    are merged).  'WSDLDriverFactory#create_driver' still creates
	    WSDLDriver for compatibility but it warns that the method is
	    deprecated.  please use create_rpc_driver instead of create_driver.

	  * allow to use an URI object as an endpoint_url even with net/http,
	    not http-access2.

	  === server side ===

	  * added mod_ruby support to SOAP::CGIStub.  rename a CGI script
	    server.cgi to server.rb and let mod_ruby's RubyHandler handles the
	    script.  CGIStub detects if it's running under mod_ruby environment
	    or not.

	  * added fcgi support to SOAP::CGIStub.  see the sample at
	    sample/soap/calc/server.fcgi.  (almost same as server.cgi but has
	    fcgi handler at the bottom.)

	  * allow to return a SOAPFault object to respond customized SOAP fault.

	  * added the interface 'generate_explicit_type' for server side
	    (CGIStub, HTTPServer).  call 'self.generate_explicit_type = true'
	    if you want to return simplified XML even if it's rpc/encoded
	    service.

	  == WSDL ==

	  === WSDL definition ===

	  * improved XML Schema support such as extension, restriction,
	    simpleType, complexType + simpleContent, ref, length, import,
	    include.

	  * reduced "unknown element/attribute" warnings (warn only 1 time for
	    each QName).

	  * importing XSD file at schemaLocation with xsd:import.

	  === code generation from WSDL ===

	  * generator crashed when there's '-' in defined element/attribute
	    name.

	  * added ApacheMap WSDL definition.

	* sample/{soap,wsdl}: removed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 26 insertions, 26 deletions

diff --git a/test/wsdl/datetime/DatetimeService.rb b/test/wsdl/datetime/DatetimeService.rb
index 91c006005d..800e06d66f 100644
--- a/test/wsdl/datetime/DatetimeService.rb
+++ b/test/wsdl/datetime/DatetimeService.rb
@@ -2,37 +2,43 @@
 require 'datetimeServant.rb'
 
 require 'soap/rpc/standaloneServer'
+require 'soap/mapping/registry'
 
 class DatetimePortType
-  MappingRegistry = SOAP::Mapping::Registry.new
-
-  # No mapping definition
+  MappingRegistry = ::SOAP::Mapping::Registry.new
 
   Methods = [
-    ["now", "now", [
-      ["in", "now",
-       [SOAP::SOAPDateTime]],
-      ["retval", "now",
-       [SOAP::SOAPDateTime]]], "", "urn:jp.gr.jin.rrr.example.datetime"]
+    ["now", "now",
+      [
+        ["in", "now", [::SOAP::SOAPDateTime]],
+        ["retval", "now", [::SOAP::SOAPDateTime]]
+      ],
+      "", "urn:jp.gr.jin.rrr.example.datetime", :rpc
+    ]
   ]
 end
 
-class DatetimePortTypeApp < SOAP::RPC::StandaloneServer
+class DatetimePortTypeApp < ::SOAP::RPC::StandaloneServer
   def initialize(*arg)
-    super
-
+    super(*arg)
     servant = DatetimePortType.new
-    DatetimePortType::Methods.each do |name_as, name, params, soapaction, namespace|
-      qname = XSD::QName.new(namespace, name_as)
-      @soaplet.app_scope_router.add_method(servant, qname, soapaction,
-	name, params)
+    DatetimePortType::Methods.each do |name_as, name, param_def, soapaction, namespace, style|
+      if style == :document
+        @router.add_document_operation(servant, soapaction, name, param_def)
+      else
+        qname = XSD::QName.new(namespace, name_as)
+        @router.add_rpc_operation(servant, qname, soapaction, name, param_def)
+      end
     end
-
     self.mapping_registry = DatetimePortType::MappingRegistry
   end
 end
 
-# Change listen port.
 if $0 == __FILE__
-  DatetimePortTypeApp.new('app', nil, '0.0.0.0', 10080).start
+  # Change listen port.
+  server = DatetimePortTypeApp.new('app', nil, '0.0.0.0', 10080)
+  trap(:INT) do
+    server.shutdown
+  end
+  server.start
 end
diff --git a/test/wsdl/datetime/test_datetime.rb b/test/wsdl/datetime/test_datetime.rb
index 0f531ff18c..7652318205 100644
--- a/test/wsdl/datetime/test_datetime.rb
+++ b/test/wsdl/datetime/test_datetime.rb
@@ -24,20 +24,14 @@ class TestDatetime < Test::Unit::TestCase
       Thread.current.abort_on_exception = true
       @server.start
     }
-    while @server.status != :Running
-      sleep 0.1
-      unless @t.alive?
-	@t.join
-	raise
-      end
-    end
   end
 
   def setup_client
     wsdl = File.join(DIR, 'datetime.wsdl')
-    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
     @client.endpoint_url = "http://localhost:#{Port}/"
     @client.generate_explicit_type = true
+    @client.wiredump_dev = STDOUT if $DEBUG
   end
 
   def teardown