mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/branches/ruby_1_8@8502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
15b7d43988
commit
991d0c409c
181 changed files with 3183 additions and 9380 deletions
|
@ -1,5 +1,5 @@
|
|||
# WSDL4R - XMLSchema import definition.
|
||||
# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
|
||||
# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
|
||||
|
||||
# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
|
||||
# redistribute it and/or modify it under the same terms of Ruby's license;
|
||||
|
@ -7,6 +7,7 @@
|
|||
|
||||
|
||||
require 'wsdl/info'
|
||||
require 'wsdl/xmlSchema/importer'
|
||||
|
||||
|
||||
module WSDL
|
||||
|
@ -16,11 +17,13 @@ module XMLSchema
|
|||
class Import < Info
|
||||
attr_reader :namespace
|
||||
attr_reader :schemalocation
|
||||
attr_reader :content
|
||||
|
||||
def initialize
|
||||
super
|
||||
@namespace = nil
|
||||
@schemalocation = nil
|
||||
@content = nil
|
||||
end
|
||||
|
||||
def parse_element(element)
|
||||
|
@ -32,11 +35,29 @@ class Import < Info
|
|||
when NamespaceAttrName
|
||||
@namespace = value.source
|
||||
when SchemaLocationAttrName
|
||||
@schemalocation = value.source
|
||||
@schemalocation = URI.parse(value.source)
|
||||
if @schemalocation.relative? and !parent.location.nil? and
|
||||
!parent.location.relative?
|
||||
@schemalocation = parent.location + @schemalocation
|
||||
end
|
||||
if root.importedschema.key?(@schemalocation)
|
||||
@content = root.importedschema[@schemalocation]
|
||||
else
|
||||
root.importedschema[@schemalocation] = nil # placeholder
|
||||
@content = import(@schemalocation)
|
||||
root.importedschema[@schemalocation] = @content
|
||||
end
|
||||
@schemalocation
|
||||
else
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def import(location)
|
||||
Importer.import(location, root)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue