* added files:

          * lib/soap/mapping/wsdl*.rb
          * lib/wsdl/soap/element.rb
          * lib/wsdl/xmlSchema/simpleContent.rb

        * modified files:
          * lib/soap/*
          * lib/wsdl/*
          * lib/xsd/*
          * test/soap/*
          * test/wsdl/*
          * test/xsd/*
          * sample/soap/*
          * sample/sdl/*

        * summary
          * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2

          * added several XSD basetype support: nonPositiveInteger,
            negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
            unsignedShort, unsignedByte, positiveInteger

          * HTTP client connection/send/receive timeout support.

          * HTTP client/server gzipped content encoding support.

          * improved WSDL schema definition support; still is far from
            complete, but is making step by step improovement.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/wsdl/importer.rb b/lib/wsdl/importer.rb
index fac02b51a0..873be710b5 100644
--- a/lib/wsdl/importer.rb
+++ b/lib/wsdl/importer.rb
@@ -25,6 +25,7 @@ class Importer
   end
 
   def import(location)
+    STDERR.puts("importing: #{location}") if $DEBUG
     content = nil
     if FileTest.exist?(location)
       content = File.open(location).read
@@ -42,12 +43,8 @@ class Importer
     begin
       WSDL::Parser.new(opt).parse(content)
     rescue WSDL::Parser::ParseError => orgexcn
-      begin
-	require 'wsdl/xmlSchema/parser'
-	WSDL::XMLSchema::Parser.new(opt).parse(content)
-      rescue
-	raise orgexcn
-      end
+      require 'wsdl/xmlSchema/parser'
+      WSDL::XMLSchema::Parser.new(opt).parse(content)
     end
   end