* 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

6 files changed, 354 insertions, 13 deletions

diff --git a/test/soap/wsdlDriver/calc.wsdl b/test/soap/wsdlDriver/calc.wsdl
new file mode 100644
index 0000000000..694a01e87e
--- /dev/null
+++ b/test/soap/wsdlDriver/calc.wsdl
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--generated by GLUE Standard 4.0.1 on Wed Mar 09 10:20:07 GMT-08:00
+2005-->
+<wsdl:definitions name='Calculator'
+targetNamespace='http://www.themindelectric.com/wsdl/Calculator/'
+    xmlns:tns='http://www.themindelectric.com/wsdl/Calculator/'
+    xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+    xmlns:http='http://schemas.xmlsoap.org/wsdl/http/'
+    xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/'
+    xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+    xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/'
+    xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
+    xmlns:tme='http://www.themindelectric.com/'>
+    <wsdl:message name='add0In'>
+        <wsdl:part name='x' type='xsd:float'/>
+        <wsdl:part name='y' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='add0Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='divide1In'>
+        <wsdl:part name='numerator' type='xsd:float'/>
+        <wsdl:part name='denominator' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='divide1Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='multiply2In'>
+        <wsdl:part name='x' type='xsd:float'/>
+        <wsdl:part name='y' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='multiply2Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='subtract3In'>
+        <wsdl:part name='x' type='xsd:float'/>
+        <wsdl:part name='y' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='subtract3Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:portType name='ICalculator'>
+        <wsdl:operation name='add' parameterOrder='x y'>
+            <wsdl:input name='add0In' message='tns:add0In'/>
+            <wsdl:output name='add0Out' message='tns:add0Out'/>
+        </wsdl:operation>
+        <wsdl:operation name='divide' parameterOrder='numerator
+denominator'>
+            <wsdl:input name='divide1In' message='tns:divide1In'/>
+            <wsdl:output name='divide1Out' message='tns:divide1Out'/>
+        </wsdl:operation>
+        <wsdl:operation name='multiply' parameterOrder='x y'>
+            <wsdl:input name='multiply2In' message='tns:multiply2In'/>
+            <wsdl:output name='multiply2Out'
+message='tns:multiply2Out'/>
+        </wsdl:operation>
+        <wsdl:operation name='subtract' parameterOrder='x y'>
+            <wsdl:input name='subtract3In' message='tns:subtract3In'/>
+            <wsdl:output name='subtract3Out'
+message='tns:subtract3Out'/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name='ICalculator' type='tns:ICalculator'>
+        <soap:binding style='rpc'
+transport='http://schemas.xmlsoap.org/soap/http'/>
+        <wsdl:operation name='add'>
+            <soap:operation soapAction='add' style='rpc'/>
+            <wsdl:input name='add0In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='add0Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name='divide'>
+            <soap:operation soapAction='divide' style='rpc'/>
+            <wsdl:input name='divide1In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='divide1Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name='multiply'>
+            <soap:operation soapAction='multiply' style='rpc'/>
+            <wsdl:input name='multiply2In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='multiply2Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name='subtract'>
+            <soap:operation soapAction='subtract' style='rpc'/>
+            <wsdl:input name='subtract3In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='subtract3Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name='Calculator'>
+        <wsdl:documentation>calculator service</wsdl:documentation>
+        <wsdl:port name='ICalculator' binding='tns:ICalculator'>
+            <soap:address
+location='http://ukulele:8080/calcapp/services/calculator'/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/test/soap/wsdlDriver/document.wsdl b/test/soap/wsdlDriver/document.wsdl
new file mode 100644
index 0000000000..5e9e74b9df
--- /dev/null
+++ b/test/soap/wsdlDriver/document.wsdl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="submit_service"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:document"
+    targetNamespace="urn:example.com:document"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:example.com:document">
+      <xsd:element name="ruby">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="1" maxOccurs="1" name="myversion" type="tns:myversion"/>
+            <xsd:element minOccurs="0" maxOccurs="1" name="date" type="xsd:dateTime"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:simpleType name="myversion">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="1.6"/>
+          <xsd:enumeration value="1.8"/>
+          <xsd:enumeration value="1.9"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+
+  <message name="submit_msg">
+    <part name="parameters" element="tns:ruby"/>
+  </message>
+
+  <portType name="submit_port_type">
+    <operation name="submit">
+      <input message="tns:submit_msg"/>
+      <output message="tns:submit_msg"/>
+    </operation>
+  </portType>
+
+  <binding name="submit_binding" type="tns:submit_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="submit">
+      <soap:operation soapAction="urn:example.com:document#submit" style="document"/>
+      <input><soap:body use="literal"/></input>
+      <output><soap:body use="literal"/></output>
+    </operation>
+  </binding>
+
+  <service name="submit_service">
+    <port name="submit_port" binding="tns:submit_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/test/soap/wsdlDriver/simpletype.wsdl b/test/soap/wsdlDriver/simpletype.wsdl
index 7c211a6b2c..6781dda552 100644
--- a/test/soap/wsdlDriver/simpletype.wsdl
+++ b/test/soap/wsdlDriver/simpletype.wsdl
@@ -10,12 +10,12 @@
     <xsd:schema targetNamespace="urn:example.com:simpletype-rpc-type">
       <xsd:complexType name="version_struct">
 	<xsd:all>
-	  <xsd:element name="version" type="txd:versions" />
+	  <xsd:element name="myversion" type="txd:myversions" />
 	  <xsd:element name="msg" type="xsd:string" />
 	</xsd:all>
       </xsd:complexType>
 
-      <xsd:simpleType name="versions">
+      <xsd:simpleType name="myversions">
         <xsd:restriction base="xsd:string">
           <xsd:enumeration value="1.6"/>
           <xsd:enumeration value="1.8"/>
@@ -26,7 +26,7 @@
   </types>
 
   <message name="msg_version">
-    <part name="version" type="txd:versions"/>
+    <part name="myversion" type="txd:myversions"/>
   </message>
 
   <message name="msg_version_struct">
diff --git a/test/soap/wsdlDriver/test_calc.rb b/test/soap/wsdlDriver/test_calc.rb
new file mode 100644
index 0000000000..f1cc116a59
--- /dev/null
+++ b/test/soap/wsdlDriver/test_calc.rb
@@ -0,0 +1,88 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestCalc < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::HTTPServer
+    def on_init
+      add_method(self, 'add', 'x', 'y')
+    end
+  
+    def add(x, y)
+      x.to_f + y.to_f
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :BindAddress => "0.0.0.0",
+      :Port => Port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => 'http://www.fred.com'
+    )
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    @wsdl = File.join(DIR, 'calc.wsdl')
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream if @client
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_rpc_driver
+    @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_rpc_driver
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = true
+    assert_equal(0.3, @client.add(0.1, 0.2))
+    @client.generate_explicit_type = false
+    assert_equal(0.3, @client.add(0.1, 0.2))
+  end
+
+  def test_old_driver
+    @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_driver
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = true
+    assert_equal(0.3, @client.add(0.1, 0.2))
+    @client.generate_explicit_type = false
+    assert_equal(0.3, @client.add(0.1, 0.2))
+  end
+end
+
+
+end
diff --git a/test/soap/wsdlDriver/test_document.rb b/test/soap/wsdlDriver/test_document.rb
new file mode 100644
index 0000000000..634b827aae
--- /dev/null
+++ b/test/soap/wsdlDriver/test_document.rb
@@ -0,0 +1,78 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestDocument < Test::Unit::TestCase
+  Namespace = 'urn:example.com:document'
+
+  class Server < ::SOAP::RPC::StandaloneServer
+    def on_init
+      add_document_method(self, 'urn:example.com:document#submit', 'submit', XSD::QName.new(Namespace, 'ruby'), XSD::QName.new(Namespace, 'ruby'))
+    end
+  
+    def submit(ruby)
+      ruby
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new('Test', Namespace, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'document.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_document
+    msg = {'myversion' => "1.9", 'date' => "2004-01-01T00:00:00Z"}
+    reply_msg = @client.submit(msg)
+    assert_equal('1.9', reply_msg.myversion)
+    assert_equal('1.9', reply_msg['myversion'])
+    assert_equal('2004-01-01T00:00:00Z', reply_msg.date)
+    assert_equal('2004-01-01T00:00:00Z', reply_msg['date'])
+  end
+end
+
+
+end
diff --git a/test/soap/wsdlDriver/test_simpletype.rb b/test/soap/wsdlDriver/test_simpletype.rb
index ed628927cd..76b3a32df7 100644
--- a/test/soap/wsdlDriver/test_simpletype.rb
+++ b/test/soap/wsdlDriver/test_simpletype.rb
@@ -30,6 +30,7 @@ class TestSimpleType < Test::Unit::TestCase
 
   def setup_server
     @server = Server.new(
+      :BindAddress => "0.0.0.0",
       :Port => Port,
       :AccessLog => [],
       :SOAPDefaultNamespace => "urn:example.com:simpletype-rpc"
@@ -40,7 +41,8 @@ class TestSimpleType < Test::Unit::TestCase
 
   def setup_client
     wsdl = File.join(DIR, 'simpletype.wsdl')
-    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.wiredump_dev = STDOUT if $DEBUG
     @client.endpoint_url = "http://localhost:#{Port}/"
     @client.generate_explicit_type = false
   end
@@ -65,13 +67,6 @@ class TestSimpleType < 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
     t
   end
 
@@ -79,10 +74,10 @@ class TestSimpleType < Test::Unit::TestCase
     result = @client.echo_version("1.9")
     assert_equal("1.9", result.version)
     assert_equal("checked", result.msg)
-    assert_raise(::XSD::ValueSpaceError) do
+    assert_raise(XSD::ValueSpaceError) do
       @client.echo_version("2.0")
     end
-    assert_raise(::XSD::ValueSpaceError) do
+    assert_raise(XSD::ValueSpaceError) do
       @client.echo_version(nil) # nil => "2.0" => out of range
     end
   end