From 59e54a8e423b870d509dd31b711444a047872a0a Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Sun, 25 May 2008 12:01:22 +0000 Subject: [PATCH] Moved AuthState to o.a.http.auth package git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@659971 13f79535-47bb-0310-9956-ffa450edef68 --- .../examples/client/ClientInteractiveAuthentication.java | 2 +- .../client/ClientPreemptiveBasicAuthentication.java | 8 ++++---- .../client/ClientPreemptiveDigestAuthentication.java | 8 ++++---- .../java/org/apache/http/{client => auth}/AuthState.java | 5 +---- .../http/client/protocol/RequestProxyAuthentication.java | 2 +- .../http/client/protocol/RequestTargetAuthentication.java | 2 +- .../http/impl/client/DefaultClientRequestDirector.java | 2 +- .../apache/http/impl/client/DefaultUserTokenHandler.java | 8 ++++---- 8 files changed, 17 insertions(+), 20 deletions(-) rename module-client/src/main/java/org/apache/http/{client => auth}/AuthState.java (96%) diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java b/module-client/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java index f8be40168..f61025ff2 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java @@ -38,9 +38,9 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.auth.AuthScope; +import org.apache.http.auth.AuthState; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.AuthState; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.protocol.ClientContext; import org.apache.http.impl.client.DefaultHttpClient; diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java b/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java index c222442e8..248a2d878 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java @@ -1,7 +1,7 @@ /* - * $HeadURL:$ - * $Revision:$ - * $Date:$ + * $HeadURL$ + * $Revision$ + * $Date$ * ==================================================================== * * Licensed to the Apache Software Foundation (ASF) under one or more @@ -38,9 +38,9 @@ import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponse; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; +import org.apache.http.auth.AuthState; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.AuthState; import org.apache.http.client.CredentialsProvider; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.protocol.ClientContext; diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java b/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java index 18c279a80..75006b5b6 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java @@ -1,7 +1,7 @@ /* - * $HeadURL:$ - * $Revision:$ - * $Date:$ + * $HeadURL$ + * $Revision$ + * $Date$ * ==================================================================== * * Licensed to the Apache Software Foundation (ASF) under one or more @@ -39,9 +39,9 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; +import org.apache.http.auth.AuthState; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.AuthState; import org.apache.http.client.CredentialsProvider; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.protocol.ClientContext; diff --git a/module-client/src/main/java/org/apache/http/client/AuthState.java b/module-client/src/main/java/org/apache/http/auth/AuthState.java similarity index 96% rename from module-client/src/main/java/org/apache/http/client/AuthState.java rename to module-client/src/main/java/org/apache/http/auth/AuthState.java index d30d397ac..b18e2feb6 100644 --- a/module-client/src/main/java/org/apache/http/client/AuthState.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthState.java @@ -28,11 +28,8 @@ * */ -package org.apache.http.client; +package org.apache.http.auth; -import org.apache.http.auth.AuthScheme; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.Credentials; /** * This class provides detailed information about the state of the diff --git a/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java b/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java index 5c60366e2..98c45116f 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java @@ -40,9 +40,9 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.auth.AUTH; import org.apache.http.auth.AuthScheme; +import org.apache.http.auth.AuthState; import org.apache.http.auth.AuthenticationException; import org.apache.http.auth.Credentials; -import org.apache.http.client.AuthState; import org.apache.http.protocol.HttpContext; /** diff --git a/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java b/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java index 597cef4b6..a4b478812 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java @@ -40,9 +40,9 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.auth.AUTH; import org.apache.http.auth.AuthScheme; +import org.apache.http.auth.AuthState; import org.apache.http.auth.AuthenticationException; import org.apache.http.auth.Credentials; -import org.apache.http.client.AuthState; import org.apache.http.protocol.HttpContext; /** diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java index 2b9bf7c2c..f40b50362 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java @@ -53,10 +53,10 @@ import org.apache.http.ProtocolException; import org.apache.http.ProtocolVersion; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; +import org.apache.http.auth.AuthState; import org.apache.http.auth.AuthenticationException; import org.apache.http.auth.Credentials; import org.apache.http.auth.MalformedChallengeException; -import org.apache.http.client.AuthState; import org.apache.http.client.AuthenticationHandler; import org.apache.http.client.ClientRequestDirector; import org.apache.http.client.CredentialsProvider; diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java index 1665e6027..16d1d514e 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java @@ -1,7 +1,7 @@ /* - * $HeadURL:$ - * $Revision:$ - * $Date:$ + * $HeadURL$ + * $Revision$ + * $Date$ * * ==================================================================== * @@ -35,8 +35,8 @@ import java.security.Principal; import javax.net.ssl.SSLSession; import org.apache.http.auth.AuthScheme; +import org.apache.http.auth.AuthState; import org.apache.http.auth.Credentials; -import org.apache.http.client.AuthState; import org.apache.http.client.UserTokenHandler; import org.apache.http.client.protocol.ClientContext; import org.apache.http.conn.ManagedClientConnection;