* 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

3 files changed, 105 insertions, 10 deletions

diff --git a/test/wsdl/raa/RAAService.rb b/test/wsdl/raa/RAAService.rb
index 42cdfaea47..9d0813304c 100644
--- a/test/wsdl/raa/RAAService.rb
+++ b/test/wsdl/raa/RAAService.rb
@@ -87,8 +87,7 @@ class App < SOAP::RPC::StandaloneServer
     servant = RAABaseServicePortType.new
     RAABaseServicePortType::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)
+      @router.add_method(servant, qname, soapaction, name, params)
     end
 
     self.mapping_registry = RAABaseServicePortType::MappingRegistry
diff --git a/test/wsdl/raa/server.rb b/test/wsdl/raa/server.rb
new file mode 100644
index 0000000000..87bbc6f569
--- /dev/null
+++ b/test/wsdl/raa/server.rb
@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+require 'soap/rpc/standaloneServer'
+require 'RAA.rb'
+
+class RAABaseServicePortType
+  MappingRegistry = SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    StringArray,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.w3.org/2001/XMLSchema", "string") }
+  )
+  MappingRegistry.set(
+    Map,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://xml.apache.org/xml-soap", "Map") }
+  )
+  MappingRegistry.set(
+    Category,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category") }
+  )
+  MappingRegistry.set(
+    InfoArray,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
+  )
+  MappingRegistry.set(
+    Info,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
+  )
+  MappingRegistry.set(
+    Product,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Product") }
+  )
+  MappingRegistry.set(
+    Owner,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Owner") }
+  )
+  
+  Methods = [
+    ["getAllListings", "getAllListings", [
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.w3.org/2001/XMLSchema", "string"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getProductTree", "getProductTree", [
+      ["retval", "return",
+       [::SOAP::SOAPStruct, "http://xml.apache.org/xml-soap", "Map"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromCategory", "getInfoFromCategory", [
+      ["in", "category",
+       [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category"]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getModifiedInfoSince", "getModifiedInfoSince", [
+      ["in", "timeInstant",
+       [SOAP::SOAPDateTime]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromName", "getInfoFromName", [
+      ["in", "productName",
+       [SOAP::SOAPString]],
+      ["retval", "return",
+       [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromOwnerId", "getInfoFromOwnerId", [
+      ["in", "ownerId",
+       [SOAP::SOAPInt]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"]
+  ]
+
+  def getAllListings
+    ["ruby", "soap4r"]
+  end
+end
+
+class RAABaseServiceServer < SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super
+
+    servant = RAABaseServicePortType.new
+    RAABaseServicePortType::Methods.each do |name_as, name, params, soapaction, namespace|
+      qname = XSD::QName.new(namespace, name_as)
+      @router.add_method(servant, qname, soapaction, name, params)
+    end
+
+    self.mapping_registry = RAABaseServicePortType::MappingRegistry
+  end
+end
diff --git a/test/wsdl/raa/test_raa.rb b/test/wsdl/raa/test_raa.rb
index cf171b373f..0b00042ffb 100644
--- a/test/wsdl/raa/test_raa.rb
+++ b/test/wsdl/raa/test_raa.rb
@@ -26,18 +26,11 @@ class TestRAA < 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, 'raa.wsdl')
-    @raa = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+    @raa = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
     @raa.endpoint_url = "http://localhost:#{Port}/"
   end