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