You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/01/16 11:33:34 UTC

svn commit: r1724949 [10/10] - in /httpcomponents/httpclient/trunk: fluent-hc/src/examples/org/apache/hc/ fluent-hc/src/examples/org/apache/hc/client5/ fluent-hc/src/examples/org/apache/hc/client5/http/ fluent-hc/src/examples/org/apache/hc/client5/http...

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestIdleConnectionEviction.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestIdleConnectionEviction.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestIdleConnectionEviction.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestIdleConnectionEviction.java Sat Jan 16 10:33:24 2016
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.client.integration;
 
 import java.util.concurrent.TimeUnit;
 
 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.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.IdleConnectionEvictor;
-import org.apache.http.localserver.LocalServerTestBase;
+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 {

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMalformedServerResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMalformedServerResponse.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMalformedServerResponse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMalformedServerResponse.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.client.integration;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -40,9 +40,9 @@ 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.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.localserver.LocalServerTestBase;
+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/client/integration/TestMinimalClientRequestExecution.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMinimalClientRequestExecution.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMinimalClientRequestExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestMinimalClientRequestExecution.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.client.integration;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -41,10 +41,10 @@ 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.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.localserver.LocalServerTestBase;
+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/client/integration/TestRedirects.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestRedirects.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestRedirects.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestRedirects.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.client.integration;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -48,18 +48,18 @@ 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.http.client.CircularRedirectException;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.RedirectException;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIUtils;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.apache.http.localserver.LocalServerTestBase;
+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/client/integration/TestSPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestSPNegoScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestSPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestSPNegoScheme.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.client.integration;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -41,16 +41,16 @@ 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.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.client.config.AuthSchemes;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.auth.SPNegoScheme;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.localserver.LocalServerTestBase;
+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/client/integration/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestStatefulConnManagement.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/integration/TestStatefulConnManagement.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.integration;
+package org.apache.hc.client5.http.impl.client.integration;
 
 import java.io.IOException;
 
@@ -39,12 +39,12 @@ 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.http.client.HttpClient;
-import org.apache.http.client.UserTokenHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.localserver.LocalServerTestBase;
+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;
 

Modified: 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/conn/SessionInputBufferMock.java?rev=1724949&r1=1724852&r2=1724949&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/conn/SessionInputBufferMock.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

Modified: 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/conn/TestBasicHttpClientConnectionManager.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestBasicHttpClientConnectionManager.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -38,15 +38,15 @@ import org.apache.hc.core5.http.config.L
 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.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.DnsResolver;
-import org.apache.http.conn.HttpConnectionFactory;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.SchemePortResolver;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+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;

Modified: 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/conn/TestDefaultHttpResponseParser.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestDefaultHttpResponseParser.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import java.nio.charset.StandardCharsets;
 

Modified: 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/conn/TestDefaultProxyRoutePlanner.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestDefaultProxyRoutePlanner.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -33,10 +33,10 @@ import org.apache.hc.core5.http.HttpVers
 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.http.client.config.RequestConfig;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.SchemePortResolver;
-import org.apache.http.conn.routing.HttpRoute;
+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;

Modified: 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/conn/TestDefaultRoutePlanner.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestDefaultRoutePlanner.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -34,10 +34,10 @@ 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.http.client.config.RequestConfig;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.SchemePortResolver;
-import org.apache.http.conn.routing.HttpRoute;
+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;

Modified: 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/conn/TestHttpClientConnectionOperator.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestHttpClientConnectionOperator.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import java.net.ConnectException;
 import java.net.InetAddress;
@@ -38,14 +38,14 @@ import org.apache.hc.core5.http.config.L
 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.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.DnsResolver;
-import org.apache.http.conn.HttpHostConnectException;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.SchemePortResolver;
-import org.apache.http.conn.UnsupportedSchemeException;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+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;

Modified: 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/conn/TestPoolingHttpClientConnectionManager.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestPoolingHttpClientConnectionManager.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -41,15 +41,15 @@ import org.apache.hc.core5.http.config.L
 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.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.DnsResolver;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.SchemePortResolver;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+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;

Modified: 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/conn/TestSystemDefaultRoutePlanner.java?rev=1724949&r1=1724852&r2=1724949&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/conn/TestSystemDefaultRoutePlanner.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -41,8 +41,8 @@ import org.apache.hc.core5.http.HttpVers
 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.http.conn.SchemePortResolver;
-import org.apache.http.conn.routing.HttpRoute;
+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;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -33,13 +33,13 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;
 
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.conn.util.DomainType;
-import org.apache.http.conn.util.PublicSuffixMatcher;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.conn.util.DomainType;
+import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java Sat Jan 16 10:33:24 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
 
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java Sat Jan 16 10:33:24 2016
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.http.conn.util.PublicSuffixList;
-import org.apache.http.conn.util.PublicSuffixMatcher;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.conn.util.PublicSuffixList;
+import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -52,7 +52,7 @@ public class TestPublicSuffixListParser
         Assert.assertNotNull(in);
         final PublicSuffixList suffixList;
         try {
-            final org.apache.http.conn.util.PublicSuffixListParser parser = new org.apache.http.conn.util.PublicSuffixListParser();
+            final org.apache.hc.client5.http.conn.util.PublicSuffixListParser parser = new org.apache.hc.client5.http.conn.util.PublicSuffixListParser();
             suffixList = parser.parse(new InputStreamReader(in, StandardCharsets.UTF_8));
         } finally {
             in.close();

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java Sat Jan 16 10:33:24 2016
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

Modified: 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/execchain/TestConnectionHolder.java?rev=1724949&r1=1724852&r2=1724949&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/execchain/TestConnectionHolder.java Sat Jan 16 10:33:24 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.hc.core5.http.io.HttpClientConnection;
-import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: 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/execchain/TestMainClientExec.java?rev=1724949&r1=1724852&r2=1724949&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/execchain/TestMainClientExec.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -51,32 +51,32 @@ 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.http.auth.AuthChallenge;
-import org.apache.http.auth.AuthExchange;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.ChallengeType;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthenticationStrategy;
-import org.apache.http.client.NonRepeatableRequestException;
-import org.apache.http.client.UserTokenHandler;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.EntityBuilder;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.routing.RouteInfo;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.auth.NTLMScheme;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.conn.ConnectionShutdownException;
+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;

Modified: 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/execchain/TestMinimalClientExec.java?rev=1724949&r1=1724852&r2=1724949&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/execchain/TestMinimalClientExec.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -42,18 +42,18 @@ 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.http.client.config.RequestConfig;
-import org.apache.http.client.entity.EntityBuilder;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.conn.ConnectionShutdownException;
+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;

Modified: 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/execchain/TestProtocolExec.java?rev=1724949&r1=1724852&r2=1724949&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/execchain/TestProtocolExec.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.IOException;
 import java.net.URI;
@@ -34,16 +34,16 @@ 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.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.CredentialsProvider;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.client.BasicCredentialsProvider;
+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;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRedirectExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRedirectExec.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -37,20 +37,20 @@ 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.ProtocolException;
-import org.apache.http.auth.AuthExchange;
-import org.apache.http.client.RedirectException;
-import org.apache.http.client.RedirectStrategy;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.EntityBuilder;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.routing.HttpRoutePlanner;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.auth.NTLMScheme;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.client.RedirectException;
+import org.apache.hc.client5.http.client.RedirectStrategy;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.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.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
+import org.apache.hc.client5.http.impl.auth.BasicScheme;
+import org.apache.hc.client5.http.impl.auth.NTLMScheme;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestResponseEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestResponseEntityWrapper.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestResponseEntityWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestResponseEntityWrapper.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRetryExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestRetryExec.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,15 +34,15 @@ import org.apache.hc.core5.http.Header;
 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.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.NonRepeatableRequestException;
-import org.apache.http.client.entity.EntityBuilder;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.HttpRequestRetryHandler;
+import org.apache.hc.client5.http.client.NonRepeatableRequestException;
+import org.apache.hc.client5.http.client.entity.EntityBuilder;
+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.routing.HttpRoute;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestServiceUnavailableRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestServiceUnavailableRetryExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestServiceUnavailableRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/execchain/TestServiceUnavailableRetryExec.java Sat Jan 16 10:33:24 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
 
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.ServiceUnavailableRetryStrategy;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.ServiceUnavailableRetryStrategy;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.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.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import java.nio.charset.StandardCharsets;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import java.io.IOException;
 import java.util.Locale;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import java.util.concurrent.TimeUnit;
 
@@ -33,9 +33,9 @@ import org.apache.hc.core5.http.HttpHost
 import org.apache.hc.core5.http.bootstrap.io.HttpServer;
 import org.apache.hc.core5.http.bootstrap.io.ServerBootstrap;
 import org.apache.hc.core5.http.config.SocketConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+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.conn.PoolingHttpClientConnectionManager;
 import org.junit.After;
 import org.junit.Before;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.localserver;
+package org.apache.hc.client5.http.localserver;
 
 import javax.net.ssl.SSLContext;
 

Copied: httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java (from r1724852, httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java?p2=httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java&p1=httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java&r1=1724852&r2=1724949&rev=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/hc/client5/http/examples/entity/mime/ClientMultipartFormPost.java Sat Jan 16 10:33:24 2016
@@ -24,20 +24,20 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.entity.mime;
+package org.apache.hc.client5.http.examples.entity.mime;
 
 import java.io.File;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+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.FileBody;
+import org.apache.hc.client5.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * Example how to use multipart/form encoded POST request.

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -38,7 +38,7 @@ import java.util.List;
 
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.ByteArrayBuffer;
-import org.apache.http.entity.mime.content.ContentBody;
+import org.apache.hc.client5.http.entity.mime.content.ContentBody;
 
 /**
  * HttpMultipart represents a collection of MIME multipart encoded content bodies. This class is

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java Sat Jan 16 10:33:24 2016
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import org.apache.hc.core5.util.Args;
-import org.apache.http.entity.mime.content.ContentBody;
+import org.apache.hc.client5.http.entity.mime.content.ContentBody;
 
 /**
  * FormBodyPart class represents a content body that can be used as a part of multipart encoded

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java Sat Jan 16 10:33:24 2016
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.util.List;
 
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
-import org.apache.http.entity.mime.content.AbstractContentBody;
-import org.apache.http.entity.mime.content.ContentBody;
+import org.apache.hc.client5.http.entity.mime.content.AbstractContentBody;
+import org.apache.hc.client5.http.entity.mime.content.ContentBody;
 
 /**
- * Builder for individual {@link org.apache.http.entity.mime.FormBodyPart}s.
+ * Builder for individual {@link org.apache.hc.client5.http.entity.mime.FormBodyPart}s.
  *
  * @since 4.4
  */

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 /**
  *

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 /**
  *

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 /**
  * Minimal MIME field.

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.File;
 import java.io.InputStream;
@@ -40,11 +40,11 @@ import org.apache.hc.core5.http.NameValu
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.entity.mime.content.ByteArrayBody;
-import org.apache.http.entity.mime.content.ContentBody;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.InputStreamBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.entity.mime.content.ByteArrayBody;
+import org.apache.hc.client5.http.entity.mime.content.ContentBody;
+import org.apache.hc.client5.http.entity.mime.content.FileBody;
+import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
+import org.apache.hc.client5.http.entity.mime.content.StringBody;
 
 /**
  * Builder for multipart {@link HttpEntity}s.

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/AbstractContentBody.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 import java.nio.charset.Charset;
 

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ByteArrayBody.java Sat Jan 16 10:33:24 2016
@@ -24,19 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.entity.mime.MIME;
+import org.apache.hc.client5.http.entity.mime.MIME;
 
 /**
  * Binary body part backed by a byte array.
  *
- * @see org.apache.http.entity.mime.MultipartEntityBuilder
+ * @see org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
  *
  * @since 4.1
  */

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentBody.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/ContentDescriptor.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 /**
  * Represents common content properties.

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/FileBody.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,12 +35,12 @@ import java.io.OutputStream;
 
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.entity.mime.MIME;
+import org.apache.hc.client5.http.entity.mime.MIME;
 
 /**
  * Binary body part backed by a file.
  *
- * @see org.apache.http.entity.mime.MultipartEntityBuilder
+ * @see org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
  *
  * @since 4.0
  */

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/InputStreamBody.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,12 +33,12 @@ import java.io.OutputStream;
 
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.entity.mime.MIME;
+import org.apache.hc.client5.http.entity.mime.MIME;
 
 /**
  * Binary body part backed by an input stream.
  *
- * @see org.apache.http.entity.mime.MultipartEntityBuilder
+ * @see org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
  *
  * @since 4.0
  */

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/StringBody.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -38,12 +38,12 @@ import java.nio.charset.StandardCharsets
 
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.entity.mime.MIME;
+import org.apache.hc.client5.http.entity.mime.MIME;
 
 /**
  * Text body part backed by a byte array.
  *
- * @see org.apache.http.entity.mime.MultipartEntityBuilder
+ * @see org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
  *
  * @since 4.0
  */

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/content/package-info.java Sat Jan 16 10:33:24 2016
@@ -28,4 +28,4 @@
 /**
  * MIME body part implementations.
  */
-package org.apache.http.entity.mime.content;
+package org.apache.hc.client5.http.entity.mime.content;

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java Sat Jan 16 10:33:24 2016
@@ -28,4 +28,4 @@
 /**
  * MIME coded HTTP entity implementations.
  */
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;

Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java Sat Jan 16 10:33:24 2016
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.File;
 
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.http.entity.mime.content.FileBody;
+import org.apache.hc.client5.http.entity.mime.content.FileBody;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java Sat Jan 16 10:33:24 2016
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.entity.mime.content.FileBody;
+import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java Sat Jan 16 10:33:24 2016
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.http.entity.mime.content.InputStreamBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
+import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -37,9 +37,9 @@ import java.nio.charset.StandardCharsets
 import java.util.Arrays;
 
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.InputStreamBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.entity.mime.content.FileBody;
+import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
+import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.entity.mime;
+package org.apache.hc.client5.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.NameValu
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.message.BasicHeaderValueParser;
 import org.apache.hc.core5.http.message.ParserCursor;
-import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.hc.client5.http.entity.mime.content.InputStreamBody;
 import org.junit.Assert;
 import org.junit.Test;