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

Changeset 1885

Show
Ignore:
Timestamp:
07/15/07 14:41:45 (1 year ago)
Author:
nahi
Message:
  • use httpclient instead of http-access2. (works with http-access/2.0.9 as same as with httpclient/2.1.0)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/soap/netHttpClient.rb

    r1868 r1885  
    6262  end 
    6363 
     64  def set_auth(uri, user_id, passwd) 
     65    raise NotImplementedError.new("auth is not supported under soap4r + net/http.") 
     66  end 
     67 
    6468  def set_basic_auth(uri, user_id, passwd) 
    6569    # net/http does not handle url. 

  • trunk/lib/soap/streamHandler.rb

    r1881 r1885  
    9393 
    9494  begin 
    95     require 'http-access2' 
    96     if HTTPAccess2::VERSION < "2.0" 
    97       raise LoadError.new("http-access/2.0 or later is required.") 
    98     end 
    99     Client = HTTPAccess2::Client 
     95    require 'httpclient' 
     96    Client = HTTPClient 
    10097    RETRYABLE = true 
    10198  rescue LoadError 
    102     warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG 
    103     require 'soap/netHttpClient' 
    104     Client = SOAP::NetHttpClient 
    105     RETRYABLE = false 
     99    begin 
     100      require 'http-access2' 
     101      if HTTPAccess2::VERSION < "2.0" 
     102        raise LoadError.new("http-access/2.0 or later is required.") 
     103      end 
     104      Client = HTTPAccess2::Client 
     105      RETRYABLE = true 
     106    rescue LoadError 
     107      warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG 
     108      require 'soap/netHttpClient' 
     109      Client = SOAP::NetHttpClient 
     110      RETRYABLE = false 
     111    end 
    106112  end 
    107113 

  • trunk/lib/wsdl/xmlSchema/importer.rb

    r1860 r1885  
    7777 
    7878  def web_client 
    79     @web_client ||= begin 
    80         require 'http-access2' 
    81         if HTTPAccess2::VERSION < "2.0" 
    82           raise LoadError.new("http-access/2.0 or later is required.") 
    83         end 
    84         HTTPAccess2::Client 
     79    return @web_client if @web_client 
     80    begin 
     81      require 'httpclient' 
     82      @web_client = HTTPClient 
     83    rescue LoadError 
     84      begin 
     85        require 'http-access2' 
     86        if HTTPAccess2::VERSION < "2.0" 
     87          raise LoadError.new("http-access/2.0 or later is required.") 
     88        end 
     89        @web_client = HTTPAccess2::Client 
    8590      rescue LoadError 
    86        warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG 
    87        require 'soap/netHttpClient' 
    88        ::SOAP::NetHttpClient 
     91        warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG 
     92        require 'soap/netHttpClient' 
     93        @web_client = ::SOAP::NetHttpClient 
    8994      end 
     95    end 
    9096    @web_client 
    9197  end 

  • trunk/sample/basic/yahooNewsSearch.rb

    r1843 r1885  
    1010end 
    1111 
    12 require 'http-access2' 
     12require 'httpclient' 
    1313appid = 'soap4r-dev' 
    1414url = 'http://api.search.yahoo.com/NewsSearchService/V1/newsSearch' 
    …… 
    2626} 
    2727proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
    28 result = HTTPAccess2::Client.new(proxy).get_content(url, param) 
     28result = HTTPClient.new(proxy).get_content(url, param) 
    2929 
    3030opt = {:default_encodingstyle => 'urn:myxmlhandler'} 

  • trunk/sample/payload/basicauth/client.rb

    r1843 r1885  
    11require 'soap/rpc/driver' 
    22 
    3 # SOAP client with BasicAuth requires http-access2. 
    4 # http://raa.ruby-lang.org/project/http-access2/ 
     3# SOAP client with BasicAuth requires httpclient. 
     4# http://raa.ruby-lang.org/project/httpclient/ 
    55drv = SOAP::RPC::Driver.new('http://localhost:7000/', 'urn:test') 
    66drv.wiredump_dev = STDERR if $DEBUG 

  • trunk/sample/payload/ssl/files/README

    r1520 r1885  
    1 * certificates and keys in this directory is copied from http-access2 test. 
     1* certificates and keys in this directory is copied from httpclient test. 

  • trunk/sample/payload/ssl/sslclient.rb

    r1843 r1885  
    1 require 'http-access2' 
     1require 'httpclient' 
    22require 'soap/rpc/driver' 
    33 

  • trunk/sample/payload/ssl/sslclient_require_noserverauth.rb

    r1843 r1885  
    1 require 'http-access2' 
     1require 'httpclient' 
    22require 'soap/rpc/driver' 
    33 

  • trunk/sample/payload/ssl/sslclient_with_clientauth.rb

    r1843 r1885  
    1 require 'http-access2' 
     1require 'httpclient' 
    22require 'soap/rpc/driver' 
    33 

  • trunk/test/soap/asp.net/test_aspdotnet.rb

    r1837 r1885  
    8888  end 
    8989 
    90   if defined?(HTTPAccess2) 
     90  if defined?(HTTPClient) 
    9191 
    9292    # qualified! 

  • trunk/test/soap/ssl/README

    r1520 r1885  
    1 * certificates and keys in this directory is copied from http-access2 test. 
     1* certificates and keys in this directory is copied from httpclient test. 

  • trunk/test/soap/ssl/test_ssl.rb

    r1794 r1885  
    11require 'test/unit' 
    22begin 
    3   require 'http-access2' 
     3  require 'httpclient' 
    44rescue LoadError 
    55end 
    66require 'soap/rpc/driver' 
    77 
    8 if defined?(HTTPAccess2) and defined?(OpenSSL) 
     8if defined?(HTTPClient) and defined?(OpenSSL) 
    99 
    1010module SOAP; module SSL 
    …… 
    5959      assert(false) 
    6060    rescue OpenSSL::SSL::SSLError => ssle 
    61       assert_equal("certificate verify failed", ssle.message) 
     61      assert(/certificate verify failed/ =~ ssle.message) 
    6262      assert(@verify_callback_called) 
    6363    end 
    …… 
    7070      assert(false) 
    7171    rescue OpenSSL::SSL::SSLError => ssle 
    72       assert_equal("certificate verify failed", ssle.message) 
     72      assert(/certificate verify failed/ =~ ssle.message) 
    7373      assert(@verify_callback_called) 
    7474    end 
    …… 
    8080      assert(false) 
    8181    rescue OpenSSL::SSL::SSLError => ssle 
    82       assert_equal("certificate verify failed", ssle.message) 
     82      assert(/certificate verify failed/ =~ ssle.message) 
    8383      assert(@verify_callback_called) 
    8484    end 
    …… 
    9595      assert(false) 
    9696    rescue OpenSSL::SSL::SSLError => ssle 
    97       assert_equal("certificate verify failed", ssle.message) 
     97      assert(/certificate verify failed/ =~ ssle.message) 
    9898      assert(@verify_callback_called) 
    9999    end 
    …… 
    106106      assert(false) 
    107107    rescue OpenSSL::SSL::SSLError => ssle 
    108       assert_equal("certificate verify failed", ssle.message) 
     108      assert(/certificate verify failed/ =~ ssle.message) 
    109109    end 
    110110    # 
    …… 
    136136        assert(false) 
    137137      rescue OpenSSL::SSL::SSLError => ssle 
    138         assert_equal("certificate verify failed", ssle.message) 
     138        assert(/certificate verify failed/ =~ ssle.message) 
    139139        assert(@verify_callback_called) 
    140140      end 
    …… 
    145145        assert(false) 
    146146      rescue OpenSSL::SSL::SSLError => ssle 
    147         assert_equal("certificate verify failed", ssle.message) 
     147        assert(/certificate verify failed/ =~ ssle.message) 
    148148        assert(@verify_callback_called) 
    149149      end 

  • trunk/test/soap/test_httpconfigloader.rb

    r1863 r1885  
    33require 'soap/rpc/driver' 
    44 
    5 if defined?(HTTPAccess2) 
     5if defined?(HTTPClient) 
    66 
    77module SOAP 

  • trunk/test/soap/test_no_indent.rb

    r1615 r1885  
    33require 'soap/rpc/driver' 
    44 
    5 if defined?(HTTPAccess2) 
     5if defined?(HTTPClient) 
    66 
    77module SOAP 

  • trunk/test/soap/test_streamhandler.rb

    r1863 r1885  
    108108 
    109109  def parse_req_header(str) 
    110     if ::SOAP::HTTPStreamHandler::Client.to_s == 'SOAP::NetHttpClient' 
    111       str = eval(str.split(/\r?\n/)[4][3..-1]) 
    112     end 
    113110    parse_req_header_http_access2(str) 
    114111  end 
    …… 
    158155 
    159156  def test_basic_auth 
    160     unless Object.const_defined?('HTTPAccess2') 
     157    unless Object.const_defined?('HTTPClient') 
    161158      # soap4r + net/http + basic_auth is not supported. 
    162       # use http-access2 instead. 
     159      # use httpclient instead. 
    163160      assert(true) 
    164161      return 
    …… 
    172169 
    173170  def test_proxy 
    174     if Object.const_defined?('HTTPAccess2') 
    175       backup = HTTPAccess2::Client::NO_PROXY_HOSTS.dup 
    176       HTTPAccess2::Client::NO_PROXY_HOSTS.clear 
     171    if Object.const_defined?('HTTPClient') 
     172      backup = HTTPClient::NO_PROXY_HOSTS.dup 
     173      HTTPClient::NO_PROXY_HOSTS.clear 
    177174    else 
    178175      backup = SOAP::NetHttpClient::NO_PROXY_HOSTS.dup 
    …… 
    191188    end 
    192189  ensure 
    193     if Object.const_defined?('HTTPAccess2') 
    194       HTTPAccess2::Client::NO_PROXY_HOSTS.replace(backup) 
     190    if Object.const_defined?('HTTPClient') 
     191      HTTPClient::NO_PROXY_HOSTS.replace(backup) 
    195192    else 
    196193      SOAP::NetHttpClient::NO_PROXY_HOSTS.replace(backup) 

  • trunk/test/wsdl/qualified/test_qualified.rb

    r1794 r1885  
    66 
    77 
    8 if defined?(HTTPAccess2) 
     8if defined?(HTTPClient) 
    99 
    1010module WSDL 

  • trunk/test/wsdl/qualified/test_unqualified.rb

    r1853 r1885  
    66 
    77 
    8 if defined?(HTTPAccess2) 
     8if defined?(HTTPClient) 
    99 
    1010module WSDL 

  • trunk/test/wsdl/rpc/test_rpc_lit.rb

    r1830 r1885  
    66 
    77 
    8 if defined?(HTTPAccess2) and defined?(OpenSSL) 
     8if defined?(HTTPClient) and defined?(OpenSSL) 
    99 
    1010module WSDL; module RPC