1 files changed, 13 insertions, 45 deletions
diff --git a/lib/wsdl/importer.rb b/lib/wsdl/importer.rb
index 873be710b5..481bd81b25 100644
--- a/lib/wsdl/importer.rb
+++ b/lib/wsdl/importer.rb
@@ -1,69 +1,37 @@
 # WSDL4R - WSDL importer library.
-# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 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;
 # either the dual license version in 2003, or any later version.
 
 
-require 'wsdl/info'
+require 'wsdl/xmlSchema/importer'
 require 'wsdl/parser'
-require 'soap/soap'
-require 'soap/property'
 
 
 module WSDL
 
 
-class Importer
-  def self.import(location)
-    new.import(location)
+class Importer < WSDL::XMLSchema::Importer
+  def self.import(location, originalroot = nil)
+    new.import(location, originalroot)
   end
 
-  def initialize
-    @web_client = nil
-  end
+private
 
-  def import(location)
-    STDERR.puts("importing: #{location}") if $DEBUG
-    content = nil
-    if FileTest.exist?(location)
-      content = File.open(location).read
-    else
-      client = web_client.new(nil, "WSDL4R")
-      if opt = ::SOAP::Property.loadproperty(::SOAP::PropertyName)
-	client.proxy = opt["client.protocol.http.proxy"]
-	client.no_proxy = opt["client.protocol.http.no_proxy"]
-      end
-      client.proxy ||= ::SOAP::Env::HTTP_PROXY
-      client.no_proxy ||= ::SOAP::Env::NO_PROXY
-      content = client.get_content(location)
-    end
-    opt = {}
+  def parse(content, location, originalroot)
+    opt = {
+      :location => location,
+      :originalroot => originalroot
+    }
     begin
       WSDL::Parser.new(opt).parse(content)
-    rescue WSDL::Parser::ParseError => orgexcn
-      require 'wsdl/xmlSchema/parser'
-      WSDL::XMLSchema::Parser.new(opt).parse(content)
+    rescue WSDL::Parser::ParseError
+      super(content, location, originalroot)
     end
   end
 
-private
-
-  def web_client
-    @web_client ||= begin
-	require 'http-access2'
-	if HTTPAccess2::VERSION < "2.0"
-	  raise LoadError.new("http-access/2.0 or later is required.")
-	end
-	HTTPAccess2::Client
-      rescue LoadError
-	STDERR.puts "Loading http-access2 failed.  Net/http is used." if $DEBUG
-	require 'soap/netHttpClient'
-	::SOAP::NetHttpClient
-      end
-    @web_client
-  end
 end