hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [8/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/sync/MinimalHttpClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/MinimalHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/MinimalHttpClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/MinimalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java Sat Jan 16 12:58:34 2016
@@ -25,10 +25,20 @@
  *
  */
 
-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.HttpRoute;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy;
+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.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -38,16 +48,6 @@ import org.apache.hc.core5.http.impl.io.
 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.client.ClientProtocolException;
-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.impl.execchain.MinimalClientExec;
 
 /**
  * Internal class.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/NoopUserTokenHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/NoopUserTokenHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/NoopUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.protocol.UserTokenHandler;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.UserTokenHandler;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * Noop implementation of {@link UserTokenHandler} that always returns {@code null}.

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.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.net.URI;
@@ -33,6 +33,17 @@ import java.net.URISyntaxException;
 
 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.AuthScope;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.auth.CredentialsStore;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+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.utils.URIUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -41,17 +52,6 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.CredentialsStore;
-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.utils.URIUtils;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * Request executor in the request execution chain that is responsible

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/ProxyClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/ProxyClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/ProxyClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java Sat Jan 16 12:58:34 2016
@@ -25,11 +25,35 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.net.Socket;
 
+import org.apache.hc.client5.http.HttpConnectionFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.RouteInfo.LayerType;
+import org.apache.hc.client5.http.RouteInfo.TunnelType;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.ChallengeType;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.config.RequestConfig;
+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.HttpAuthenticator;
+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.io.ManagedHttpClientConnectionFactory;
+import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.protocol.AuthenticationStrategy;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.RequestClientConnControl;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -54,30 +78,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.ChallengeType;
-import org.apache.hc.client5.http.auth.Credentials;
-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.client.protocol.RequestClientConnControl;
-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;
-import org.apache.hc.client5.http.conn.routing.RouteInfo.LayerType;
-import org.apache.hc.client5.http.conn.routing.RouteInfo.TunnelType;
-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.HttpAuthenticator;
-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.ManagedHttpClientConnectionFactory;
-import org.apache.hc.client5.http.impl.conn.SystemDefaultDnsResolver;
-import org.apache.hc.client5.http.impl.execchain.TunnelRefusedException;
 
 /**
  * ProxyClient can be used to establish a tunnel via an HTTP proxy.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.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.net.URI;
@@ -33,6 +33,18 @@ 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.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.config.RequestConfig;
+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.protocol.RedirectException;
+import org.apache.hc.client5.http.protocol.RedirectStrategy;
+import org.apache.hc.client5.http.routing.HttpRoutePlanner;
+import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -40,18 +52,6 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.client.RedirectException;
-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.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.client.utils.URIUtils;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
 
 /**
  * Request executor in the request execution chain that is responsible

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.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.InterruptedIOException;
 

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.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.io.InputStream;
 import java.io.OutputStream;
 import java.net.SocketException;
 
+import org.apache.hc.client5.http.io.EofSensorInputStream;
+import org.apache.hc.client5.http.io.EofSensorWatcher;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.HttpEntityWrapper;
-import org.apache.hc.client5.http.conn.EofSensorInputStream;
-import org.apache.hc.client5.http.conn.EofSensorWatcher;
 
 /**
  * A wrapper class for {@link HttpEntity} enclosed in a response message.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java Sat Jan 16 12:58:34 2016
@@ -25,24 +25,24 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 
 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.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.protocol.NonRepeatableRequestException;
+import org.apache.hc.client5.http.sync.HttpRequestRetryHandler;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.NoHttpResponseException;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.HttpRequestRetryHandler;
-import org.apache.hc.client5.http.client.NonRepeatableRequestException;
-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;
 
 /**
  * Request executor in the request execution chain that is responsible

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java Sat Jan 16 12:58:34 2016
@@ -25,23 +25,23 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.execchain;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 
 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.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.ServiceUnavailableRetryStrategy;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.ServiceUnavailableRetryStrategy;
-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;
 
 /**
  * Request executor in the request execution chain that is responsible

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/SystemClock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/SystemClock.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/SystemClock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.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;
 
 /**
  * The actual system clock.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.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 org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/package-info.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java Sat Jan 16 12:58:34 2016
@@ -49,4 +49,4 @@
  * }
  * </pre>
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/ConnectionRequest.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/ConnectionRequest.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/ConnectionRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java Sat Jan 16 12:58:34 2016
@@ -25,11 +25,12 @@
  *
  */
 
-package org.apache.hc.client5.http.conn;
+package org.apache.hc.client5.http.io;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.ConnectionPoolTimeoutException;
 import org.apache.hc.core5.concurrent.Cancellable;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 

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

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/HttpClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/HttpClientConnectionManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/HttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java Sat Jan 16 12:58:34 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.conn;
+package org.apache.hc.client5.http.io;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.HttpRoute;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * Represents a manager of persistent client connections.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/HttpClientConnectionOperator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/HttpClientConnectionOperator.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/HttpClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.conn;
+package org.apache.hc.client5.http.io;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -36,10 +36,10 @@ import org.apache.hc.core5.http.protocol
 
 /**
  * Connection operator that performs connection connect and upgrade operations. Usually, components
- * participating in these operations are registry of {@link org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory},
- * {@link SchemePortResolver} and {@link DnsResolver}. In general, HTTP client user should not
- * provide implementations of this interface, as HttpClient will use the default one that covers
- * most of the cases needed for majority of users.
+ * participating in these operations are registry of {@link org.apache.hc.client5.http.socket.ConnectionSocketFactory},
+ * {@link org.apache.hc.client5.http.SchemePortResolver} and {@link org.apache.hc.client5.http.DnsResolver}.
+ * In general, HTTP client user should not provide implementations of this interface, as HttpClient will use the
+ * default one that covers most of the cases needed for majority of users.
  *
  * @since 4.4
  */

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

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.io.Closeable;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/Configurable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/Configurable.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/Configurable.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/Configurable.java Sat Jan 16 12:58:34 2016
@@ -25,9 +25,9 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
-import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.config.RequestConfig;
 
 /**
  * Configuration interface for HTTP requests.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import org.apache.hc.core5.concurrent.Cancellable;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 import java.util.HashSet;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java Sat Jan 16 12:58:34 2016
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.RequestLine;
 import org.apache.hc.core5.http.message.BasicRequestLine;
-import org.apache.hc.client5.http.client.config.RequestConfig;
 
 /**
  * Base implementation of {@link HttpUriRequest}.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.net.URI;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;
 
 import java.io.IOException;
 import java.net.URI;
@@ -37,6 +37,10 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.utils.URIBuilder;
+import org.apache.hc.client5.http.utils.URLEncodedUtils;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
@@ -49,10 +53,6 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.http.message.HeaderGroup;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.entity.UrlEncodedFormEntity;
-import org.apache.hc.client5.http.client.utils.URIBuilder;
-import org.apache.hc.client5.http.client.utils.URLEncodedUtils;
 
 /**
  * Builder for {@link HttpUriRequest} instances.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/methods/package-info.java Sat Jan 16 12:58:34 2016
@@ -28,4 +28,4 @@
 /**
  * Standard HTTP method implementations.
  */
-package org.apache.hc.client5.http.client.methods;
+package org.apache.hc.client5.http.methods;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/AuthenticationStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/AuthenticationStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/AuthenticationStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java Sat Jan 16 12:58:34 2016
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.hc.client5.http.client;
+package org.apache.hc.client5.http.protocol;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.ChallengeType;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * Strategy to select auth schemes in order of preference based on auth challenges

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

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

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java Sat Jan 16 12:58:34 2016
@@ -25,31 +25,31 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.config.Lookup;
-import org.apache.hc.core5.http.protocol.BasicHttpContext;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.RouteInfo;
+import org.apache.hc.client5.http.auth.AuthCache;
 import org.apache.hc.client5.http.auth.AuthExchange;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
 import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.client.AuthCache;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.RouteInfo;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.cookie.CookieOrigin;
 import org.apache.hc.client5.http.cookie.CookieSpec;
 import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.config.Lookup;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
 
 /**
  * Adaptor class that provides convenience type safe setters and getters
@@ -62,7 +62,7 @@ import org.apache.hc.client5.http.cookie
 public class HttpClientContext extends HttpCoreContext {
 
     /**
-     * Attribute name of a {@link org.apache.hc.client5.http.conn.routing.RouteInfo}
+     * Attribute name of a {@link RouteInfo}
      * object that represents the actual connection route.
      */
     public static final String HTTP_ROUTE   = "http.route";
@@ -92,7 +92,7 @@ public class HttpClientContext extends H
     public static final String COOKIE_ORIGIN         = "http.cookie-origin";
 
     /**
-     * Attribute name of a {@link org.apache.hc.client5.http.client.CookieStore}
+     * Attribute name of a {@link CookieStore}
      * object that represents the actual cookie store.
      */
     public static final String COOKIE_STORE          = "http.cookie-store";
@@ -104,7 +104,7 @@ public class HttpClientContext extends H
     public static final String CREDS_PROVIDER        = "http.auth.credentials-provider";
 
     /**
-     * Attribute name of a {@link org.apache.hc.client5.http.client.AuthCache} object
+     * Attribute name of a {@link AuthCache} object
      * that represents the auth scheme cache.
      */
     public static final String AUTH_CACHE            = "http.auth.auth-cache";
@@ -128,7 +128,7 @@ public class HttpClientContext extends H
     public static final String AUTHSCHEME_REGISTRY   = "http.authscheme-registry";
 
     /**
-     * Attribute name of a {@link org.apache.hc.client5.http.client.config.RequestConfig} object that
+     * Attribute name of a {@link org.apache.hc.client5.http.config.RequestConfig} object that
      * represents the actual request configuration.
      */
     public static final String REQUEST_CONFIG = "http.request-config";

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

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

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/RedirectLocations.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/RedirectLocations.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/RedirectLocations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.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.protocol;
 
 import java.net.URI;
 import java.util.AbstractList;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/RedirectStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/RedirectStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/RedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java Sat Jan 16 12:58:34 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.client5.http.client;
+package org.apache.hc.client5.http.protocol;
 
+import org.apache.hc.client5.http.methods.HttpUriRequest;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
 
 /**
  * A strategy for determining if an HTTP request should be redirected to

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java Sat Jan 16 12:58:34 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpRequestInterceptor;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.config.RequestConfig;
 
 /**
  * Class responsible for handling Content Encoding requests in HTTP.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 import java.net.URI;
@@ -36,6 +36,15 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.RouteInfo;
+import org.apache.hc.client5.http.config.CookieSpecs;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
@@ -46,15 +55,6 @@ import org.apache.hc.core5.http.config.L
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.TextUtils;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.config.CookieSpecs;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.conn.routing.RouteInfo;
-import org.apache.hc.client5.http.cookie.Cookie;
-import org.apache.hc.client5.http.cookie.CookieOrigin;
-import org.apache.hc.client5.http.cookie.CookieSpec;
-import org.apache.hc.client5.http.cookie.CookieSpecProvider;
 
 /**
  * Request interceptor that matches cookies available in the current

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java Sat Jan 16 12:58:34 2016
@@ -25,12 +25,17 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.RouteInfo;
+import org.apache.hc.client5.http.auth.AuthCache;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -38,11 +43,6 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpRequestInterceptor;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.client.AuthCache;
-import org.apache.hc.client5.http.conn.routing.RouteInfo;
 
 /**
  * Request interceptor that can preemptively authenticate against known hosts,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java Sat Jan 16 12:58:34 2016
@@ -25,12 +25,13 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.RouteInfo;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpException;
@@ -39,7 +40,6 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpRequestInterceptor;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.conn.routing.RouteInfo;
 
 /**
  * This protocol interceptor is responsible for adding {@code Connection}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 import java.util.Collection;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java Sat Jan 16 12:58:34 2016
@@ -25,10 +25,11 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpEntity;
@@ -40,7 +41,6 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.config.RequestConfig;
 
 /**
  * RequestExpectContinue is responsible for enabling the 'expect-continue'

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Locale;
 import java.util.zip.GZIPInputStream;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.entity.DecompressingEntity;
+import org.apache.hc.client5.http.entity.DeflateInputStream;
+import org.apache.hc.client5.http.entity.InputStreamFactory;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpEntity;
@@ -42,10 +46,6 @@ import org.apache.hc.core5.http.config.R
 import org.apache.hc.core5.http.message.BasicHeaderValueParser;
 import org.apache.hc.core5.http.message.ParserCursor;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.entity.DecompressingEntity;
-import org.apache.hc.client5.http.client.entity.DeflateInputStream;
-import org.apache.hc.client5.http.client.entity.InputStreamFactory;
 
 /**
  * {@link HttpResponseInterceptor} responsible for processing Content-Encoding

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -33,6 +33,11 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
@@ -40,11 +45,6 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpResponseInterceptor;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.cookie.Cookie;
-import org.apache.hc.client5.http.cookie.CookieOrigin;
-import org.apache.hc.client5.http.cookie.CookieSpec;
-import org.apache.hc.client5.http.cookie.MalformedCookieException;
 
 /**
  * Response interceptor that populates the current {@link CookieStore} with data

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/UserTokenHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/UserTokenHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/UserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java Sat Jan 16 12:58:34 2016
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.hc.client5.http.client;
+package org.apache.hc.client5.http.protocol;
 
+import org.apache.hc.client5.http.HttpRoute;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * A handler for determining if the given execution context is user specific

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/protocol/package-info.java Sat Jan 16 12:58:34 2016
@@ -28,4 +28,4 @@
 /**
  * Client specific HTTP protocol handlers.
  */
-package org.apache.hc.client5.http.client.protocol;
+package org.apache.hc.client5.http.protocol;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/DomainType.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/DomainType.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/DomainType.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/DomainType.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/DomainType.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/DomainType.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/DomainType.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.conn.util;
+package org.apache.hc.client5.http.psl;
 
 /**
  * Domain types differentiated by Mozilla Public Suffix List.

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




Mime
View raw message