From 47eff4157edfdd8dc0a5e358e21f8c1f7c4a5ae3 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Tue, 8 Apr 2008 11:08:52 +0000 Subject: [PATCH] HTTPCLIENT-753: Class Scheme and related classes moved to a separate package git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@645850 13f79535-47bb-0310-9956-ffa450edef68 --- RELEASE_NOTES.txt | 3 +++ .../org/apache/http/examples/client/ClientCustomSSL.java | 2 +- .../apache/http/examples/client/ClientExecuteDirect.java | 8 ++++---- .../apache/http/examples/client/ClientExecuteProxy.java | 8 ++++---- .../examples/client/ClientMultiThreadedExecution.java | 6 +++--- .../apache/http/examples/conn/ManagerConnectDirect.java | 8 ++++---- .../apache/http/examples/conn/ManagerConnectProxy.java | 8 ++++---- .../apache/http/examples/conn/OperatorConnectDirect.java | 8 ++++---- .../apache/http/examples/conn/OperatorConnectProxy.java | 8 ++++---- .../org/apache/http/conn/ClientConnectionManager.java | 1 + .../apache/http/conn/ClientConnectionManagerFactory.java | 1 + .../org/apache/http/conn/ClientConnectionOperator.java | 1 + .../org/apache/http/conn/MultihomePlainSocketFactory.java | 2 ++ .../http/conn/{ => scheme}/LayeredSocketFactory.java | 2 +- .../apache/http/conn/{ => scheme}/PlainSocketFactory.java | 2 +- .../java/org/apache/http/conn/{ => scheme}/Scheme.java | 2 +- .../org/apache/http/conn/{ => scheme}/SchemeRegistry.java | 2 +- .../org/apache/http/conn/{ => scheme}/SocketFactory.java | 3 ++- .../java/org/apache/http/conn/ssl/SSLSocketFactory.java | 2 +- .../http/impl/client/DefaultClientRequestDirector.java | 2 +- .../org/apache/http/impl/client/DefaultHttpClient.java | 6 +++--- .../http/impl/conn/DefaultClientConnectionOperator.java | 8 ++++---- .../apache/http/impl/conn/DefaultHttpRoutePlanner.java | 4 ++-- .../apache/http/impl/conn/ProxySelectorRoutePlanner.java | 4 ++-- .../apache/http/impl/conn/SingleClientConnManager.java | 2 +- .../http/impl/conn/tsccm/ThreadSafeClientConnManager.java | 2 +- .../src/test/java/org/apache/http/conn/TestScheme.java | 3 +++ .../impl/client/TestDefaultClientRequestDirector.java | 6 +++--- .../apache/http/impl/conn/TestProxySelRoutePlanner.java | 8 ++++---- .../java/org/apache/http/impl/conn/TestTSCCMNoServer.java | 8 ++++---- .../org/apache/http/impl/conn/TestTSCCMWithServer.java | 2 +- .../org/apache/http/impl/conn/tsccm/TestDumbHelpers.java | 8 ++++---- .../apache/http/impl/conn/tsccm/TestSpuriousWakeup.java | 8 ++++---- .../java/org/apache/http/localserver/ServerTestBase.java | 8 ++++---- .../org/apache/http/mockup/SecureSocketFactoryMockup.java | 2 +- .../java/org/apache/http/mockup/SocketFactoryMockup.java | 2 +- 36 files changed, 86 insertions(+), 74 deletions(-) rename module-client/src/main/java/org/apache/http/conn/{ => scheme}/LayeredSocketFactory.java (98%) rename module-client/src/main/java/org/apache/http/conn/{ => scheme}/PlainSocketFactory.java (99%) rename module-client/src/main/java/org/apache/http/conn/{ => scheme}/Scheme.java (99%) rename module-client/src/main/java/org/apache/http/conn/{ => scheme}/SchemeRegistry.java (99%) rename module-client/src/main/java/org/apache/http/conn/{ => scheme}/SocketFactory.java (98%) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index b875ceb1d..e5b935a20 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,9 @@ Changes since 4.0 Alpha 3 ------------------- +* [HTTPCLIENT-753] Class Scheme and related classes moved to a separate package + Contributed by Oleg Kalnichevski + * [HTTPCLIENT-757] Improved request wrapping in the DefaultClientRequestDirector. This also fixed the problem with the default proxy set at the client level having no effect. diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientCustomSSL.java b/module-client/src/examples/org/apache/http/examples/client/ClientCustomSSL.java index 0b8047e7c..38c6ee249 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientCustomSSL.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientCustomSSL.java @@ -36,7 +36,7 @@ import java.security.KeyStore; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.conn.Scheme; +import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java index cddd7e079..fdc7e1a93 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java @@ -40,10 +40,10 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpVersion; import org.apache.http.client.HttpClient; import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.message.BasicHttpRequest; diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java index a9d24b265..28d3fd0fc 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java @@ -40,11 +40,11 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpVersion; import org.apache.http.client.HttpClient; import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; import org.apache.http.conn.params.ConnRoutePNames; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java b/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java index f00d4a6ac..aac5f03ad 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java @@ -36,10 +36,10 @@ import org.apache.http.HttpVersion; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; diff --git a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java index 2a42b6020..5d4295262 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java +++ b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java @@ -39,12 +39,12 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpVersion; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.message.BasicHttpRequest; import org.apache.http.params.BasicHttpParams; diff --git a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java index 7816b7a5b..d9fd26912 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java +++ b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java @@ -41,10 +41,10 @@ import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.message.BasicHttpRequest; diff --git a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java index 2ddc7c8f3..e378671d1 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java +++ b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java @@ -39,10 +39,10 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpVersion; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.OperatedClientConnection; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.impl.conn.DefaultClientConnectionOperator; import org.apache.http.message.BasicHttpRequest; import org.apache.http.params.BasicHttpParams; diff --git a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java index 2ad6fc52e..2d34917a5 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java +++ b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java @@ -39,10 +39,10 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpVersion; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.OperatedClientConnection; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.conn.DefaultClientConnectionOperator; import org.apache.http.message.BasicHttpRequest; diff --git a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java index a7008a248..0273fe914 100644 --- a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java +++ b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java @@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit; import org.apache.http.params.HttpParams; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.SchemeRegistry; diff --git a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java index 8f74c49ae..e37b8557e 100644 --- a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java @@ -31,6 +31,7 @@ package org.apache.http.conn; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.params.HttpParams; /** diff --git a/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java b/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java index 8d1ad0d94..c119333fd 100644 --- a/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java +++ b/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java @@ -35,6 +35,7 @@ import java.io.IOException; import java.net.InetAddress; import org.apache.http.HttpHost; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.params.HttpParams; import org.apache.http.protocol.HttpContext; diff --git a/module-client/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java index 57b7b8c1f..adb3ca3a5 100644 --- a/module-client/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java @@ -40,6 +40,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; diff --git a/module-client/src/main/java/org/apache/http/conn/LayeredSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java similarity index 98% rename from module-client/src/main/java/org/apache/http/conn/LayeredSocketFactory.java rename to module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java index 27d6db0c4..58a92a6a0 100644 --- a/module-client/src/main/java/org/apache/http/conn/LayeredSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java @@ -29,7 +29,7 @@ * */ -package org.apache.http.conn; +package org.apache.http.conn.scheme; import java.io.IOException; import java.net.Socket; diff --git a/module-client/src/main/java/org/apache/http/conn/PlainSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java similarity index 99% rename from module-client/src/main/java/org/apache/http/conn/PlainSocketFactory.java rename to module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java index 14e95b9c8..c6f65dcf4 100644 --- a/module-client/src/main/java/org/apache/http/conn/PlainSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java @@ -29,7 +29,7 @@ * */ -package org.apache.http.conn; +package org.apache.http.conn.scheme; import java.io.IOException; import java.net.InetAddress; diff --git a/module-client/src/main/java/org/apache/http/conn/Scheme.java b/module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java similarity index 99% rename from module-client/src/main/java/org/apache/http/conn/Scheme.java rename to module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java index bcb99328b..ee854b768 100644 --- a/module-client/src/main/java/org/apache/http/conn/Scheme.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java @@ -28,7 +28,7 @@ * . * */ -package org.apache.http.conn; +package org.apache.http.conn.scheme; import org.apache.http.util.LangUtils; diff --git a/module-client/src/main/java/org/apache/http/conn/SchemeRegistry.java b/module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java similarity index 99% rename from module-client/src/main/java/org/apache/http/conn/SchemeRegistry.java rename to module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java index 334402eff..40f89c5a8 100644 --- a/module-client/src/main/java/org/apache/http/conn/SchemeRegistry.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java @@ -28,7 +28,7 @@ * . * */ -package org.apache.http.conn; +package org.apache.http.conn.scheme; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/module-client/src/main/java/org/apache/http/conn/SocketFactory.java b/module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java similarity index 98% rename from module-client/src/main/java/org/apache/http/conn/SocketFactory.java rename to module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java index 2cedf7290..ed87dad9e 100644 --- a/module-client/src/main/java/org/apache/http/conn/SocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java @@ -29,13 +29,14 @@ * */ -package org.apache.http.conn; +package org.apache.http.conn.scheme; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; +import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.params.HttpParams; /** diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java index 79aaf4965..470ed6478 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -31,7 +31,7 @@ package org.apache.http.conn.ssl; -import org.apache.http.conn.LayeredSocketFactory; +import org.apache.http.conn.scheme.LayeredSocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; 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 39d7b6536..ec387594f 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 @@ -72,11 +72,11 @@ import org.apache.http.conn.BasicManagedEntity; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.Scheme; import org.apache.http.conn.routing.BasicRouteDirector; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRouteDirector; import org.apache.http.conn.routing.HttpRoutePlanner; +import org.apache.http.conn.scheme.Scheme; import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.message.BasicHttpRequest; import org.apache.http.params.HttpConnectionParams; diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java index 3f184aaa5..43fec931a 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java @@ -51,9 +51,9 @@ import org.apache.http.client.protocol.ResponseProcessCookies; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionManagerFactory; import org.apache.http.conn.routing.HttpRoutePlanner; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.cookie.CookieSpecRegistry; import org.apache.http.impl.DefaultConnectionReuseStrategy; diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java index 5a7e49915..8dca7413f 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java @@ -42,12 +42,12 @@ import org.apache.http.params.HttpConnectionParams; import org.apache.http.protocol.HttpContext; import org.apache.http.conn.HttpHostConnectException; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; -import org.apache.http.conn.LayeredSocketFactory; import org.apache.http.conn.OperatedClientConnection; import org.apache.http.conn.ClientConnectionOperator; +import org.apache.http.conn.scheme.LayeredSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; /** diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java index 0699623ab..23bc45ce6 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java @@ -39,10 +39,10 @@ import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.protocol.HttpContext; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoutePlanner; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.params.HttpRouteParams; diff --git a/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java b/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java index f2e0085b7..71eb0cc6f 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java @@ -47,8 +47,8 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoutePlanner; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.params.HttpRouteParams; diff --git a/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java b/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java index b6b66ef85..3e5e43859 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java @@ -41,8 +41,8 @@ import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.OperatedClientConnection; -import org.apache.http.conn.SchemeRegistry; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.params.HttpParams; diff --git a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java index bc90029f0..d9ddd241a 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java @@ -36,13 +36,13 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.OperatedClientConnection; -import org.apache.http.conn.SchemeRegistry; import org.apache.http.params.HttpParams; import org.apache.http.impl.conn.DefaultClientConnectionOperator; diff --git a/module-client/src/test/java/org/apache/http/conn/TestScheme.java b/module-client/src/test/java/org/apache/http/conn/TestScheme.java index 021def71e..800e15386 100644 --- a/module-client/src/test/java/org/apache/http/conn/TestScheme.java +++ b/module-client/src/test/java/org/apache/http/conn/TestScheme.java @@ -39,6 +39,9 @@ import junit.framework.TestSuite; import org.apache.http.HttpHost; //import org.apache.http.conn.ssl.SSLSocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.mockup.SecureSocketFactoryMockup; diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java b/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java index 50362735c..bb6f2722b 100644 --- a/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java +++ b/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java @@ -53,10 +53,10 @@ import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ConnectionReleaseTrigger; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.entity.StringEntity; import org.apache.http.impl.conn.ClientConnAdapterMockup; import org.apache.http.impl.conn.SingleClientConnManager; diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java b/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java index 8d8d6ad81..07e627464 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestProxySelRoutePlanner.java @@ -46,12 +46,12 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpVersion; import org.apache.http.message.BasicHttpRequest; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoutePlanner; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.mockup.ProxySelectorMockup; diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java index 986773c52..a2f207a9e 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java @@ -42,12 +42,12 @@ import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; import org.apache.http.conn.params.HttpConnectionManagerParams; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java index 63c68c61c..b9bbf2dd6 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java @@ -44,10 +44,10 @@ import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.SchemeRegistry; import org.apache.http.conn.params.HttpConnectionManagerParams; import org.apache.http.localserver.ServerTestBase; import org.apache.http.message.BasicHttpRequest; diff --git a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestDumbHelpers.java b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestDumbHelpers.java index 338584a67..33c27480e 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestDumbHelpers.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestDumbHelpers.java @@ -44,10 +44,10 @@ import junit.framework.TestSuite; import org.apache.http.HttpHost; import org.apache.http.conn.routing.HttpRoute; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; -import org.apache.http.conn.PlainSocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.impl.conn.DefaultClientConnectionOperator; diff --git a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java index 51f445210..19348e8d1 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java @@ -42,11 +42,11 @@ import org.apache.http.HttpVersion; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; import org.apache.http.conn.routing.HttpRoute; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.params.HttpConnectionManagerParams; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; diff --git a/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java b/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java index 864805999..c524c7860 100644 --- a/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java +++ b/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java @@ -37,10 +37,10 @@ import junit.framework.TestCase; import org.apache.http.HttpHost; import org.apache.http.HttpVersion; import org.apache.http.conn.routing.HttpRoute; -import org.apache.http.conn.PlainSocketFactory; -import org.apache.http.conn.Scheme; -import org.apache.http.conn.SchemeRegistry; -import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.scheme.PlainSocketFactory; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.impl.DefaultHttpClientConnection; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; diff --git a/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java b/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java index b4f0b76b7..f6ae2ed71 100644 --- a/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java +++ b/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java @@ -32,7 +32,7 @@ package org.apache.http.mockup; import java.net.Socket; -import org.apache.http.conn.LayeredSocketFactory; +import org.apache.http.conn.scheme.LayeredSocketFactory; /** * {@link SecureSocketFactory} mockup implementation. diff --git a/module-client/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java b/module-client/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java index 66b2b73cb..b2d8e4e87 100644 --- a/module-client/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java +++ b/module-client/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java @@ -33,7 +33,7 @@ package org.apache.http.mockup; import java.net.Socket; import java.net.InetAddress; -import org.apache.http.conn.SocketFactory; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.params.HttpParams;