From b7931c40fee8ec76c2ef0398f228e034d7ff64e4 Mon Sep 17 00:00:00 2001 From: nahi Date: Sat, 8 Nov 2003 09:52:42 +0000 Subject: * test/wsdl/raa/*: add new testcase for WSDL loading, parsing and reading. * test/soap/marshal/*: backport from soap4r/1.5.1. all differences are for ruby/1.6. * lib/soap/*: backport from soap4r/1.5.1. all differences are for ruby/1.6. * lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*. [ruby-talk:84813] * lib/wsdl/soap/definitions.rb: element name typo in custom exception struct definition which is needed for wsdlDriver; camelCase -> underscore_name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/wsdl/data.rb | 1 + lib/wsdl/soap/definitions.rb | 2 +- lib/wsdl/xmlSchema/data.rb | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/wsdl') diff --git a/lib/wsdl/data.rb b/lib/wsdl/data.rb index 4f3b845316..3361dac1f4 100644 --- a/lib/wsdl/data.rb +++ b/lib/wsdl/data.rb @@ -35,6 +35,7 @@ require 'wsdl/import' module WSDL +ArrayTypeAttrName = XSD::QName.new(Namespace, 'arrayType') BindingName = XSD::QName.new(Namespace, 'binding') DefinitionsName = XSD::QName.new(Namespace, 'definitions') DocumentationName = XSD::QName.new(Namespace, 'documentation') diff --git a/lib/wsdl/soap/definitions.rb b/lib/wsdl/soap/definitions.rb index 08df0dcc68..1bd8e8a664 100644 --- a/lib/wsdl/soap/definitions.rb +++ b/lib/wsdl/soap/definitions.rb @@ -117,7 +117,7 @@ private def exception_complextype type = XMLSchema::ComplexType.new(XSD::QName.new( ::SOAP::Mapping::RubyCustomTypeNamespace, 'SOAPException')) - excn_name = XMLSchema::Element.new(XSD::QName.new(nil, 'exceptionTypeName'), XSD::XSDString::Type) + excn_name = XMLSchema::Element.new(XSD::QName.new(nil, 'excn_type_name'), XSD::XSDString::Type) cause = XMLSchema::Element.new(XSD::QName.new(nil, 'cause'), XSD::AnyTypeName) backtrace = XMLSchema::Element.new(XSD::QName.new(nil, 'backtrace'), ::SOAP::ValueArrayName) message = XMLSchema::Element.new(XSD::QName.new(nil, 'message'), XSD::XSDString::Type) diff --git a/lib/wsdl/xmlSchema/data.rb b/lib/wsdl/xmlSchema/data.rb index 539cf357c6..57d2f527c0 100644 --- a/lib/wsdl/xmlSchema/data.rb +++ b/lib/wsdl/xmlSchema/data.rb @@ -36,7 +36,6 @@ module XMLSchema AllName = XSD::QName.new(XSD::Namespace, 'all') AnyName = XSD::QName.new(XSD::Namespace, 'any') -ArrayTypeAttrName = XSD::QName.new(XSD::Namespace, 'arrayType') AttributeName = XSD::QName.new(XSD::Namespace, 'attribute') ChoiceName = XSD::QName.new(XSD::Namespace, 'choice') ComplexContentName = XSD::QName.new(XSD::Namespace, 'complexContent') -- cgit v1.2.3