hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [10/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/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -37,6 +37,14 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.hc.client5.http.ConnectionPoolTimeoutException;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
@@ -56,14 +64,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestConnControl;
 import org.apache.hc.core5.http.protocol.RequestContent;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
-import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java Sat Jan 16 12:58:34 2016
@@ -25,11 +25,15 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 import java.net.URI;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.localserver.RandomHandler;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpException;
@@ -45,10 +49,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.ResponseContent;
 import org.apache.hc.core5.http.protocol.ResponseDate;
 import org.apache.hc.core5.http.protocol.ResponseServer;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
-import org.apache.hc.client5.http.localserver.RandomHandler;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -232,14 +232,14 @@ public class TestConnectionReuse extends
 
         private final URI requestURI;
         private final HttpHost target;
-        private final HttpClient httpclient;
+        private final CloseableHttpClient httpclient;
         private final int repetitions;
         private final boolean forceClose;
 
         private volatile Exception exception;
 
         public WorkerThread(
-                final HttpClient httpclient,
+                final CloseableHttpClient httpclient,
                 final HttpHost target,
                 final URI requestURI,
                 final int repetitions,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -40,6 +40,10 @@ import java.util.concurrent.Executors;
 import java.util.zip.Deflater;
 import java.util.zip.GZIPOutputStream;
 
+import org.apache.hc.client5.http.impl.BasicResponseHandler;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpException;
@@ -52,10 +56,6 @@ import org.apache.hc.core5.http.entity.I
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.BasicResponseHandler;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -394,7 +394,7 @@ public class TestContentCodings extends
      */
     class WorkerTask implements Runnable {
 
-        private final HttpClient client;
+        private final CloseableHttpClient client;
         private final HttpHost target;
         private final HttpGet request;
         private final CountDownLatch startGate;
@@ -403,7 +403,7 @@ public class TestContentCodings extends
         private boolean failed = false;
         private String text;
 
-        WorkerTask(final HttpClient client, final HttpHost target, final boolean identity, final CountDownLatch startGate, final CountDownLatch endGate) {
+        WorkerTask(final CloseableHttpClient client, final HttpHost target, final boolean identity, final CountDownLatch startGate, final CountDownLatch endGate) {
             this.client = client;
             this.target = target;
             this.request = new HttpGet("/some-resource");

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 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.cookie.CookieStore;
+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.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -40,13 +47,6 @@ import org.apache.hc.core5.http.entity.E
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.protocol.HttpContext;
-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.Cookie;
-import org.apache.hc.client5.http.impl.client.BasicCookieStore;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java Sat Jan 16 12:58:34 2016
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.IdleConnectionEvictor;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.impl.client.IdleConnectionEvictor;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Test;
 
 public class TestIdleConnectionEviction extends LocalServerTestBase {
@@ -73,7 +73,7 @@ public class TestIdleConnectionEviction
 
     static class WorkerThread extends Thread {
 
-        private final HttpClient httpclient;
+        private final CloseableHttpClient httpclient;
         private final HttpHost target;
         private final HttpUriRequest request;
         private final int count;
@@ -81,7 +81,7 @@ public class TestIdleConnectionEviction
         private volatile Exception ex;
 
         public WorkerThread(
-                final HttpClient httpclient,
+                final CloseableHttpClient httpclient,
                 final HttpHost target,
                 final HttpUriRequest request,
                 final int count) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 import java.net.Socket;
 
+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.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -40,9 +43,6 @@ import org.apache.hc.core5.http.impl.io.
 import org.apache.hc.core5.http.io.HttpConnectionFactory;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 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.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -41,10 +45,6 @@ import org.apache.hc.core5.http.entity.E
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-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.HttpClients;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -32,6 +32,18 @@ import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
 
+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.cookie.BasicClientCookie;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.client5.http.protocol.CircularRedirectException;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.RedirectException;
+import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpConnection;
 import org.apache.hc.core5.http.HttpException;
@@ -48,18 +60,6 @@ import org.apache.hc.core5.http.io.UriHt
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.client5.http.client.CircularRedirectException;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.RedirectException;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpPost;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.client.utils.URIUtils;
-import org.apache.hc.client5.http.impl.client.BasicCookieStore;
-import org.apache.hc.client5.http.impl.cookie.BasicClientCookie;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 import java.security.Principal;
 
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.impl.auth.SPNegoScheme;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.sync.HttpClients;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -41,16 +51,6 @@ import org.apache.hc.core5.http.entity.S
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.message.BasicHeader;
 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.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.auth.SPNegoScheme;
-import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.client.HttpClients;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSManager;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java Sat Jan 16 12:58:34 2016
@@ -24,10 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.integration;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.UserTokenHandler;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -39,12 +45,6 @@ import org.apache.hc.core5.http.io.HttpC
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.UserTokenHandler;
-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.routing.HttpRoute;
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -136,7 +136,7 @@ public class TestStatefulConnManagement
         private final HttpClientContext context;
         private final int requestCount;
         private final HttpHost target;
-        private final HttpClient httpclient;
+        private final CloseableHttpClient httpclient;
 
         private volatile Exception exception;
         private volatile int count;
@@ -146,7 +146,7 @@ public class TestStatefulConnManagement
                 final HttpClientContext context,
                 final int requestCount,
                 final HttpHost target,
-                final HttpClient httpclient) {
+                final CloseableHttpClient httpclient) {
             super();
             this.uid = uid;
             this.context = context;

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestBasicHttpClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestBasicHttpClientConnectionManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestBasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java Sat Jan 16 12:58:34 2016
@@ -25,28 +25,28 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.HttpConnectionFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.config.Lookup;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-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.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestHttpClientConnectionOperator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestHttpClientConnectionOperator.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestHttpClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.net.ConnectException;
 import java.net.InetAddress;
@@ -33,19 +33,19 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 
+import org.apache.hc.client5.http.ConnectTimeoutException;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.HttpHostConnectException;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.UnsupportedSchemeException;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.Lookup;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.ConnectTimeoutException;
-import org.apache.hc.client5.http.conn.DnsResolver;
-import org.apache.hc.client5.http.conn.HttpHostConnectException;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.UnsupportedSchemeException;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestPoolingHttpClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestPoolingHttpClientConnectionManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestPoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -35,21 +35,21 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.ConnectionPoolTimeoutException;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.config.Lookup;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.DnsResolver;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAuthenticationStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAuthenticationStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAuthenticationStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.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.protocol;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,22 +32,23 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.hc.core5.http.config.Registry;
-import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.ChallengeType;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.auth.BasicScheme;
 import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory;
 import org.apache.hc.client5.http.impl.auth.DigestScheme;
 import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultRedirectStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultRedirectStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultRedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.protocol;
 
 import java.net.URI;
 import java.util.List;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpHead;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.client5.http.methods.HttpTrace;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -42,13 +49,6 @@ import org.apache.hc.core5.http.message.
 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.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpHead;
-import org.apache.hc.client5.http.client.methods.HttpPost;
-import org.apache.hc.client5.http.client.methods.HttpTrace;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestDefaultProxyRoutePlanner.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestDefaultProxyRoutePlanner.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestDefaultProxyRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.routing;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestDefaultRoutePlanner.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestDefaultRoutePlanner.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestDefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -25,8 +25,12 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.routing;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpVersion;
@@ -34,10 +38,6 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/routing/TestRouteDirector.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/routing/TestRouteDirector.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/routing/TestRouteDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java Sat Jan 16 12:58:34 2016
@@ -25,13 +25,15 @@
  *
  */
 
-package org.apache.hc.client5.http.conn.routing;
+package org.apache.hc.client5.http.impl.routing;
 
 import java.net.InetAddress;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.RouteInfo.LayerType;
+import org.apache.hc.client5.http.RouteInfo.TunnelType;
+import org.apache.hc.client5.http.routing.HttpRouteDirector;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.conn.routing.RouteInfo.LayerType;
-import org.apache.hc.client5.http.conn.routing.RouteInfo.TunnelType;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/routing/TestRouteTracker.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/routing/TestRouteTracker.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/routing/TestRouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java Sat Jan 16 12:58:34 2016
@@ -25,15 +25,18 @@
  *
  */
 
-package org.apache.hc.client5.http.conn.routing;
+package org.apache.hc.client5.http.impl.routing;
 
 import java.net.InetAddress;
 import java.util.HashSet;
 import java.util.Set;
 
+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.RouteTracker;
+import org.apache.hc.client5.http.routing.HttpRouteDirector;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.conn.routing.RouteInfo.LayerType;
-import org.apache.hc.client5.http.conn.routing.RouteInfo.TunnelType;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -127,7 +130,7 @@ public class TestRouteTracker {
     @Test
     public void testCstrRoute() {
 
-        HttpRoute    r  = new HttpRoute(TARGET1);
+        HttpRoute r  = new HttpRoute(TARGET1);
         RouteTracker rt = new RouteTracker(r);
         Assert.assertEquals("wrong target (r1)",
                      TARGET1, rt.getTargetHost());

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestSystemDefaultRoutePlanner.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestSystemDefaultRoutePlanner.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/conn/TestSystemDefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.routing;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -35,14 +35,14 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/MockClock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/MockClock.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/MockClock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.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;
 
 public class MockClock implements Clock {
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/MockConnPoolControl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/MockConnPoolControl.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/MockConnPoolControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java Sat Jan 16 12:58:34 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.hc.client5.http.HttpRoute;
 import org.apache.hc.core5.pool.ConnPoolControl;
 import org.apache.hc.core5.pool.PoolStats;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 public final class MockConnPoolControl implements ConnPoolControl<HttpRoute> {
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAIMDBackoffManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAIMDBackoffManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAIMDBackoffManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java Sat Jan 16 12:58:34 2016
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Random;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.sync.BackoffManager;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.client.BackoffManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestCloseableHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestCloseableHttpClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestCloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java Sat Jan 16 12:58:34 2016
@@ -24,20 +24,20 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+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.HttpHost;
 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.ClientProtocolException;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestConnectionHolder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestConnectionHolder.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestConnectionHolder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java Sat Jan 16 12:58:34 2016
@@ -24,14 +24,14 @@
  * <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.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.http.io.HttpClientConnection;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultBackoffStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultBackoffStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultBackoffStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -32,12 +32,12 @@ import static org.junit.Assert.assertTru
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 
+import org.apache.hc.client5.http.ConnectionPoolTimeoutException;
+import org.apache.hc.client5.http.sync.ConnectionBackoffStrategy;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.client5.http.client.ConnectionBackoffStrategy;
-import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultHttpRequestRetryHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultHttpRequestRetryHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java Sat Jan 16 12:58:34 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
 
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpUriRequest;
-import org.apache.hc.client5.http.conn.ConnectTimeoutException;
+import org.apache.hc.client5.http.ConnectTimeoutException;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultServiceUnavailableRetryStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultServiceUnavailableRetryStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultServiceUnavailableRetryStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.Date;
 
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestFutureRequestExecutionService.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestFutureRequestExecutionService.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestFutureRequestExecutionService.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -39,6 +39,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+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.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
@@ -47,10 +50,6 @@ import org.apache.hc.core5.http.bootstra
 import org.apache.hc.core5.http.bootstrap.io.ServerBootstrap;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.HttpClient;
-import org.apache.hc.client5.http.client.ResponseHandler;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -87,7 +86,7 @@ public class TestFutureRequestExecutionS
 
             this.localServer.start();
             uri = "http://localhost:" + this.localServer.getLocalPort() + "/wait";
-            final HttpClient httpClient = HttpClientBuilder.create()
+            final CloseableHttpClient httpClient = HttpClientBuilder.create()
                     .setMaxConnPerRoute(5)
                     .build();
             final ExecutorService executorService = Executors.newFixedThreadPool(5);

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestIdleConnectionEvictor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestIdleConnectionEvictor.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestIdleConnectionEvictor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java Sat Jan 16 12:58:34 2016
@@ -25,17 +25,17 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 
 /**
- * Unit tests for {@link org.apache.hc.client5.http.impl.client.IdleConnectionEvictor}.
+ * Unit tests for {@link IdleConnectionEvictor}.
  */
 public class TestIdleConnectionEvictor {
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestInternalHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestInternalHttpClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestInternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java Sat Jan 16 12:58:34 2016
@@ -24,28 +24,27 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.sync;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.config.Lookup;
+import org.apache.hc.client5.http.HttpRoute;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
 import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.CookieStore;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.cookie.CookieSpecProvider;
-import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.cookie.CookieStore;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.routing.HttpRoutePlanner;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.config.Lookup;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestMainClientExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestMainClientExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestMainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.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.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -36,6 +36,31 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.RouteInfo;
+import org.apache.hc.client5.http.auth.AuthChallenge;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.ChallengeType;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.entity.EntityBuilder;
+import org.apache.hc.client5.http.impl.auth.BasicScheme;
+import org.apache.hc.client5.http.impl.auth.NTLMScheme;
+import org.apache.hc.client5.http.impl.io.ConnectionShutdownException;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.AuthenticationStrategy;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.protocol.NonRepeatableRequestException;
+import org.apache.hc.client5.http.protocol.UserTokenHandler;
 import org.apache.hc.core5.concurrent.Cancellable;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.HttpException;
@@ -51,32 +76,6 @@ import org.apache.hc.core5.http.io.HttpC
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.client5.http.auth.AuthChallenge;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.ChallengeType;
-import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.AuthenticationStrategy;
-import org.apache.hc.client5.http.client.NonRepeatableRequestException;
-import org.apache.hc.client5.http.client.UserTokenHandler;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.entity.EntityBuilder;
-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.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpPost;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.conn.routing.RouteInfo;
-import org.apache.hc.client5.http.impl.auth.BasicScheme;
-import org.apache.hc.client5.http.impl.auth.NTLMScheme;
-import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.conn.ConnectionShutdownException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestMinimalClientExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestMinimalClientExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestMinimalClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.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.ByteArrayInputStream;
 import java.io.IOException;
@@ -32,6 +32,18 @@ import java.io.InterruptedIOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.entity.EntityBuilder;
+import org.apache.hc.client5.http.impl.io.ConnectionShutdownException;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.concurrent.Cancellable;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
 import org.apache.hc.core5.http.HttpException;
@@ -42,18 +54,6 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.client5.http.client.config.RequestConfig;
-import org.apache.hc.client5.http.client.entity.EntityBuilder;
-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.HttpGet;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.hc.client5.http.conn.ConnectionRequest;
-import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
-import org.apache.hc.client5.http.impl.conn.ConnectionShutdownException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

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

Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestProtocolExec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestProtocolExec.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestProtocolExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java Sat Jan 16 12:58:34 2016
@@ -24,26 +24,25 @@
  * <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.net.URI;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-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.HttpGet;
-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;
-import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;



Mime
View raw message