hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1079534 - in /httpcomponents/httpclient/branches/4.1.x/httpclient/src: main/java/org/apache/http/auth/ main/java/org/apache/http/client/protocol/ main/java/org/apache/http/impl/client/ test/java/org/apache/http/client/protocol/
Date Tue, 08 Mar 2011 20:54:14 GMT
Author: olegk
Date: Tue Mar  8 20:54:13 2011
New Revision: 1079534

URL: http://svn.apache.org/viewvc?rev=1079534&view=rev
Log:
Removed 4.2 methods

Removed:
    httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java
Modified:
    httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
    httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
    httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
    httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
    httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java

Modified: httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/auth/AuthScope.java?rev=1079534&r1=1079533&r2=1079534&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
(original)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
Tue Mar  8 20:54:13 2011
@@ -28,7 +28,6 @@ package org.apache.http.auth;
 
 import java.util.Locale;
 
-import org.apache.http.HttpHost;
 import org.apache.http.annotation.Immutable;
 
 import org.apache.http.util.LangUtils;
@@ -110,20 +109,6 @@ public class AuthScope {
         this.scheme = (scheme == null) ? ANY_SCHEME: scheme.toUpperCase(Locale.ENGLISH);
     }
 
-    /**
-     * @since 4.2
-     */
-    public AuthScope(final HttpHost host, final String realm, final String schemeName) {
-        this(host.getHostName(), host.getPort(), realm, schemeName);
-    }
-    
-    /**
-     * @since 4.2
-     */
-    public AuthScope(final HttpHost host) {
-        this(host, ANY_REALM, ANY_SCHEME);
-    }
-    
     /** Creates a new credentials scope for the given
      * <tt>host</tt>, <tt>port</tt>, <tt>realm</tt>,
and any
      * authentication scheme.

Modified: httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java?rev=1079534&r1=1079533&r2=1079534&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
(original)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
Tue Mar  8 20:54:13 2011
@@ -112,7 +112,8 @@ public class RequestAuthCache implements
             this.log.debug("Re-using cached '" + schemeName + "' auth scheme for " + host);
         }
 
-        AuthScope authScope = new AuthScope(host, AuthScope.ANY_REALM, schemeName);
+        AuthScope authScope = new AuthScope(host.getHostName(), host.getPort(),
+                AuthScope.ANY_REALM, schemeName);
         Credentials creds = credsProvider.getCredentials(authScope);
 
         if (creds != null) {

Modified: httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=1079534&r1=1079533&r2=1079534&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
(original)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
Tue Mar  8 20:54:13 2011
@@ -142,10 +142,7 @@ public class DefaultHttpRequestRetryHand
         return retryCount;
     }
 
-    /**
-     * @since 4.2
-     */
-    protected boolean handleAsIdempotent(final HttpRequest request) {
+    private boolean handleAsIdempotent(final HttpRequest request) {
         return !(request instanceof HttpEntityEnclosingRequest);
     }
 

Modified: httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java?rev=1079534&r1=1079533&r2=1079534&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
(original)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
Tue Mar  8 20:54:13 2011
@@ -68,8 +68,8 @@ public class TestRequestAuthCache {
         this.credProvider = new BasicCredentialsProvider();
         this.creds1 = new UsernamePasswordCredentials("user1", "secret1");
         this.creds2 = new UsernamePasswordCredentials("user2", "secret2");
-        this.authscope1 = new AuthScope(this.target);
-        this.authscope2 = new AuthScope(this.proxy);
+        this.authscope1 = new AuthScope(this.target.getHostName(), this.target.getPort());
+        this.authscope2 = new AuthScope(this.proxy.getHostName(), this.proxy.getPort());
         this.authscheme1 = new BasicScheme();
         this.authscheme2 = new BasicScheme();
 

Modified: httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java?rev=1079534&r1=1079533&r2=1079534&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
(original)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
Tue Mar  8 20:54:13 2011
@@ -68,8 +68,8 @@ public class TestResponseAuthCache {
 
         this.creds1 = new UsernamePasswordCredentials("user1", "secret1");
         this.creds2 = new UsernamePasswordCredentials("user2", "secret2");
-        this.authscope1 = new AuthScope(this.target);
-        this.authscope2 = new AuthScope(this.proxy);
+        this.authscope1 = new AuthScope(this.target.getHostName(), this.target.getPort());
+        this.authscope2 = new AuthScope(this.proxy.getHostName(), this.proxy.getPort());
         this.authscheme1 = new BasicScheme();
         this.authscheme2 = new BasicScheme();
 



Mime
View raw message