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

Changeset 1953

Show
Ignore:
Timestamp:
09/12/07 11:06:07 (1 year ago)
Author:
nahi
Message:
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/soap/wsdlDriver.rb

    r1943 r1953  
    3232    @wsdl = import(wsdl) 
    3333    name_creator = WSDL::SOAP::ClassNameCreator.new 
     34    @modulepath = 'WSDLDriverFactory' 
    3435    @methoddefcreator = 
    35       WSDL::SOAP::MethodDefCreator.new(@wsdl, name_creator, nil, {}) 
     36      WSDL::SOAP::MethodDefCreator.new(@wsdl, name_creator, @modulepath, {}) 
    3637  end 
    3738   

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

    r1948 r1953  
    159159    end 
    160160    classname = mapped_class_basename(qname, @modulepath) 
    161     check_classname(classname) 
    162161    c = ClassDef.new(classname, '::String') 
    163162    c.comment = "#{qname}" 
    …… 
    169168    list = typedef.list 
    170169    classname = mapped_class_basename(qname, @modulepath) 
    171     check_classname(classname) 
    172170    c = ClassDef.new(classname, '::Array') 
    173171    c.comment = "#{qname}" 
    …… 
    225223  def create_simpleclassdef(qname, type_or_element) 
    226224    classname = mapped_class_basename(qname, @modulepath) 
    227     check_classname(classname) 
    228225    c = ClassDef.new(classname, '::String') 
    229226    c.comment = "#{qname}" 
    …… 
    258255  def create_classdef(qname, typedef, qualified = false) 
    259256    classname = mapped_class_basename(qname, @modulepath) 
    260     check_classname(classname) 
    261257    baseclassname = nil 
    262258    if typedef.complexcontent 
    …… 
    388384  def create_arraydef(qname, typedef) 
    389385    classname = mapped_class_basename(qname, @modulepath) 
    390     check_classname(classname) 
    391386    c = ClassDef.new(classname, '::Array') 
    392387    c.comment = "#{qname}" 

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

    r1948 r1953  
    2626 
    2727  def mapped_class_basename(qname, modulepath) 
    28     name = @name_creator.assign_name(qname, modulepath) 
    29     name.sub(/\A.*:/, '') 
     28    classname = @name_creator.assign_name(qname, modulepath) 
     29    classname.sub(/\A.*:/, '') 
    3030  end 
    3131 
    …… 
    224224    raise RuntimeError.new("cannot define name of #{attribute}") 
    225225  end 
    226  
    227   def check_classname(classname) 
    228     if @modulepath.nil? and Object.constants.include?(classname) 
    229       warn("created definition re-opens an existing toplevel class: #{classname}") 
    230     end 
    231   end 
    232226end 
    233227 

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

    r1948 r1953  
    3434          name += '_' 
    3535        end 
     36        check_classname(name) 
    3637      end 
    3738      @classname[qname] = name.freeze 
    …… 
    5859=end 
    5960  end 
     61 
     62  def check_classname(name) 
     63    if Object.constants.include?(name) 
     64      warn("created definition re-opens an existing toplevel class: #{name}.  consider to use --module_path option of wsdl2ruby.rb") 
     65    end 
     66  end 
    6067end 
    6168