test/soap/fault/test_fault.rb @@ -48,6 +48,7 @@ module SOAPType attr_accessor :position attr_reader :extraattr attr_accessor :definedtype + attr_accessor :force_typed def initialize(*arg) super @@ -60,6 +61,7 @@ module SOAPType @position = nil @definedtype = nil @extraattr = {} + @force_typed = false end def inspect lib/soap/baseData.rb @@ -29,8 +29,11 @@ class LiteralHandler < Handler def encode_data(generator, ns, data, parent) attrs = {} name = generator.encode_name(ns, data, attrs) + if data.type and data.type.name and + (@generate_explicit_type or data.force_typed) + data.extraattr[XSD::AttrTypeName] = data.type + end data.extraattr.each do |key, value| - next if !@generate_explicit_type and key == XSD::AttrTypeName keytag = key if key.is_a?(XSD::QName) keytag = encode_attr_key(attrs, ns, key) lib/soap/encodingstyle/literalHandler.rb @@ -141,11 +141,8 @@ public @reftarget = nil else if obj.is_a?(SOAPEnvelope) - # xsi:nil="true" can appear even if dumping without explicit type. Generator.assign_ns(attrs, ns, XSD::InstanceNamespace) - if @generate_explicit_type - Generator.assign_ns(attrs, ns, XSD::Namespace) - end + Generator.assign_ns(attrs, ns, XSD::Namespace) end obj.encode(self, ns, attrs) do |child| indent_backup, @indent = @indent, @indent + @indentstr lib/soap/generator.rb @@ -136,9 +136,12 @@ private ele = SOAPElement.new(qname) end ele.qualified = definition.qualified - if definition.type and (definition.basetype or Mapping.root_type_hint) - Mapping.reset_root_type_hint - ele.extraattr[XSD::AttrTypeName] = definition.type + if definition.type + ele.type = definition.type + if definition.basetype or Mapping.root_type_hint + Mapping.reset_root_type_hint + ele.force_typed = true + end end if qname.nil? and definition.elename ele.elename = definition.elename lib/soap/mapping/literalregistry.rb @@ -110,6 +110,11 @@ private else ele = complexobj2soap(obj, type) end + ele.type = type.name + if type.base or Mapping.root_type_hint + Mapping.reset_root_type_hint + ele.force_typed = true + end add_definedattributes2soap(obj, ele, type) end ele lib/soap/mapping/wsdlliteralregistry.rb @@ -56,7 +56,7 @@ public # TODO: set to false by default or drop thie option in 1.6.0 @allow_unqualified_element = true @default_encodingstyle = nil - @generate_explicit_type = true + @generate_explicit_type = nil @use_default_namespace = false @return_response_as_xml = false @headerhandler = Header::HandlerSet.new @@ -140,6 +140,12 @@ public :default_encodingstyle => @default_encodingstyle || op_info.response_default_encodingstyle ) + if reqopt[:generate_explicit_type].nil? + reqopt[:generate_explicit_type] = (op_info.request_use == :encoded) + end + if resopt[:generate_explicit_type].nil? + resopt[:generate_explicit_type] = (op_info.response_use == :encoded) + end env = route(req_header, req_body, reqopt, resopt) if op_info.response_use.nil? return nil lib/soap/rpc/proxy.rb @@ -30,6 +30,7 @@ module Mapping class Mapper MAPPING_OPT = { :default_encodingstyle => SOAP::LiteralNamespace, + :generate_explicit_type => false, :root_type_hint => true }.freeze lib/xsd/mapping.rb @@ -155,7 +155,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_STRING_ARRAY_REQUEST = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoStringArray xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -170,7 +171,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_STRING_ARRAY_RESPONSE = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoStringArrayResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -198,7 +200,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_STRING_ARRAY_INLINE_REQUEST = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoStringArrayInline xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -213,7 +216,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_STRING_ARRAY_INLINE_RESPONSE = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoStringArrayInlineResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -240,7 +244,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_NESTED_STRUCT_REQUEST = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoNestedStruct xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -260,7 +265,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_NESTED_STRUCT_RESPONSE = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoNestedStructResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -299,7 +305,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_NESTED_STRUCT_REQUEST_NIL = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoNestedStruct xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -318,7 +325,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_NESTED_STRUCT_RESPONSE_NIL = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoNestedStructResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -378,7 +386,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_STRUCT_ARRAY_REQUEST = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoStructArray xmlns:n1="http://soapbuilders.org/rpc-lit-test"> @@ -400,7 +409,8 @@ class TestRPCLIT < Test::Unit::TestCase ECHO_STRUCT_ARRAY_RESPONSE = %q[<?xml version="1.0" encoding="utf-8" ?> -<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" +<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <n1:echoStructArrayResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test"> test/wsdl/rpc/test_rpc_lit.rb test/wsdl/axisArray/itemList.rb test/wsdl/raa/RAA.rb ff8d79afcdd454f227217045d60d79cdcc2e2d92 nahi nahi@23c4dcf6-64ea-0310-84d7-d424c7495ec0 http://github.com/railsfactory/soap4r/commit/0c7f6339c91a1b323d55da275e02bbc3465f5289 0c7f6339c91a1b323d55da275e02bbc3465f5289 2008-02-09T17:57:09-08:00 2008-02-09T17:57:09-08:00 * merged from 1_5 branch. * enabled Sriver#generate_explicit_type for literal services. * test added. * removed generated files. git-svn-id: http://dev.ctor.org/svn/soap4r/trunk@2011 23c4dcf6-64ea-0310-84d7-d424c7495ec0 0eaefcfe53608e509eecce5d7d5bbff294d4f35c nahi nahi@23c4dcf6-64ea-0310-84d7-d424c7495ec0