hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724949 [3/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/...
Date Sat, 16 Jan 2016 10:33:34 GMT
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HttpCache.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HttpCache.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 import java.util.Date;
@@ -33,8 +33,8 @@ import java.util.Map;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
 
 /**
  * @since 4.1

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ImmediateSchedulingStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ImmediateSchedulingStrategy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ImmediateSchedulingStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ImmediateSchedulingStrategy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ManagedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ManagedHttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ManagedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ManagedHttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -35,10 +35,10 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.cache.HttpCacheUpdateCallback;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.client.cache.Resource;
 
 /**
  * <p>

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/OptionsHttp11Response.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/OptionsHttp11Response.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/OptionsHttp11Response.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/OptionsHttp11Response.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Iterator;
 import java.util.Locale;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Proxies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Proxies.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Proxies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Proxies.java Sat Jan 16 10:33:24 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.lang.reflect.Proxy;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
 
 /**
  * Proxies for HTTP message objects.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolCompliance.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolCompliance.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,9 +46,9 @@ import org.apache.hc.core5.http.entity.C
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.message.BasicStatusLine;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
 
 /**
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolError.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolError.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolError.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/RequestProtocolError.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 /**
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResourceReference.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResourceReference.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResourceReference.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResourceReference.java Sat Jan 16 10:33:24 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.Resource;
 
 @Immutable
 class ResourceReference extends PhantomReference<HttpCacheEntry> {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseCachingPolicy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseCachingPolicy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -42,8 +42,8 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * Determines if an HttpResponse can be cached.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseProtocolCompliance.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ResponseProtocolCompliance.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,10 +42,10 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * @since 4.1

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

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/SizeLimitedResponseReader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/SizeLimitedResponseReader.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/SizeLimitedResponseReader.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/SizeLimitedResponseReader.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,10 +35,10 @@ import org.apache.hc.core5.http.HttpEnti
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.cache.InputLimit;
-import org.apache.http.client.cache.Resource;
-import org.apache.http.client.cache.ResourceFactory;
-import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.cache.InputLimit;
+import org.apache.hc.client5.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.ResourceFactory;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
 
 /**
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Variant.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Variant.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Variant.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/Variant.java Sat Jan 16 10:33:24 2016
@@ -24,9 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 /** Records a set of information describing a cached variant. */
 class Variant {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/WarningValue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/WarningValue.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/WarningValue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/WarningValue.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -33,7 +33,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.hc.core5.http.Header;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /** This class provides for parsing and understanding Warning headers. As
  * the Warning header can be multi-valued, but the values can contain

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,19 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.ehcache;
+package org.apache.hc.client5.http.impl.client.cache.ehcache;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheEntrySerializer;
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.cache.HttpCacheUpdateCallback;
-import org.apache.http.client.cache.HttpCacheUpdateException;
-import org.apache.http.impl.client.cache.CacheConfig;
-import org.apache.http.impl.client.cache.DefaultHttpCacheEntrySerializer;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntrySerializer;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.impl.client.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.client.cache.DefaultHttpCacheEntrySerializer;
 
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/KeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/KeyHashingScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/KeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/KeyHashingScheme.java Sat Jan 16 10:33:24 2016
@@ -49,10 +49,10 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  *
- */package org.apache.http.impl.client.cache.memcached;
+ */package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 /**
- * Since the {@link org.apache.http.client.cache.HttpCacheStorage} interface
+ * Since the {@link org.apache.hc.client5.http.client.cache.HttpCacheStorage} interface
  * expects to use variant-annotated URLs for its storage keys, but Memcached
  * has a maximum key size, we need to support mapping storage keys to cache
  * keys. Clients can implement this interface to change the way the mapping

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntry.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntry.java Sat Jan 16 10:33:24 2016
@@ -24,9 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 /**
  * Provides for serialization and deserialization of higher-level

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java Sat Jan 16 10:33:24 2016
@@ -24,9 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 /**
  * Creates {@link MemcachedCacheEntry} instances that can be used for

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java Sat Jan 16 10:33:24 2016
@@ -24,9 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 /**
  * Default implementation of {@link MemcachedCacheEntryFactory}.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 /**
  * Default implementation of {@link MemcachedCacheEntry}. This implementation

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.cache.HttpCacheUpdateCallback;
-import org.apache.http.client.cache.HttpCacheUpdateException;
-import org.apache.http.impl.client.cache.CacheConfig;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.impl.client.cache.CacheConfig;
 
 import net.spy.memcached.CASResponse;
 import net.spy.memcached.CASValue;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedKeyHashingException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedKeyHashingException.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedKeyHashingException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedKeyHashingException.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 /**
  * Indicates a problem encountered when trying to map a

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedSerializationException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedSerializationException.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedSerializationException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/MemcachedSerializationException.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 /**
  * Raised when there is a problem serializing or deserializing cache

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/package.html?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/package.html (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/package.html Sat Jan 16 10:33:24 2016
@@ -30,13 +30,13 @@ information on the Apache Software Found
 <body bgcolor="white">
 
 <p>
-This package contains a cache module that can be used for HTTP/1.1
-client-side caching. The primary classes in this package are the
-{@link org.apache.http.impl.client.cache.CachingHttpClient},
-which is a drop-in replacement for
-a {@link org.apache.http.impl.client.DefaultHttpClient} that adds
-caching, and the {@link org.apache.http.impl.client.cache.CacheConfig}
-class that can be used for configuring it.
+    This package contains a cache module that can be used for HTTP/1.1
+    client-side caching. The primary classes in this package are the
+    {@link org.apache.hc.client5.http.impl.client.cache.CachingHttpClient},
+    which is a drop-in replacement for
+    a {@link org.apache.hc.client5.http.impl.client.DefaultHttpClient} that adds
+    caching, and the {@link org.apache.hc.client5.http.impl.client.cache.CacheConfig}
+    class that can be used for configuring it.
 </p>
 </body>
 </html>

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/client/cache/TestHttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/client/cache/TestHttpCacheEntry.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/client/cache/TestHttpCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/client/cache/TestHttpCacheEntry.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.cache;
+package org.apache.hc.client5.http.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -45,7 +45,7 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.StatusLine;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicStatusLine;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/AbstractProtocolTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/AbstractProtocolTest.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/AbstractProtocolTest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/AbstractProtocolTest.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.HashMap;
 
@@ -34,13 +34,13 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.cache.HttpCacheContext;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-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.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.cache.HttpCacheContext;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.easymock.EasyMock;
 import org.easymock.IExpectationSetters;
 import org.junit.Before;

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

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/DummyBackend.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/DummyBackend.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/DummyBackend.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/DummyBackend.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 
@@ -34,12 +34,12 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-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.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 
 public class DummyBackend implements ClientExecChain {
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/HttpTestUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/HttpTestUtils.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/HttpTestUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/HttpTestUtils.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.InputStream;
 import java.util.Date;
@@ -47,9 +47,9 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.message.BasicStatusLine;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 
 public class HttpTestUtils {

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

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

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

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/SimpleHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/SimpleHttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/SimpleHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/SimpleHttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateCallback;
 
 class SimpleHttpCacheStorage implements HttpCacheStorage {
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidationRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidationRequest.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidationRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidationRequest.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -37,14 +37,14 @@ import org.apache.hc.core5.http.HttpHost
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.StatusLine;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-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.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+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;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidator.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidator.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doThrow;
@@ -41,13 +41,13 @@ 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.message.BasicHeader;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-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.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+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.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestBasicHttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestBasicHttpCache.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestBasicHttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestBasicHttpCache.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -52,16 +52,16 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.Resource;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpOptions;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpTrace;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.methods.HttpDelete;
+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.HttpOptions;
+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.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheEntryUpdater.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheEntryUpdater.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheEntryUpdater.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -39,8 +39,8 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheInvalidator.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheInvalidator.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -46,9 +46,9 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheKeyGenerator.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheKeyGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheKeyGenerator.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -36,8 +36,8 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.methods.HttpGet;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheValidityPolicy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheValidityPolicy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheableRequestPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheableRequestPolicy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheableRequestPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheableRequestPolicy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.junit.Assert;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedHttpResponseGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedHttpResponseGenerator.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedHttpResponseGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedHttpResponseGenerator.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Matchers.same;
@@ -39,8 +39,8 @@ import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Date;
 
@@ -34,8 +34,8 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExec.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.eq;
@@ -56,15 +56,15 @@ import org.apache.hc.core5.http.entity.I
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.message.BasicStatusLine;
-import org.apache.http.client.cache.HttpCacheEntry;
-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.client.utils.DateUtils;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+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.client.utils.DateUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.easymock.EasyMock;
 import org.easymock.IExpectationSetters;
 import org.junit.Assert;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExecChain.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExecChain.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExecChain.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExecChain.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.eq;
@@ -60,22 +60,22 @@ import org.apache.hc.core5.http.entity.I
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.cache.CacheResponseStatus;
-import org.apache.http.client.cache.HttpCacheContext;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheStorage;
-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.HttpOptions;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.ResponseHandler;
+import org.apache.hc.client5.http.client.cache.CacheResponseStatus;
+import org.apache.hc.client5.http.client.cache.HttpCacheContext;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+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.HttpOptions;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.methods.HttpUriRequest;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.easymock.IExpectationSetters;

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCombinedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCombinedEntity.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCombinedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCombinedEntity.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
 import java.io.ByteArrayInputStream;
 
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.Resource;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestConditionalRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestConditionalRequestBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestConditionalRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestConditionalRequestBuilder.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -38,10 +38,10 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestExponentialBackingOffSchedulingStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestExponentialBackingOffSchedulingStrategy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestExponentialBackingOffSchedulingStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestExponentialBackingOffSchedulingStrategy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -35,10 +35,10 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-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.execchain.ClientExecChain;
+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.execchain.ClientExecChain;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheEntrySerializers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheEntrySerializers.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheEntrySerializers.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheEntrySerializers.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertTrue;
 
@@ -44,10 +44,10 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.StatusLine;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicStatusLine;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheEntrySerializer;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntrySerializer;
+import org.apache.hc.client5.http.client.cache.Resource;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheJiraNumber1147.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheJiraNumber1147.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheJiraNumber1147.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
@@ -40,15 +40,15 @@ import org.apache.hc.core5.http.HttpHost
 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.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.cache.ResourceFactory;
-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.client.utils.DateUtils;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.cache.ResourceFactory;
+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.client.utils.DateUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

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

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolAllowedBehavior.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolAllowedBehavior.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolAllowedBehavior.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolAllowedBehavior.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.net.SocketTimeoutException;
 import java.util.Date;
@@ -33,8 +33,8 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolDeviations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolDeviations.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolDeviations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolDeviations.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Date;
 import java.util.Random;
@@ -38,15 +38,15 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.cache.HttpCacheContext;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.cache.HttpCacheContext;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Assert;




Mime
View raw message