* added files:

	  * lib/soap/header/*
	  * lib/soap/rpc/httpserver.rb
	  * lib/wsdl/soap/cgiStubCreator.rb
	  * lib/wsdl/soap/classDefCreator.rb
	  * lib/wsdl/soap/classDefCreatorSupport.rb
	  * lib/wsdl/soap/clientSkeltonCreator.rb
	  * lib/wsdl/soap/driverCreator.rb
	  * lib/wsdl/soap/mappingRegistryCreator.rb
	  * lib/wsdl/soap/methodDefCreator.rb
	  * lib/wsdl/soap/servantSkeltonCreator.rb
	  * lib/wsdl/soap/standaloneServerStubCreator.rb
	  * lib/wsdl/xmlSchema/enumeration.rb
	  * lib/wsdl/xmlSchema/simpleRestriction.rb
	  * lib/wsdl/xmlSchema/simpleType.rb
	  * lib/xsd/codegen/*
	  * lib/xsd/codegen.rb
	  * sample/soap/authheader/*
	  * sample/soap/raa2.4/*
	  * sample/soap/ssl/*
	  * sample/soap/swa/*
	  * sample/soap/whois.rb
	  * sample/wsdl/raa2.4/*
	  * test/soap/header/*
	  * test/soap/ssl/*
	  * test/soap/struct/*
	  * test/soap/swa/*
	  * test/soap/wsdlDriver/*
	  * test/wsdl/multiplefault.wsdl
	  * test/wsdl/simpletype/*
	  * test/wsdl/test_multiplefault.rb

	* modified files:
	  * lib/soap/baseData.rb
	  * lib/soap/element.rb
	  * lib/soap/generator.rb
	  * lib/soap/netHttpClient.rb
	  * lib/soap/parser.rb
	  * lib/soap/property.rb
	  * lib/soap/soap.rb
	  * lib/soap/streamHandler.rb
	  * lib/soap/wsdlDriver.rb
	  * lib/soap/wsdlDriver.rb
	  * lib/soap/encodingstyle/handler.rb
	  * lib/soap/encodingstyle/literalHandler.rb
	  * lib/soap/encodingstyle/soapHandler.rb
	  * lib/soap/mapping/factory.rb
	  * lib/soap/mapping/mapping.rb
	  * lib/soap/mapping/registry.rb
	  * lib/soap/mapping/rubytypeFactory.rb
	  * lib/soap/mapping/wsdlRegistry.rb
	  * lib/soap/rpc/cgistub.rb
	  * lib/soap/rpc/driver.rb
	  * lib/soap/rpc/proxy.rb
	  * lib/soap/rpc/router.rb
	  * lib/soap/rpc/soaplet.rb
	  * lib/soap/rpc/standaloneServer.rb
	  * lib/wsdl/data.rb
	  * lib/wsdl/definitions.rb
	  * lib/wsdl/operation.rb
	  * lib/wsdl/parser.rb
	  * lib/wsdl/soap/definitions.rb
	  * lib/wsdl/xmlSchema/complexContent.rb
	  * lib/wsdl/xmlSchema/complexType.rb
	  * lib/wsdl/xmlSchema/data.rb
	  * lib/wsdl/xmlSchema/parser.rb
	  * lib/wsdl/xmlSchema/schema.rb
	  * lib/xsd/datatypes.rb
	  * lib/xsd/qname.rb
	  * sample/soap/sampleStruct/server.rb
	  * sample/wsdl/amazon/AmazonSearch.rb
	  * sample/wsdl/amazon/AmazonSearchDriver.rb
	  * test/soap/test_property.rb
	  * test/soap/calc/test_calc_cgi.rb
	  * test/wsdl/test_emptycomplextype.rb

	* summary
	  * add SOAP Header mustUnderstand support.

	  * add HTTP client SSL configuration and Cookies support (works
	    completely with http-access2).

	  * add header handler for handling sending/receiving SOAP Header.

	  * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
	    Model.  it caused error.

	  * add WSDL simpleType support to restrict lexical value space.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 177 insertions, 0 deletions

diff --git a/test/soap/wsdlDriver/README.txt b/test/soap/wsdlDriver/README.txt
new file mode 100644
index 000000000..b4d45a048
--- /dev/null
+++ b/test/soap/wsdlDriver/README.txt
@@ -0,0 +1,2 @@
+echo_version.rb is generated by wsdl2ruby.rb;
+% wsdl2ruby.rb --wsdl simpletype.wsdl --classdef --force
diff --git a/test/soap/wsdlDriver/echo_version.rb b/test/soap/wsdlDriver/echo_version.rb
new file mode 100644
index 000000000..7d76fb758
--- /dev/null
+++ b/test/soap/wsdlDriver/echo_version.rb
@@ -0,0 +1,20 @@
+# urn:example.com:simpletype-rpc-type
+class Version_struct
+  @@schema_type = "version_struct"
+  @@schema_ns = "urn:example.com:simpletype-rpc-type"
+
+  attr_accessor :version
+  attr_accessor :msg
+
+  def initialize(version = nil, msg = nil)
+    @version = version
+    @msg = msg
+  end
+end
+
+# urn:example.com:simpletype-rpc-type
+module Versions
+  C_16 = "1.6"
+  C_18 = "1.8"
+  C_19 = "1.9"
+end
diff --git a/test/soap/wsdlDriver/simpletype.wsdl b/test/soap/wsdlDriver/simpletype.wsdl
new file mode 100644
index 000000000..7c211a6b2
--- /dev/null
+++ b/test/soap/wsdlDriver/simpletype.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="echo_version"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:simpletype-rpc"
+    xmlns:txd="urn:example.com:simpletype-rpc-type"
+    targetNamespace="urn:example.com:simpletype-rpc"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <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="msg" type="xsd:string" />
+	</xsd:all>
+      </xsd:complexType>
+
+      <xsd:simpleType name="versions">
+        <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="msg_version">
+    <part name="version" type="txd:versions"/>
+  </message>
+
+  <message name="msg_version_struct">
+    <part name="return" type="txd:version_struct"/>
+  </message>
+
+  <portType name="echo_version_port_type">
+    <operation name="echo_version">
+      <input message="tns:msg_version"/>
+      <output message="tns:msg_version_struct"/>
+    </operation>
+  </portType>
+
+  <binding name="echo_version_binding" type="tns:echo_version_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo_version">
+      <soap:operation soapAction="urn:example.com:simpletype-rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="echo_version_service">
+    <port name="echo_version_port" binding="tns:echo_version_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/test/soap/wsdlDriver/test_simpletype.rb b/test/soap/wsdlDriver/test_simpletype.rb
new file mode 100644
index 000000000..ed628927c
--- /dev/null
+++ b/test/soap/wsdlDriver/test_simpletype.rb
@@ -0,0 +1,92 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestSimpleType < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::HTTPServer
+    def on_init
+      add_method(self, 'echo_version', 'version')
+    end
+  
+    def echo_version(version)
+      # "2.0" is out of range.
+      Version_struct.new(version || "2.0", 'checked')
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  require File.join(DIR, 'echo_version')
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :Port => Port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => "urn:example.com:simpletype-rpc"
+    )
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'simpletype.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = false
+  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
+    }
+    while server.status != :Running
+      sleep 0.1
+      unless t.alive?
+        t.join
+        raise
+      end
+    end
+    t
+  end
+
+  def test_ping
+    result = @client.echo_version("1.9")
+    assert_equal("1.9", result.version)
+    assert_equal("checked", result.msg)
+    assert_raise(::XSD::ValueSpaceError) do
+      @client.echo_version("2.0")
+    end
+    assert_raise(::XSD::ValueSpaceError) do
+      @client.echo_version(nil) # nil => "2.0" => out of range
+    end
+  end
+end
+
+
+end