hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [4/11] - in /httpcomponents/httpclient/trunk: fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/ fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/ fluent-hc/src/main/java/org/apache/hc/client5/http/...
Date Sat, 16 Jan 2016 12:58:42 GMT
Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java (from r1724949, 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/cache/TestAsynchronousValidationRequest.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidationRequest.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestAsynchronousValidationRequest.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -32,19 +32,19 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.Header;
 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.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;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java (from r1724949, 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/cache/TestAsynchronousValidator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestAsynchronousValidator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestAsynchronousValidator.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doThrow;
@@ -37,17 +37,17 @@ import java.io.IOException;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java (from r1724949, 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/cache/TestBasicHttpCache.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestBasicHttpCache.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestBasicHttpCache.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,6 +41,16 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.Resource;
+import org.apache.hc.client5.http.methods.HttpDelete;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpHead;
+import org.apache.hc.client5.http.methods.HttpOptions;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.client5.http.methods.HttpTrace;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
@@ -52,16 +62,6 @@ 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java (from r1724949, 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/cache/TestCacheEntryUpdater.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheEntryUpdater.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCacheEntryUpdater.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -33,14 +33,14 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.util.Date;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-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;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java (from r1724949, 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/cache/TestCacheInvalidator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheInvalidator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCacheInvalidator.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -36,6 +36,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -46,9 +49,6 @@ 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.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;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java (from r1724949, 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/cache/TestCacheKeyGenerator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheKeyGenerator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCacheKeyGenerator.java Sat Jan 16 12:58:34 2016
@@ -24,20 +24,20 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.HttpGet;
 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.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java (from r1724949, 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/cache/TestCacheValidityPolicy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheValidityPolicy.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCacheValidityPolicy.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,14 +34,14 @@ import static org.junit.Assert.assertTru
 
 import java.util.Date;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpRequest;
 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.hc.client5.http.client.cache.HttpCacheEntry;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java (from r1724949, 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/cache/TestCacheableRequestPolicy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCacheableRequestPolicy.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCacheableRequestPolicy.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.junit.Assert;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java (from r1724949, 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/cache/TestCachedHttpResponseGenerator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedHttpResponseGenerator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCachedHttpResponseGenerator.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Matchers.same;
@@ -35,12 +35,12 @@ import static org.mockito.Mockito.when;
 import java.util.Date;
 import java.util.HashMap;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java (from r1724949, 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/cache/TestCachedResponseSuitabilityChecker.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCachedResponseSuitabilityChecker.java Sat Jan 16 12:58:34 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.util.Date;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.utils.DateUtils;
 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.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java (from r1724949, 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/cache/TestCachingExec.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExec.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCachingExec.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.eq;
@@ -45,6 +45,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.impl.sync.ClientExecChain;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
@@ -56,15 +65,6 @@ 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java (from r1724949, 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/cache/TestCachingExecChain.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingExecChain.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCachingExecChain.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.eq;
@@ -48,6 +48,22 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.CacheResponseStatus;
+import org.apache.hc.client5.http.cache.HttpCacheContext;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.impl.sync.ClientExecChain;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpOptions;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.sync.ResponseHandler;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -60,22 +76,6 @@ 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java (from r1724949, 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/cache/TestCachingHttpClientBuilder.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCachingHttpClientBuilder.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCachingHttpClientBuilder.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java (from r1724949, 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/cache/TestCombinedEntity.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestCombinedEntity.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestCombinedEntity.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -32,8 +32,8 @@ import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
 
+import org.apache.hc.client5.http.cache.Resource;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.cache.Resource;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java (from r1724949, 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/cache/TestConditionalRequestBuilder.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestConditionalRequestBuilder.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestConditionalRequestBuilder.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpHost;
@@ -38,10 +42,6 @@ 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java (from r1724949, 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/cache/TestDefaultFailureCache.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestDefaultFailureCache.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestDefaultFailureCache.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import org.junit.Assert;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java (from r1724949, 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/cache/TestExponentialBackingOffSchedulingStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestExponentialBackingOffSchedulingStrategy.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestExponentialBackingOffSchedulingStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -33,12 +33,12 @@ import static org.mockito.Mockito.when;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.impl.sync.ClientExecChain;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-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;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java (from r1724949, 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/cache/TestHttpCacheEntrySerializers.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheEntrySerializers.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestHttpCacheEntrySerializers.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertTrue;
 
@@ -39,15 +39,15 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheEntrySerializer;
+import org.apache.hc.client5.http.cache.Resource;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.ProtocolVersion;
 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.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;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java (from r1724949, 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/cache/TestHttpCacheJiraNumber1147.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestHttpCacheJiraNumber1147.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestHttpCacheJiraNumber1147.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
@@ -36,19 +36,19 @@ import static org.mockito.Mockito.when;
 import java.io.File;
 import java.util.Date;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.cache.ResourceFactory;
+import org.apache.hc.client5.http.impl.sync.ClientExecChain;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.utils.DateUtils;
 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java (from r1724949, 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/cache/TestImmediateSchedulingStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestImmediateSchedulingStrategy.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestImmediateSchedulingStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.mockito.Mockito.mock;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java (from r1724949, 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/cache/TestProtocolAllowedBehavior.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolAllowedBehavior.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestProtocolAllowedBehavior.java Sat Jan 16 12:58:34 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.net.SocketTimeoutException;
 import java.util.Date;
 
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-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;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java (from r1724949, 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/cache/TestProtocolDeviations.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolDeviations.java&r1=1724949&r2=1724967&rev=1724967&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/cache/TestProtocolDeviations.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,20 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.util.Date;
 import java.util.Random;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HttpCacheContext;
+import org.apache.hc.client5.http.impl.sync.ClientExecChain;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -38,15 +47,6 @@ 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.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,6 +37,12 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpRequest;
@@ -45,12 +51,6 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-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.client.utils.DateUtils;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Before;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,6 +34,14 @@ import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HeaderElements;
@@ -49,14 +57,6 @@ import org.apache.hc.core5.http.entity.B
 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.hc.client5.http.client.ClientProtocolException;
-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.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.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Assert;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -33,6 +33,8 @@ import static org.junit.Assert.assertTru
 import java.io.ByteArrayInputStream;
 import java.util.Date;
 
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
@@ -40,8 +42,6 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Test;
 
 /**

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -32,13 +32,13 @@ import static org.junit.Assert.assertTru
 
 import java.util.Arrays;
 
+import org.apache.hc.client5.http.methods.HttpPut;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.client5.http.client.methods.HttpPut;
-import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java Sat Jan 16 12:58:34 2016
@@ -24,11 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.util.Date;
 import java.util.Random;
 
+import org.apache.hc.client5.http.methods.HttpOptions;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
@@ -37,8 +39,6 @@ import org.apache.hc.core5.http.Protocol
 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.hc.client5.http.client.methods.HttpOptions;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
@@ -32,6 +32,11 @@ import static junit.framework.TestCase.a
 import java.io.ByteArrayInputStream;
 import java.util.Date;
 
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.methods.HttpHead;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
@@ -42,11 +47,6 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-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.HttpRequestWrapper;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.io.IOException;
 import java.lang.reflect.Proxy;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpGet;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
@@ -39,8 +41,6 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
-import org.apache.hc.client5.http.client.methods.HttpGet;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -33,6 +33,13 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
+import org.apache.hc.client5.http.cache.CacheResponseStatus;
+import org.apache.hc.client5.http.cache.HttpCacheContext;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
+import org.apache.hc.client5.http.methods.HttpGet;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -46,14 +53,6 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.ClientProtocolException;
-import org.apache.hc.client5.http.client.HttpClient;
-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.config.RequestConfig;
-import org.apache.hc.client5.http.client.methods.HttpGet;
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -190,7 +189,7 @@ public class TestStaleWhileRevalidationR
 
     }
 
-    static Exception sendRequest(final HttpClient cachingClient, final HttpContext localContext , final String url, final String content) {
+    static Exception sendRequest(final CloseableHttpClient cachingClient, final HttpContext localContext , final String url, final String content) {
         final HttpGet httpget = new HttpGet(url);
         if(content!=null) {
             httpget.setHeader(cacheHandler.getUserContentHeader(),content);

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java (from r1724949, httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.util.Date;
 
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.message.BasicHeader;
-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/cache/ehcache/TestEhcacheHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache.ehcache;
+package org.apache.hc.client5.http.impl.cache.ehcache;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Matchers.same;
@@ -37,12 +37,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-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.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.HttpTestUtils;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheEntrySerializer;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.impl.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.cache.HttpTestUtils;
 import org.junit.Test;
 
 import junit.framework.TestCase;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java Sat Jan 16 12:58:34 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache.ehcache;
+package org.apache.hc.client5.http.impl.cache.ehcache;
 
-import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
-import org.apache.hc.client5.http.impl.client.cache.CacheConfig;
-import org.apache.hc.client5.http.impl.client.cache.CachingExec;
-import org.apache.hc.client5.http.impl.client.cache.HeapResourceFactory;
-import org.apache.hc.client5.http.impl.client.cache.TestProtocolRequirements;
-import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.impl.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.cache.CachingExec;
+import org.apache.hc.client5.http.impl.cache.HeapResourceFactory;
+import org.apache.hc.client5.http.impl.cache.TestProtocolRequirements;
+import org.apache.hc.client5.http.impl.sync.ClientExecChain;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.AfterClass;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java Sat Jan 16 12:58:34 2016
@@ -24,16 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.cache.memcached;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
-import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
-import org.apache.hc.client5.http.impl.client.cache.HttpTestUtils;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.impl.cache.HttpTestUtils;
 import org.junit.Test;
 
-
 public class TestMemcachedCacheEntryFactoryImpl {
 
     @Test

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.cache.memcached;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -34,13 +34,12 @@ import static org.junit.Assert.assertTru
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
-import org.apache.hc.client5.http.impl.client.cache.DefaultHttpCacheEntrySerializer;
-import org.apache.hc.client5.http.impl.client.cache.HttpTestUtils;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.impl.cache.DefaultHttpCacheEntrySerializer;
+import org.apache.hc.client5.http.impl.cache.HttpTestUtils;
 import org.junit.Before;
 import org.junit.Test;
 
-
 public class TestMemcachedCacheEntryImpl {
 
     private MemcachedCacheEntryImpl impl;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.cache.memcached;
 
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -35,11 +35,11 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 
-import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
-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.HttpTestUtils;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.impl.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.cache.HttpTestUtils;
 import org.junit.Before;
 import org.junit.Test;
 

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

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

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java Sat Jan 16 12:58:34 2016
@@ -35,7 +35,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
 import org.apache.hc.client5.http.osgi.services.HttpClientBuilderFactory;
 import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.osgi.framework.BundleActivator;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java Sat Jan 16 12:58:34 2016
@@ -29,8 +29,8 @@ package org.apache.hc.client5.http.osgi.
 import java.util.List;
 import java.util.Map;
 
-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.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
 import org.apache.hc.client5.http.osgi.services.HttpClientBuilderFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java Sat Jan 16 12:58:34 2016
@@ -30,8 +30,8 @@ import java.util.Map;
 
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsStore;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.CredentialsStore;
 import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java Sat Jan 16 12:58:34 2016
@@ -29,8 +29,8 @@ package org.apache.hc.client5.http.osgi.
 import java.util.List;
 import java.util.Map;
 
-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.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java Sat Jan 16 12:58:34 2016
@@ -31,12 +31,12 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner;
+import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.impl.conn.DefaultRoutePlanner;
-import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 




Mime
View raw message