hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [7/11] - in /httpcomponents/httpclient/trunk: fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/ fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/ fluent-hc/src/main/java/org/apache/hc/client5/http/...
Date Sat, 16 Jan 2016 12:58:42 GMT
Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingManagedHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingManagedHttpClientConnection.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingManagedHttpClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingOutputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingOutputStream.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingOutputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.io.OutputStream;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
@@ -35,6 +35,9 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.HttpConnectionFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpRequest;
@@ -44,9 +47,6 @@ import org.apache.hc.core5.http.impl.Def
 import org.apache.hc.core5.http.impl.io.DefaultHttpRequestWriterFactory;
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
-import org.apache.hc.client5.http.conn.HttpConnectionFactory;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * Factory for {@link ManagedHttpClientConnection} instances.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -40,6 +40,18 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.ConnectionPoolTimeoutException;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.HttpConnectionFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.io.HttpClientConnectionOperator;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
@@ -54,18 +66,6 @@ import org.apache.hc.core5.pool.PoolStat
 import org.apache.hc.core5.pool.io.ConnFactory;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
-import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.DnsResolver;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.HttpClientConnectionOperator;
-import org.apache.hc.client5.http.conn.HttpConnectionFactory;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
 
 /**
  * {@code ClientConnectionPoolManager} maintains a pool of

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java Sat Jan 16 12:58:34 2016
@@ -29,4 +29,4 @@
  * Default implementations of client connection management
  * functions.
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultAuthenticationStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultAuthenticationStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultAuthenticationStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.protocol;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,18 +37,18 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.config.Lookup;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.util.Args;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
 import org.apache.hc.client5.http.auth.ChallengeType;
-import org.apache.hc.client5.http.client.AuthenticationStrategy;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.protocol.AuthenticationStrategy;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.config.Lookup;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Default implementation of {@link AuthenticationStrategy}

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultRedirectStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultRedirectStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultRedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.protocol;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -33,6 +33,16 @@ import java.util.Locale;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.methods.RequestBuilder;
+import org.apache.hc.client5.http.protocol.CircularRedirectException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.RedirectLocations;
+import org.apache.hc.client5.http.protocol.RedirectStrategy;
+import org.apache.hc.client5.http.utils.URIBuilder;
+import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
@@ -46,15 +56,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 import org.apache.hc.core5.util.TextUtils;
-import org.apache.hc.client5.http.client.CircularRedirectException;
-import org.apache.hc.client5.http.client.RedirectStrategy;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.client.methods.RequestBuilder;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.client.utils.URIBuilder;
-import org.apache.hc.client5.http.client.utils.URIUtils;
 
 /**
  * Default implementation of {@link RedirectStrategy}. This strategy honors the restrictions

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultUserTokenHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultUserTokenHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.protocol;
 
 import java.security.Principal;
 
 import javax.net.ssl.SSLSession;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.UserTokenHandler;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpConnection;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.client.UserTokenHandler;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * Default implementation of {@link UserTokenHandler}. This class will use

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/routing/BasicRouteDirector.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/routing/BasicRouteDirector.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/routing/BasicRouteDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java Sat Jan 16 12:58:34 2016
@@ -25,8 +25,10 @@
  *
  */
 
-package org.apache.hc.client5.http.conn.routing;
+package org.apache.hc.client5.http.impl.routing;
 
+import org.apache.hc.client5.http.RouteInfo;
+import org.apache.hc.client5.http.routing.HttpRouteDirector;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.util.Args;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultProxyRoutePlanner.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultProxyRoutePlanner.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultProxyRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.routing;
 
+import org.apache.hc.client5.http.SchemePortResolver;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
 
 /**
- * Implementation of an {@link org.apache.hc.client5.http.conn.routing.HttpRoutePlanner}
+ * Implementation of an {@link org.apache.hc.client5.http.routing.HttpRoutePlanner}
  * that routes requests through a default proxy.
  *
  * @since 4.3

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultRoutePlanner.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultRoutePlanner.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -25,10 +25,17 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.routing;
 
 import java.net.InetAddress;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.UnsupportedSchemeException;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.routing.HttpRoutePlanner;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -36,12 +43,6 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.UnsupportedSchemeException;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
 
 /**
  * Default implementation of an {@link HttpRoutePlanner}. It will not make use of

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.routing;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
@@ -34,15 +34,15 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 
+import org.apache.hc.client5.http.SchemePortResolver;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
 
 /**
- * {@link org.apache.hc.client5.http.conn.routing.HttpRoutePlanner} implementation
+ * {@link org.apache.hc.client5.http.routing.HttpRoutePlanner} implementation
  * based on {@link ProxySelector}. By default, this class will pick up
  * the proxy settings of the JVM, either from system properties
  * or from the browser running the application.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/AIMDBackoffManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/AIMDBackoffManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/AIMDBackoffManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java Sat Jan 16 12:58:34 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.sync.BackoffManager;
 import org.apache.hc.core5.pool.ConnPoolControl;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.BackoffManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * <p>The {@code AIMDBackoffManager} applies an additive increase,

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/AbstractResponseHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/AbstractResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/AbstractResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java Sat Jan 16 12:58:34 2016
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.protocol.HttpResponseException;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.StatusLine;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.HttpResponseException;
-import org.apache.hc.client5.http.client.ResponseHandler;
 
 /**
  * A generic {@link ResponseHandler} that works with the response entity
@@ -43,8 +43,8 @@ import org.apache.hc.client5.http.client
  * body is consumed and an {@link HttpResponseException} is thrown.
  * <p>
  * If this is used with
- * {@link org.apache.hc.client5.http.client.HttpClient#execute(
- *  org.apache.hc.client5.http.client.methods.HttpUriRequest, ResponseHandler)},
+ * {@link org.apache.hc.client5.http.sync.HttpClient#execute(
+ *  org.apache.hc.client5.http.methods.HttpUriRequest, ResponseHandler)},
  * HttpClient may handle redirects (3xx responses) internally.
  * </p>
  *

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java Sat Jan 16 12:58:34 2016
@@ -25,21 +25,21 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.lang.reflect.UndeclaredThrowableException;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.sync.BackoffManager;
+import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.BackoffManager;
-import org.apache.hc.client5.http.client.ConnectionBackoffStrategy;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * @since 4.3

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicCredentialsProvider.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicCredentialsProvider.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java Sat Jan 16 12:58:34 2016
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.hc.core5.util.Args;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
-import org.apache.hc.client5.http.client.CredentialsStore;
+import org.apache.hc.client5.http.auth.CredentialsStore;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Default implementation of {@link CredentialsStore}.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java Sat Jan 16 12:58:34 2016
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * This interface represents an element in the HTTP request execution chain. Each element can

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/Clock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/Clock.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/Clock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 /**
  * Interface used to enable easier testing of time-related behavior.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/CloseableHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/CloseableHttpClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/CloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -33,6 +33,12 @@ import java.net.URI;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.sync.HttpClient;
+import org.apache.hc.client5.http.sync.ResponseHandler;
+import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
@@ -40,12 +46,6 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.client.utils.URIUtils;
 
 /**
  * Base implementation of {@link HttpClient} that also implements {@link Closeable}.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -33,11 +33,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.logging.Log;
+import org.apache.hc.client5.http.io.ConnectionReleaseTrigger;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.concurrent.Cancellable;
 import org.apache.hc.core5.http.io.HttpClientConnection;
-import org.apache.hc.client5.http.conn.ConnectionReleaseTrigger;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
 
 /**
  * Internal connection holder.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/CookieSpecRegistries.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/CookieSpecRegistries.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/CookieSpecRegistries.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java Sat Jan 16 12:58:34 2016
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
-import org.apache.hc.core5.http.config.Lookup;
-import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.hc.client5.http.client.config.CookieSpecs;
-import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
-import org.apache.hc.client5.http.conn.util.PublicSuffixMatcherLoader;
+import org.apache.hc.client5.http.config.CookieSpecs;
 import org.apache.hc.client5.http.cookie.CookieSpecProvider;
 import org.apache.hc.client5.http.impl.cookie.IgnoreSpecProvider;
 import org.apache.hc.client5.http.impl.cookie.RFC6265CookieSpecProvider;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader;
+import org.apache.hc.core5.http.config.Lookup;
+import org.apache.hc.core5.http.config.RegistryBuilder;
 
 /**
  * @since 4.5

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultBackoffStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultBackoffStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultBackoffStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 
+import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.client5.http.client.ConnectionBackoffStrategy;
 
 /**
  * This {@link ConnectionBackoffStrategy} backs off either for a raw

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultHttpRequestRetryHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultHttpRequestRetryHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -41,12 +41,12 @@ import java.util.concurrent.ConcurrentHa
 
 import javax.net.ssl.SSLException;
 
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.sync.HttpRequestRetryHandler;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.HttpRequestRetryHandler;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
 
 /**
  * The default {@link HttpRequestRetryHandler} used by request executors.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultServiceUnavailableRetryStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultServiceUnavailableRetryStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultServiceUnavailableRetryStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java Sat Jan 16 12:58:34 2016
@@ -25,10 +25,12 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.Date;
 
+import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -36,8 +38,6 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.ServiceUnavailableRetryStrategy;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * Default implementation of the {@link ServiceUnavailableRetryStrategy} interface.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/FutureRequestExecutionMetrics.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/FutureRequestExecutionMetrics.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/FutureRequestExecutionMetrics.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.concurrent.atomic.AtomicLong;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/FutureRequestExecutionService.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/FutureRequestExecutionService.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/FutureRequestExecutionService.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java Sat Jan 16 12:58:34 2016
@@ -24,19 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.sync.HttpClient;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
 
 /**
  * HttpAsyncClientWithFuture wraps calls to execute with a {@link HttpRequestFutureTask}

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpClientBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpClientBuilder.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -42,6 +42,56 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
+import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.entity.InputStreamFactory;
+import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
+import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.KerberosSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.NTLMSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.SPNegoSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy;
+import org.apache.hc.client5.http.impl.protocol.DefaultRedirectStrategy;
+import org.apache.hc.client5.http.impl.protocol.DefaultUserTokenHandler;
+import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
+import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner;
+import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.protocol.AuthenticationStrategy;
+import org.apache.hc.client5.http.protocol.RedirectStrategy;
+import org.apache.hc.client5.http.protocol.RequestAcceptEncoding;
+import org.apache.hc.client5.http.protocol.RequestAddCookies;
+import org.apache.hc.client5.http.protocol.RequestAuthCache;
+import org.apache.hc.client5.http.protocol.RequestClientConnControl;
+import org.apache.hc.client5.http.protocol.RequestDefaultHeaders;
+import org.apache.hc.client5.http.protocol.RequestExpectContinue;
+import org.apache.hc.client5.http.protocol.ResponseContentEncoding;
+import org.apache.hc.client5.http.protocol.ResponseProcessCookies;
+import org.apache.hc.client5.http.protocol.UserTokenHandler;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader;
+import org.apache.hc.client5.http.routing.HttpRoutePlanner;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.sync.BackoffManager;
+import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy;
+import org.apache.hc.client5.http.sync.HttpRequestRetryHandler;
+import org.apache.hc.client5.http.sync.ServiceUnavailableRetryStrategy;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.Header;
@@ -66,57 +116,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.apache.hc.core5.util.TextUtils;
 import org.apache.hc.core5.util.VersionInfo;
-import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.client.AuthenticationStrategy;
-import org.apache.hc.client5.http.client.BackoffManager;
-import org.apache.hc.client5.http.client.ConnectionBackoffStrategy;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.HttpRequestRetryHandler;
-import org.apache.hc.client5.http.client.RedirectStrategy;
-import org.apache.hc.client5.http.client.ServiceUnavailableRetryStrategy;
-import org.apache.hc.client5.http.client.UserTokenHandler;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.entity.InputStreamFactory;
-import org.apache.hc.client5.http.client.protocol.RequestAcceptEncoding;
-import org.apache.hc.client5.http.client.protocol.RequestAddCookies;
-import org.apache.hc.client5.http.client.protocol.RequestAuthCache;
-import org.apache.hc.client5.http.client.protocol.RequestClientConnControl;
-import org.apache.hc.client5.http.client.protocol.RequestDefaultHeaders;
-import org.apache.hc.client5.http.client.protocol.RequestExpectContinue;
-import org.apache.hc.client5.http.client.protocol.ResponseContentEncoding;
-import org.apache.hc.client5.http.client.protocol.ResponseProcessCookies;
-import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
-import org.apache.hc.client5.http.conn.util.PublicSuffixMatcherLoader;
-import org.apache.hc.client5.http.cookie.CookieSpecProvider;
-import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory;
-import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory;
-import org.apache.hc.client5.http.impl.auth.KerberosSchemeFactory;
-import org.apache.hc.client5.http.impl.auth.NTLMSchemeFactory;
-import org.apache.hc.client5.http.impl.auth.SPNegoSchemeFactory;
-import org.apache.hc.client5.http.impl.conn.DefaultProxyRoutePlanner;
-import org.apache.hc.client5.http.impl.conn.DefaultRoutePlanner;
-import org.apache.hc.client5.http.impl.conn.DefaultSchemePortResolver;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.impl.conn.SystemDefaultDnsResolver;
-import org.apache.hc.client5.http.impl.conn.SystemDefaultRoutePlanner;
-import org.apache.hc.client5.http.impl.execchain.BackoffStrategyExec;
-import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
-import org.apache.hc.client5.http.impl.execchain.MainClientExec;
-import org.apache.hc.client5.http.impl.execchain.ProtocolExec;
-import org.apache.hc.client5.http.impl.execchain.RedirectExec;
-import org.apache.hc.client5.http.impl.execchain.RetryExec;
-import org.apache.hc.client5.http.impl.execchain.ServiceUnavailableRetryExec;
 
 /**
  * Builder for {@link CloseableHttpClient} instances.
@@ -237,8 +236,8 @@ public class HttpClientBuilder {
      * Assigns {@link javax.net.ssl.HostnameVerifier} instance.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} and the {@link #setSSLSocketFactory(
-     *   org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory)} methods.
+     *HttpClientConnectionManager)} and the {@link #setSSLSocketFactory(
+     *   org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory)} methods.
      * </p>
      *
      *   @since 4.4
@@ -250,10 +249,10 @@ public class HttpClientBuilder {
 
     /**
      * Assigns file containing public suffix matcher. Instances of this class can be created
-     * with {@link org.apache.hc.client5.http.conn.util.PublicSuffixMatcherLoader}.
+     * with {@link PublicSuffixMatcherLoader}.
      *
-     * @see org.apache.hc.client5.http.conn.util.PublicSuffixMatcher
-     * @see org.apache.hc.client5.http.conn.util.PublicSuffixMatcherLoader
+     * @see PublicSuffixMatcher
+     * @see PublicSuffixMatcherLoader
      *
      *   @since 4.4
      */
@@ -266,8 +265,8 @@ public class HttpClientBuilder {
      * Assigns {@link SSLContext} instance.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} and the {@link #setSSLSocketFactory(
-     *   org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory)} methods.
+     *HttpClientConnectionManager)} and the {@link #setSSLSocketFactory(
+     *   org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory)} methods.
      * </p>
      */
     public final HttpClientBuilder setSSLContext(final SSLContext sslContext) {
@@ -279,7 +278,7 @@ public class HttpClientBuilder {
      * Assigns {@link LayeredConnectionSocketFactory} instance.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} method.
+     *HttpClientConnectionManager)} method.
      * </p>
      */
     public final HttpClientBuilder setSSLSocketFactory(
@@ -292,7 +291,7 @@ public class HttpClientBuilder {
      * Assigns maximum total connection value.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} method.
+     *HttpClientConnectionManager)} method.
      * </p>
      */
     public final HttpClientBuilder setMaxConnTotal(final int maxConnTotal) {
@@ -304,7 +303,7 @@ public class HttpClientBuilder {
      * Assigns maximum connection per route value.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} method.
+     *HttpClientConnectionManager)} method.
      * </p>
      */
     public final HttpClientBuilder setMaxConnPerRoute(final int maxConnPerRoute) {
@@ -316,7 +315,7 @@ public class HttpClientBuilder {
      * Assigns default {@link SocketConfig}.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} method.
+     *HttpClientConnectionManager)} method.
      * </p>
      */
     public final HttpClientBuilder setDefaultSocketConfig(final SocketConfig config) {
@@ -328,7 +327,7 @@ public class HttpClientBuilder {
      * Assigns default {@link ConnectionConfig}.
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} method.
+     *HttpClientConnectionManager)} method.
      * </p>
      */
     public final HttpClientBuilder setDefaultConnectionConfig(final ConnectionConfig config) {
@@ -340,7 +339,7 @@ public class HttpClientBuilder {
      * Sets maximum time to live for persistent connections
      * <p>
      * Please note this value can be overridden by the {@link #setConnectionManager(
-     *   org.apache.hc.client5.http.conn.HttpClientConnectionManager)} method.
+     *HttpClientConnectionManager)} method.
      * </p>
      *
      * @since 4.4
@@ -605,7 +604,7 @@ public class HttpClientBuilder {
      * Assigns default proxy value.
      * <p>
      * Please note this value can be overridden by the {@link #setRoutePlanner(
-     *   org.apache.hc.client5.http.conn.routing.HttpRoutePlanner)} method.
+     *   org.apache.hc.client5.http.routing.HttpRoutePlanner)} method.
      */
     public final HttpClientBuilder setProxy(final HttpHost proxy) {
         this.proxy = proxy;
@@ -702,7 +701,7 @@ public class HttpClientBuilder {
      * be used for request execution if not explicitly set in the client execution
      * context.
      *
-     * @see org.apache.hc.client5.http.impl.client.CookieSpecRegistries
+     * @see CookieSpecRegistries
      *
      */
     public final HttpClientBuilder setDefaultCookieSpecRegistry(
@@ -713,7 +712,7 @@ public class HttpClientBuilder {
 
 
     /**
-     * Assigns a map of {@link org.apache.hc.client5.http.client.entity.InputStreamFactory}s
+     * Assigns a map of {@link org.apache.hc.client5.http.entity.InputStreamFactory}s
      * to be used for automatic content decompression.
      */
     public final HttpClientBuilder setContentDecoderRegistry(
@@ -755,7 +754,7 @@ public class HttpClientBuilder {
      * inside an EJB container.
      *
      * @see #setConnectionManagerShared(boolean)
-     * @see org.apache.hc.client5.http.conn.HttpClientConnectionManager#closeExpiredConnections()
+     * @see HttpClientConnectionManager#closeExpiredConnections()
      *
      * @since 4.4
      */
@@ -778,7 +777,7 @@ public class HttpClientBuilder {
      * inside an EJB container.
      *
      * @see #setConnectionManagerShared(boolean)
-     * @see org.apache.hc.client5.http.conn.HttpClientConnectionManager#closeExpiredConnections()
+     * @see HttpClientConnectionManager#closeExpiredConnections()
      *
      * @param maxIdleTime maximum time persistent connections can stay idle while kept alive
      * in the connection pool. Connections whose inactivity period exceeds this value will

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpClients.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpClients.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpClients.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java Sat Jan 16 12:58:34 2016
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * Factory methods for {@link CloseableHttpClient} instances.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpRequestFutureTask.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpRequestFutureTask.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpRequestFutureTask.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.concurrent.FutureTask;
 
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
 
 /**
  * FutureTask implementation that wraps a HttpAsyncClientCallable and exposes various task

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpRequestTaskCallable.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpRequestTaskCallable.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/HttpRequestTaskCallable.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java Sat Jan 16 12:58:34 2016
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.sync.HttpClient;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
 
 class HttpRequestTaskCallable<V> implements Callable<V> {
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java Sat Jan 16 12:58:34 2016
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Locale;
 
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.StatusLine;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
 
 /**
  * A proxy class for {@link org.apache.hc.core5.http.HttpResponse} that can be used to release client connection

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/IdleConnectionEvictor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/IdleConnectionEvictor.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/IdleConnectionEvictor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java Sat Jan 16 12:58:34 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
 
 /**
  * This class maintains a background thread to enforce an eviction policy for expired / idle

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/InternalHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/InternalHttpClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/InternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -33,6 +33,20 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.Configurable;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.routing.HttpRoutePlanner;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -41,21 +55,6 @@ import org.apache.hc.core5.http.config.L
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.Configurable;
-import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
-import org.apache.hc.client5.http.cookie.CookieSpecProvider;
-import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 
 /**
  * Internal class.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -34,6 +34,25 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.RouteTracker;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.ChallengeType;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.auth.HttpAuthenticator;
+import org.apache.hc.client5.http.impl.io.ConnectionShutdownException;
+import org.apache.hc.client5.http.impl.routing.BasicRouteDirector;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.AuthenticationStrategy;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.NonRepeatableRequestException;
+import org.apache.hc.client5.http.protocol.UserTokenHandler;
+import org.apache.hc.client5.http.routing.HttpRouteDirector;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.HttpEntity;
@@ -52,25 +71,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.ChallengeType;
-import org.apache.hc.client5.http.client.AuthenticationStrategy;
-import org.apache.hc.client5.http.client.NonRepeatableRequestException;
-import org.apache.hc.client5.http.client.UserTokenHandler;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.BasicRouteDirector;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.HttpRouteDirector;
-import org.apache.hc.client5.http.conn.routing.RouteTracker;
-import org.apache.hc.client5.http.impl.auth.HttpAuthenticator;
-import org.apache.hc.client5.http.impl.conn.ConnectionShutdownException;
 
 /**
  * The last request executor in the HTTP request execution chain

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -36,6 +36,19 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.io.ConnectionShutdownException;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.RequestClientConnControl;
+import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.HttpEntity;
@@ -54,19 +67,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.VersionInfo;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.client.protocol.RequestClientConnControl;
-import org.apache.hc.client5.http.client.utils.URIUtils;
-import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.impl.conn.ConnectionShutdownException;
 
 /**
  * Request executor that implements the most fundamental aspects of



Mime
View raw message