hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [5/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
Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java Sat Jan 16 12:58:34 2016
@@ -26,7 +26,7 @@
  */
 package org.apache.hc.client5.http.osgi.services;
 
-import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
 
 /**
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java Sat Jan 16 12:58:34 2016
@@ -38,12 +38,12 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.hc.client5.http.client.methods.HttpPost;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
 import org.apache.hc.client5.http.entity.mime.content.ByteArrayBody;
 import org.apache.hc.client5.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.entity.ContentType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -36,8 +36,8 @@ import java.net.InetAddress;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
+import org.apache.hc.core5.http.HttpHost;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java Sat Jan 16 12:58:34 2016
@@ -27,11 +27,11 @@
 
 package org.apache.hc.client5.http.examples.client.win;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.win.WinHttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.WinHttpClients;
 
 /**
  * This example demonstrates how to create HttpClient pre-configured

Copied: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java?p2=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java&p1=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java Sat Jan 16 12:58:34 2016
@@ -24,23 +24,23 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.win;
 
 import java.util.Locale;
 
-import org.apache.hc.core5.http.config.Registry;
-import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.config.AuthSchemes;
 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.win.WindowsNTLMSchemeFactory;
-import org.apache.hc.client5.http.impl.auth.win.WindowsNegotiateSchemeFactory;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
 
 import com.sun.jna.platform.win32.Sspi;
 
 /**
- * Factory methods for {@link CloseableHttpClient} instances configured to use integrated
+ * Factory methods for {@link org.apache.hc.client5.http.impl.sync.CloseableHttpClient} instances configured to use integrated
  * Windows authentication by default.
  *
  * @since 4.4

Copied: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java?p2=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java&p1=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.win;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Copied: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java?p2=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java&p1=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java Sat Jan 16 12:58:34 2016
@@ -24,27 +24,27 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.win;
 
 import java.security.Principal;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hc.core5.annotation.NotThreadSafe;
-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.RouteInfo;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthenticationException;
 import org.apache.hc.client5.http.auth.BasicUserPrincipal;
 import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.auth.MalformedChallengeException;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.routing.RouteInfo;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+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 com.sun.jna.platform.win32.Secur32;
 import com.sun.jna.platform.win32.Secur32Util;

Copied: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java?p2=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java&p1=httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.win;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

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

Copied: httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java?p2=httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java&p1=httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java Sat Jan 16 12:58:34 2016
@@ -24,10 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.win;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
@@ -39,15 +47,6 @@ import org.apache.hc.core5.http.config.R
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.client.WinHttpClients;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java Sat Jan 16 12:58:34 2016
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 
 /**
  * This example demonstrates how to abort an HTTP method before its normal completion.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java Sat Jan 16 12:58:34 2016
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
-import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.core5.http.entity.EntityUtils;
 
 /**
  * A simple example that uses HttpClient to execute an HTTP request against

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java Sat Jan 16 12:58:34 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.File;
 import java.io.FileInputStream;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpPost;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpPost;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * Example how to use unbuffered chunk-encoded POST request.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -35,6 +35,30 @@ import java.util.Arrays;
 
 import javax.net.ssl.SSLContext;
 
+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.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.config.CookieSpecs;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.io.DefaultHttpResponseParserFactory;
+import org.apache.hc.client5.http.impl.io.LenientHttpResponseParser;
+import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+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.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
@@ -57,30 +81,6 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.message.LineParser;
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.apache.hc.core5.util.CharArrayBuffer;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-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.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.DnsResolver;
-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.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.client5.http.impl.client.BasicCookieStore;
-import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
-import org.apache.hc.client5.http.impl.conn.DefaultHttpResponseParserFactory;
-import org.apache.hc.client5.http.impl.conn.LenientHttpResponseParser;
-import org.apache.hc.client5.http.impl.conn.ManagedHttpClientConnectionFactory;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.impl.conn.SystemDefaultDnsResolver;
 
 /**
  * This example demonstrates how to customize and configure the most common aspects

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java Sat Jan 16 12:58:34 2016
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates the recommended way of using API to make sure

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java Sat Jan 16 12:58:34 2016
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.util.List;
 
-import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
 import org.apache.hc.client5.http.cookie.Cookie;
-import org.apache.hc.client5.http.impl.client.BasicCookieStore;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.http.entity.EntityUtils;
 
 /**
  * This example demonstrates the use of a local HTTP context populated with

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java Sat Jan 16 12:58:34 2016
@@ -24,24 +24,24 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.net.URL;
 
+import org.apache.hc.client5.http.config.CookieSpecs;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.impl.cookie.RFC6265CookieSpecProvider;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader;
+import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.config.Lookup;
 import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.config.CookieSpecs;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.conn.ssl.DefaultHostnameVerifier;
-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.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
-import org.apache.hc.client5.http.impl.cookie.RFC6265CookieSpecProvider;
 
 /**
  * This example demonstrates how to use a custom public suffix list.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.File;
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.TrustSelfSignedStrategy;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates how to create secure connections with a custom SSL

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java Sat Jan 16 12:58:34 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.pool.PoolStats;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * Example demonstrating how to evict expired and idle connections

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java Sat Jan 16 12:58:34 2016
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.entity.EntityUtils;
-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.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * How to send a request via proxy.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -33,19 +33,19 @@ import java.net.Proxy;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 
+import org.apache.hc.client5.http.ConnectTimeoutException;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.Registry;
 import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectTimeoutException;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * How to send a request via SOCKS proxy.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.net.URI;
 import java.util.List;
 
+import org.apache.hc.client5.http.cookie.BasicCookieStore;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+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.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-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.cookie.Cookie;
-import org.apache.hc.client5.http.impl.client.BasicCookieStore;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * A example that demonstrates how HttpClient APIs can be used to perform

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientMultiThreadedExecution.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientMultiThreadedExecution.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientMultiThreadedExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java Sat Jan 16 12:58:34 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * An example that performs GETs from multiple threads.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientPreemptiveBasicAuthentication.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientPreemptiveBasicAuthentication.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientPreemptiveBasicAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java Sat Jan 16 12:58:34 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
 import org.apache.hc.client5.http.impl.auth.BasicScheme;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.entity.EntityUtils;
 
 /**
  * An example of HttpClient can be customized to authenticate

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientPreemptiveDigestAuthentication.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientPreemptiveDigestAuthentication.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientPreemptiveDigestAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java Sat Jan 16 12:58:34 2016
@@ -24,19 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.client5.http.auth.AuthCache;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.AuthCache;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.impl.auth.BasicAuthCache;
 import org.apache.hc.client5.http.impl.auth.DigestScheme;
-import org.apache.hc.client5.http.impl.client.BasicAuthCache;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.entity.EntityUtils;
 
 /**
  * An example of HttpClient can be customized to authenticate

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientProxyAuthentication.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientProxyAuthentication.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientProxyAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java Sat Jan 16 12:58:34 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-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.HttpGet;
-import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.entity.EntityUtils;
 
 /**
  * A simple example that uses HttpClient to execute an HTTP request

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientWithRequestFuture.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientWithRequestFuture.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientWithRequestFuture.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.IOException;
 import java.util.concurrent.CancellationException;
@@ -32,22 +32,22 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.FutureRequestExecutionService;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.sync.HttpRequestFutureTask;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.impl.client.FutureRequestExecutionService;
-import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.client.HttpRequestFutureTask;
 
 public class ClientWithRequestFuture {
 
     public static void main(String[] args) throws Exception {
         // the simplest way to create a HttpAsyncClientWithFuture
-        HttpClient httpclient = HttpClientBuilder.create()
+        CloseableHttpClient httpclient = HttpClientBuilder.create()
                 .setMaxConnPerRoute(5)
                 .setMaxConnTotal(5).build();
         ExecutorService execService = Executors.newFixedThreadPool(5);

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientWithResponseHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientWithResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientWithResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java Sat Jan 16 12:58:34 2016
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates the use of the {@link ResponseHandler} to simplify

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ProxyTunnelDemo.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ProxyTunnelDemo.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ProxyTunnelDemo.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -34,9 +34,9 @@ import java.io.Writer;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.impl.client.ProxyClient;
+import org.apache.hc.client5.http.impl.sync.ProxyClient;
+import org.apache.hc.core5.http.HttpHost;
 
 /**
  * Example code for using {@link ProxyClient} in order to establish a tunnel through an HTTP proxy.

Copied: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/QuickStart.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/QuickStart.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/QuickStart.java?p2=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/QuickStart.java&p1=httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/QuickStart.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/QuickStart.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/QuickStart.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client;
+package org.apache.hc.client5.http.examples;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpPost;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
-import org.apache.hc.client5.http.client.entity.UrlEncodedFormEntity;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpPost;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClients;
 
 public class QuickStart {
 

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

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

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

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

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

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

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

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

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

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import org.apache.hc.client5.http.conn.DnsResolver;
-
 /**
  * DNS resolver that uses the default OS implementation for resolving host names.
  *

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/AuthCache.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/AuthCache.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/AuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java Sat Jan 16 12:58:34 2016
@@ -24,10 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client;
+package org.apache.hc.client5.http.auth;
 
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.auth.AuthScheme;
 
 /**
  * Abstract {@link AuthScheme} cache. Initialized {@link AuthScheme} objects

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/CredentialsStore.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/CredentialsStore.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/CredentialsStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client;
-
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
+package org.apache.hc.client5.http.auth;
 
 /**
  * Abstract store of authentication credentials.

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

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

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

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicCookieStore.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicCookieStore.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicCookieStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.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.cookie;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -35,9 +35,6 @@ import java.util.TreeSet;
 
 import org.apache.hc.core5.annotation.GuardedBy;
 import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.cookie.Cookie;
-import org.apache.hc.client5.http.cookie.CookieIdentityComparator;
 
 /**
  * Default implementation of {@link CookieStore}

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/CookieStore.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/CookieStore.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/CookieStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client;
+package org.apache.hc.client5.http.cookie;
 
 import java.util.Date;
 import java.util.List;
 
-import org.apache.hc.client5.http.cookie.Cookie;
-
 /**
  * This interface represents an abstract store for {@link Cookie}
  * objects.




Mime
View raw message