Welcome to the "trac"-ing site of soap4r!
[soap4r] [httpclient] [openpgp4u] [pkcs1] [logger] [csv] [vtr]

Changeset 1938

Show
Ignore:
Timestamp:
09/06/07 22:52:26 (8 months ago)
Author:
nahi
Message:
  • ignore xsd:element definition when the same qname is also defined as a xsd:complexType. closes the ticket now but could not be ignored in the future. closes #413.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/wsdl/soap/classDefCreator.rb

    r1934 r1938  
    9090  def dump_element 
    9191    @elements.collect { |ele| 
     92      next if @complextypes[ele.name] 
    9293      qualified = (ele.elementform == 'qualified') 
    9394      if ele.local_complextype 
    …… 
    9899        dump_simpleclassdef(ele.name, nil) 
    99100      else 
     101        # ignores type only element 
    100102        nil 
    101103      end 

  • trunk/lib/wsdl/soap/literalMappingRegistryCreator.rb

    r1934 r1938  
    6363  def dump_element 
    6464    @elements.collect { |ele| 
     65      next if @complextypes[ele.name] 
    6566      qualified = (ele.elementform == 'qualified') 
    6667      if ele.local_complextype 

  • trunk/test/wsdl/anonymous/expectedMappingRegistry.rb

    r1934 r1938  
    8787    ] 
    8888  ) 
    89  
    90   LiteralRegistry.register( 
    91     :class => WSDL::Anonymous::LoginResponse, 
    92     :schema_name => XSD::QName.new(NsLp, "loginResponse"), 
    93     :schema_qualified => true, 
    94     :schema_element => [ 
    95       ["loginResult", ["WSDL::Anonymous::LoginResponse::LoginResult", XSD::QName.new(nil, "loginResult")]] 
    96     ] 
    97   ) 
    98  
    99   LiteralRegistry.register( 
    100     :class => WSDL::Anonymous::LoginResponse::LoginResult, 
    101     :schema_name => XSD::QName.new(nil, "loginResult"), 
    102     :schema_qualified => true, 
    103     :schema_element => [ 
    104       ["sessionID", "SOAP::SOAPString"] 
    105     ] 
    106   ) 
    10789end 
    10890 

  • trunk/test/wsdl/any/expectedMappingRegistry.rb

    r1923 r1938  
    3232 
    3333  LiteralRegistry.register( 
    34     :class => WSDL::Any::FooBar, 
    35     :schema_name => XSD::QName.new(NsEchoType, "foo.bar"), 
    36     :schema_qualified => true, 
    37     :schema_element => [ 
    38       ["before", ["SOAP::SOAPString", XSD::QName.new(nil, "before")]], 
    39       ["any", [nil, XSD::QName.new(NsXMLSchema, "anyType")]], 
    40       ["after", ["SOAP::SOAPString", XSD::QName.new(nil, "after")]] 
    41     ] 
    42   ) 
    43  
    44   LiteralRegistry.register( 
    4534    :class => WSDL::Any::SetOutputAndCompleteRequest, 
    4635    :schema_name => XSD::QName.new(NsEchoType, "setOutputAndCompleteRequest"), 

  • trunk/test/xsd/xsd2ruby/section.xsd

    r1857 r1938  
    1111    </xsd:sequence> 
    1212  </xsd:complexType> 
     13 
     14  <xsd:element name="section"> 
     15    <xsd:complexType> 
     16      <xsd:sequence> 
     17        <xsd:element name="different" type="xsd:int" /> 
     18      </xsd:sequence> 
     19    </xsd:complexType> 
     20  </xsd:element> 
    1321 
    1422  <xsd:complexType name="section">