* 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

5 files changed, 269 insertions, 0 deletions

diff --git a/sample/soap/authheader/authmgr.rb b/sample/soap/authheader/authmgr.rb
new file mode 100644
index 000000000..a4d3b66c0
--- /dev/null
+++ b/sample/soap/authheader/authmgr.rb
@@ -0,0 +1,41 @@
+class Authmgr
+  def initialize
+    @users = {
+      'NaHi' => 'passwd',
+      'HiNa' => 'wspass'
+    }
+    @sessions = {}
+  end
+
+  def login(userid, passwd)
+    userid and passwd and @users[userid] == passwd
+  end
+
+  # returns userid
+  def auth(sessionid)
+    @sessions[sessionid]
+  end
+
+  def create_session(userid)
+    while true
+      key = create_sessionkey
+      break unless @sessions[key]
+    end
+    @sessions[key] = userid
+    key
+  end
+
+  def get_session(userid)
+    @sessions.index(userid)
+  end
+
+  def destroy_session(sessionkey)
+    @sessions.delete(sessionkey)
+  end
+
+private
+
+  def create_sessionkey
+    Time.now.usec.to_s
+  end
+end
diff --git a/sample/soap/authheader/client.rb b/sample/soap/authheader/client.rb
new file mode 100644
index 000000000..4055fe63f
--- /dev/null
+++ b/sample/soap/authheader/client.rb
@@ -0,0 +1,40 @@
+require 'soap/rpc/driver'
+require 'soap/header/simplehandler'
+
+server = ARGV.shift || 'http://localhost:7000/'
+
+class ClientAuthHeaderHandler < SOAP::Header::SimpleHandler
+  MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+
+  def initialize(userid, passwd)
+    super(MyHeaderName)
+    @sessionid = nil
+    @userid = userid
+    @passwd = passwd
+    @mustunderstand = true
+  end
+
+  def on_simple_outbound
+    if @sessionid
+      { "sessionid" => @sessionid }
+    else
+      { "userid" => @userid, "passwd" => @passwd }
+    end
+  end
+
+  def on_simple_inbound(my_header, mustunderstand)
+    @sessionid = my_header["sessionid"]
+  end
+end
+
+ns = 'http://tempuri.org/authHeaderPort'
+serv = SOAP::RPC::Driver.new(server, ns)
+serv.add_method('deposit', 'amt')
+serv.add_method('withdrawal', 'amt')
+
+serv.headerhandler << ClientAuthHeaderHandler.new('NaHi', 'passwd')
+
+serv.wiredump_dev = STDOUT
+
+p serv.deposit(150)
+p serv.withdrawal(120)
diff --git a/sample/soap/authheader/client2.rb b/sample/soap/authheader/client2.rb
new file mode 100644
index 000000000..58a7da45a
--- /dev/null
+++ b/sample/soap/authheader/client2.rb
@@ -0,0 +1,39 @@
+require 'soap/rpc/driver'
+require 'soap/header/simplehandler'
+
+server = ARGV.shift || 'http://localhost:7000/'
+
+class ClientAuthHeaderHandler < SOAP::Header::SimpleHandler
+  MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+
+  def initialize(userid, passwd)
+    super(MyHeaderName)
+    @sessionid = nil
+    @userid = userid
+    @passwd = passwd
+  end
+
+  def on_simple_outbound
+    if @sessionid
+      { "sessionid" => @sessionid }
+    else
+      { "userid" => @userid, "passwd" => @passwd }
+    end
+  end
+
+  def on_simple_inbound(my_header, mustunderstand)
+    @sessionid = my_header["sessionid"]
+  end
+end
+
+ns = 'http://tempuri.org/authHeaderPort'
+serv = SOAP::RPC::Driver.new(server, ns)
+serv.add_method('deposit', 'amt')
+serv.add_method('withdrawal', 'amt')
+
+serv.headerhandler << ClientAuthHeaderHandler.new('NaHi', 'passwd')
+
+serv.wiredump_dev = STDOUT
+
+p serv.deposit(150)
+p serv.withdrawal(120)
diff --git a/sample/soap/authheader/server.rb b/sample/soap/authheader/server.rb
new file mode 100644
index 000000000..6b562d02f
--- /dev/null
+++ b/sample/soap/authheader/server.rb
@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require 'soap/rpc/standaloneServer'
+require 'soap/header/simplehandler'
+require 'authmgr'
+
+class AuthHeaderPortServer < SOAP::RPC::StandaloneServer
+  class AuthHeaderService
+    def self.create
+      new
+    end
+
+    def deposit(amt)
+      "deposit #{amt} OK"
+    end
+
+    def withdrawal(amt)
+      "withdrawal #{amt} OK"
+    end
+  end
+
+  Name = 'http://tempuri.org/authHeaderPort'
+  def initialize(*arg)
+    super
+    add_rpc_servant(AuthHeaderService.new, Name)
+    add_rpc_request_headerhandler(ServerAuthHeaderHandler)
+  end
+
+  class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler
+    MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+
+    @authmgr = Authmgr.new
+    def self.create
+      new(@authmgr)
+    end
+
+    def initialize(authmgr)
+      super(MyHeaderName)
+      @authmgr = authmgr
+      @userid = @sessionid = nil
+    end
+
+    def on_simple_outbound
+      { "sessionid" => @sessionid }
+    end
+
+    def on_simple_inbound(my_header, mu)
+      auth = false
+      userid = my_header["userid"]
+      passwd = my_header["passwd"]
+      if @authmgr.login(userid, passwd)
+	auth = true
+      elsif sessionid = my_header["sessionid"]
+	if userid = @authmgr.auth(sessionid)
+	  @authmgr.destroy_session(sessionid)
+	  auth = true
+	end
+      end
+      raise RuntimeError.new("authentication failed") unless auth
+      @userid = userid
+      @sessionid = @authmgr.create_session(userid)
+    end
+  end
+end
+
+if $0 == __FILE__
+  svr = AuthHeaderPortServer.new('AuthHeaderPortServer', nil, '0.0.0.0', 7000)
+  trap(:INT) do
+    svr.shutdown
+  end
+  status = svr.start
+end
diff --git a/sample/soap/authheader/server2.rb b/sample/soap/authheader/server2.rb
new file mode 100644
index 000000000..b0065e314
--- /dev/null
+++ b/sample/soap/authheader/server2.rb
@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+
+require 'soap/rpc/standaloneServer'
+require 'soap/header/simplehandler'
+require 'authmgr'
+
+class AuthHeaderPortServer < SOAP::RPC::StandaloneServer
+  class AuthHeaderService
+    def self.create
+      new
+    end
+
+    def initialize(authmgr)
+      @authmgr = authmgr
+    end
+
+    def login(userid, passwd)
+      if @authmgr.login(userid, passwd)
+        @authmgr.create_session(userid)
+      else
+        raise RuntimeError.new("authentication failed")
+      end
+    end
+
+    def deposit(amt)
+      "deposit #{amt} OK"
+    end
+
+    def withdrawal(amt)
+      "withdrawal #{amt} OK"
+    end
+  end
+
+  Name = 'http://tempuri.org/authHeaderPort'
+  def initialize(*arg)
+    super
+    add_rpc_servant(AuthHeaderService.new, Name)
+    ServerAuthHeaderHandler.init
+    add_rpc_request_headerhandler(ServerAuthHeaderHandler)
+  end
+
+  class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler
+    MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+
+    def self.create
+      new(@authmgr)
+    end
+
+    def initialize(authmgr)
+      super(MyHeaderName)
+      @authmgr = authmgr
+      @sessionid = nil
+    end
+
+    def on_simple_outbound
+      if @sessionid
+        { "sessionid" => @sessionid }
+      end
+    end
+
+    def on_simple_inbound(my_header, mu)
+      auth = false
+      if sessionid = my_header["sessionid"]
+	if userid = @authmgr.auth(sessionid)
+	  @authmgr.destroy_session(sessionid)
+          @session_id = @authmgr.create_session(userid)
+	  auth = true
+	end
+      end
+      raise RuntimeError.new("authentication failed") unless auth
+    end
+  end
+end
+
+if $0 == __FILE__
+  status = AuthHeaderPortServer.new('AuthHeaderPortServer', nil, '0.0.0.0', 7000).start
+end