hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1463959 - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/impl/auth/ main/java/org/apache/http/impl/client/ main/java/org/apache/http/impl/execchain/ test/java/org/apache/http/impl/auth/ test/java/org/apache/h...
Date Wed, 03 Apr 2013 12:27:18 GMT
Author: olegk
Date: Wed Apr  3 12:27:18 2013
New Revision: 1463959

URL: http://svn.apache.org/r1463959
Log:
Moved HttpAuthenticator to o.a.http.impl.auth

Added:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
  (contents, props changed)
      - copied, changed from r1463938, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/HttpAuthenticator.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
  (contents, props changed)
      - copied, changed from r1463938, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestHttpAuthenticator.java
Removed:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/HttpAuthenticator.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestHttpAuthenticator.java
Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
(from r1463938, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/HttpAuthenticator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/HttpAuthenticator.java&r1=1463938&r2=1463959&rev=1463959&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/HttpAuthenticator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
Wed Apr  3 12:27:18 2013
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.execchain;
+package org.apache.http.impl.auth;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -51,6 +51,9 @@ import org.apache.http.client.Authentica
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Asserts;
 
+/**
+ * @since 4.3
+ */
 public class HttpAuthenticator {
 
     private final Log log;
@@ -90,23 +93,6 @@ public class HttpAuthenticator {
         }
     }
 
-    /**
-     * @deprecated (4.3) use {@link #handleAuthChallenge(
-     *   HttpHost, HttpResponse, AuthenticationStrategy, AuthState, HttpContext)}.
-     */
-    @Deprecated
-    public boolean authenticate (
-            final HttpHost host,
-            final HttpResponse response,
-            final AuthenticationStrategy authStrategy,
-            final AuthState authState,
-            final HttpContext context) {
-        return handleAuthChallenge(host, response, authStrategy, authState, context);
-    }
-
-    /**
-     * @since 4.3
-     */
     public boolean handleAuthChallenge(
             final HttpHost host,
             final HttpResponse response,
@@ -182,9 +168,6 @@ public class HttpAuthenticator {
         }
     }
 
-    /**
-     * @since 4.3
-     */
     public void generateAuthResponse(
             final HttpRequest request,
             final AuthState authState,

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java?rev=1463959&r1=1463958&r2=1463959&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java
Wed Apr  3 12:27:18 2013
@@ -28,13 +28,18 @@
 package org.apache.http.impl.client;
 
 import org.apache.commons.logging.Log;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthState;
+import org.apache.http.client.AuthenticationStrategy;
+import org.apache.http.protocol.HttpContext;
 
 /**
  * @deprecated (4.3) reserved for internal use.
  *
  */
 @Deprecated
-public class HttpAuthenticator extends org.apache.http.impl.execchain.HttpAuthenticator {
+public class HttpAuthenticator extends org.apache.http.impl.auth.HttpAuthenticator {
 
     public HttpAuthenticator(final Log log) {
         super(log);
@@ -44,4 +49,13 @@ public class HttpAuthenticator extends o
         super();
     }
 
+    public boolean authenticate (
+            final HttpHost host,
+            final HttpResponse response,
+            final AuthenticationStrategy authStrategy,
+            final AuthState authState,
+            final HttpContext context) {
+        return handleAuthChallenge(host, response, authStrategy, authState, context);
+    }
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java?rev=1463959&r1=1463958&r2=1463959&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
Wed Apr  3 12:27:18 2013
@@ -64,6 +64,7 @@ import org.apache.http.conn.routing.Http
 import org.apache.http.conn.routing.HttpRouteDirector;
 import org.apache.http.conn.routing.RouteTracker;
 import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.impl.auth.HttpAuthenticator;
 import org.apache.http.impl.conn.ConnectionShutdownException;
 import org.apache.http.message.BasicHttpRequest;
 import org.apache.http.protocol.HttpProcessor;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
(from r1463938, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestHttpAuthenticator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestHttpAuthenticator.java&r1=1463938&r2=1463959&rev=1463959&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestHttpAuthenticator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
Wed Apr  3 12:27:18 2013
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.http.impl.auth;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -51,11 +51,6 @@ import org.apache.http.client.Authentica
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.config.Lookup;
 import org.apache.http.config.RegistryBuilder;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.auth.BasicSchemeFactory;
-import org.apache.http.impl.auth.DigestScheme;
-import org.apache.http.impl.auth.DigestSchemeFactory;
-import org.apache.http.impl.auth.NTLMSchemeFactory;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.TargetAuthenticationStrategy;
 import org.apache.http.message.BasicHeader;

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message