hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724949 [2/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
Copied: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java (from r1724852, httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentResponseHandling.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentResponseHandling.java&r1=1724852&r2=1724949&rev=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentResponseHandling.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.examples.client.fluent;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -34,13 +34,14 @@ import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.hc.client5.http.client.fluent.Request;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.StatusLine;
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ResponseHandler;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.HttpResponseException;
+import org.apache.hc.client5.http.client.ResponseHandler;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Async.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Async.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Async.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Async.java Sat Jan 16 10:33:24 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.util.concurrent.Future;
 
 import org.apache.hc.core5.concurrent.BasicFuture;
 import org.apache.hc.core5.concurrent.FutureCallback;
-import org.apache.http.client.ResponseHandler;
+import org.apache.hc.client5.http.client.ResponseHandler;
 
 public class Async {
 

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

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/ContentResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/ContentResponseHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/ContentResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/ContentResponseHandler.java Sat Jan 16 10:33:24 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.io.IOException;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.impl.client.AbstractResponseHandler;
+import org.apache.hc.client5.http.impl.client.AbstractResponseHandler;
 
 /**
- * {@link org.apache.http.client.ResponseHandler} implementation that converts
- * {@link org.apache.hc.core5.http.HttpResponse} messages to {@link org.apache.http.client.fluent.Content}
+ * {@link org.apache.hc.client5.http.client.ResponseHandler} implementation that converts
+ * {@link org.apache.hc.core5.http.HttpResponse} messages to {@link org.apache.hc.client5.http.client.fluent.Content}
  * instances.
  *
- * @see org.apache.http.client.fluent.Content
+ * @see org.apache.hc.client5.http.client.fluent.Content
  *
  * @since 4.4
  */

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Executor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Executor.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Executor.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Executor.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.io.IOException;
 import java.security.KeyManagementException;
@@ -36,25 +36,25 @@ import javax.net.ssl.SSLContext;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.Registry;
 import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.NTCredentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.CredentialsStore;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLInitializationException;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.NTCredentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.client.AuthCache;
+import org.apache.hc.client5.http.client.CookieStore;
+import org.apache.hc.client5.http.client.CredentialsStore;
+import org.apache.hc.client5.http.client.HttpClient;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.ssl.SSLInitializationException;
+import org.apache.hc.client5.http.impl.auth.BasicScheme;
+import org.apache.hc.client5.http.impl.client.BasicAuthCache;
+import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * An Executor for fluent requests.
@@ -233,7 +233,7 @@ public class Executor {
      * or discarded using {@link Response#discardContent()}, otherwise the
      * connection used for the request might not be released to the pool.
      *
-     * @see Response#handleResponse(org.apache.http.client.ResponseHandler)
+     * @see Response#handleResponse(org.apache.hc.client5.http.client.ResponseHandler)
      * @see Response#discardContent()
      */
     public Response execute(

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

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

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

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

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalHttpRequest.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalHttpRequest.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalHttpRequest.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -39,10 +39,10 @@ import org.apache.hc.core5.http.RequestL
 import org.apache.hc.core5.http.message.AbstractHttpMessage;
 import org.apache.hc.core5.http.message.BasicRequestLine;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.methods.Configurable;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpUriRequest;
 
 @NotThreadSafe
 class InternalHttpRequest extends AbstractHttpMessage

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

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Request.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Request.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Request.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Request.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.io.File;
 import java.io.IOException;
@@ -49,18 +49,18 @@ import org.apache.hc.core5.http.HttpVers
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-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.HttpPatch;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpTrace;
-import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.hc.client5.http.client.HttpClient;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.methods.Configurable;
+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.HttpPatch;
+import org.apache.hc.client5.http.client.methods.HttpPost;
+import org.apache.hc.client5.http.client.methods.HttpPut;
+import org.apache.hc.client5.http.client.methods.HttpTrace;
+import org.apache.hc.client5.http.client.utils.URLEncodedUtils;
 
 public class Request {
 

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Response.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Response.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Response.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Response.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -37,8 +37,8 @@ import org.apache.hc.core5.http.StatusLi
 import org.apache.hc.core5.http.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ResponseHandler;
+import org.apache.hc.client5.http.client.HttpResponseException;
+import org.apache.hc.client5.http.client.ResponseHandler;
 
 public class Response {
 

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/package-info.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/package-info.java Sat Jan 16 10:33:24 2016
@@ -29,4 +29,4 @@
  * Simple facade APIs for HttpClient based on the concept of
  * a fluent interface.
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/client/fluent/TestFluent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/client/fluent/TestFluent.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/client/fluent/TestFluent.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/client/fluent/TestFluent.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,9 +41,9 @@ import org.apache.hc.core5.http.entity.E
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.ResponseHandler;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/CacheResponseStatus.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/CacheResponseStatus.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/CacheResponseStatus.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/CacheResponseStatus.java Sat Jan 16 10:33:24 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.cache;
+package org.apache.hc.client5.http.client.cache;
 
 /**
  * This enumeration represents the various ways a response can be generated
- * by the {@link org.apache.http.impl.client.cache.CachingHttpClient};
- * if a request is executed with an {@link org.apache.http.protocol.HttpContext}
+ * by the {@link org.apache.hc.client5.http.impl.client.cache.CachingHttpClient};
+ * if a request is executed with an {@link org.apache.hc.client5.http.protocol.HttpContext}
  * then a parameter with one of these values will be registered in the
  * context under the key
- * {@link org.apache.http.impl.client.cache.CachingHttpClient#CACHE_RESPONSE_STATUS}.
+ * {@link org.apache.hc.client5.http.impl.client.cache.CachingHttpClient#CACHE_RESPONSE_STATUS}.
  */
 public enum CacheResponseStatus {
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HeaderConstants.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HeaderConstants.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HeaderConstants.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HeaderConstants.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 org.apache.hc.core5.annotation.Immutable;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheContext.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheContext.java Sat Jan 16 10:33:24 2016
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.cache;
+package org.apache.hc.client5.http.client.cache;
 
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
 
 /**
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntry.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntry.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 java.io.Serializable;
 import java.util.Collections;
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.StatusLine;
 import org.apache.hc.core5.http.message.HeaderGroup;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * Structure used to store an {@link org.apache.hc.core5.http.HttpResponse} in a cache.
@@ -310,7 +310,7 @@ public class HttpCacheEntry implements S
      * a given resource are stored. This maps "variant keys" to "cache keys",
      * where the variant key is derived from the varying request headers,
      * and the cache key is the location in the
-     * {@link org.apache.http.client.cache.HttpCacheStorage} where that
+     * {@link org.apache.hc.client5.http.client.cache.HttpCacheStorage} where that
      * particular variant is stored. The first variant returned is used as
      * the "parent" entry to hold this index of the other variants.
      */

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializationException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializationException.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializationException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializationException.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 java.io.IOException;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializer.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntrySerializer.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 java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheInvalidator.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheInvalidator.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 org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.cache;
+package org.apache.hc.client5.http.client.cache;
 
 import java.io.IOException;
 
 /**
  * New storage backends should implement this {@link HttpCacheStorage}
  * interface. They can then be plugged into the existing
- * {@link org.apache.http.impl.client.cache.CachingHttpClient}
+ * {@link org.apache.hc.client5.http.impl.client.cache.CachingHttpClient}
  * implementation.
  *
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateCallback.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateCallback.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateCallback.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 java.io.IOException;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateException.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateException.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;
 
 /**
  * Signals that {@link HttpCacheStorage} encountered an error performing an

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/InputLimit.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/InputLimit.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/InputLimit.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/InputLimit.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 org.apache.hc.core5.annotation.NotThreadSafe;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/Resource.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/Resource.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/Resource.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/Resource.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 java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/ResourceFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/ResourceFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/ResourceFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/ResourceFactory.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 java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/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/client/cache/package.html (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/package.html Sat Jan 16 10:33:24 2016
@@ -30,49 +30,49 @@ information on the Apache Software Found
 <body bgcolor="white">
 
 <p>
-This package consists largely of constants and interfaces that are
-necessary for building new storage backends for the
-{@link org.apache.http.impl.client.cache.CachingHttpClient} or for
-those clients wanting to get a little more behavioral information
-out of the cache module (for example, whether a particular response
-was a cache hit or not). Developers that simply want to instantiate
-and make use of the caching module will be better off looking at
-the {@code CachingHttpClient} documentation itself.
+    This package consists largely of constants and interfaces that are
+    necessary for building new storage backends for the
+    {@link org.apache.hc.client5.http.impl.client.cache.CachingHttpClient} or for
+    those clients wanting to get a little more behavioral information
+    out of the cache module (for example, whether a particular response
+    was a cache hit or not). Developers that simply want to instantiate
+    and make use of the caching module will be better off looking at
+    the {@code CachingHttpClient} documentation itself.
 </p>
 <p>
-The classes in this package can be divided into two main groups:
-reference constants and interfaces needed for storage backends. In
-the former group,
-{@link org.apache.http.client.cache.HeaderConstants} contains a list
-of HTTP header names encoded as static fields, and the
-{@link org.apache.http.client.cache.CacheResponseStatus} enumeration
-values are set in an {@link org.apache.http.protocol.HttpContext} by
-the {@code CachingHttpClient} to indicate how the request was
-processed by the caching module itself.
+    The classes in this package can be divided into two main groups:
+    reference constants and interfaces needed for storage backends. In
+    the former group,
+    {@link org.apache.hc.client5.http.client.cache.HeaderConstants} contains a list
+    of HTTP header names encoded as static fields, and the
+    {@link org.apache.hc.client5.http.client.cache.CacheResponseStatus} enumeration
+    values are set in an {@link org.apache.hc.client5.http.protocol.HttpContext} by
+    the {@code CachingHttpClient} to indicate how the request was
+    processed by the caching module itself.
 </p>
 <p>
-New storage backends will need to implement the
-{@link org.apache.http.client.cache.HttpCacheStorage}
-interface; they can then be passed to one of the {@code CachingHttpClient}
-constructors, which will happily make use of the new storage mechanism.
-The {@link org.apache.http.client.cache.HttpCacheEntry} class shows the
-datastructure for a cache entry that must be stored by the
-{@code HttpCacheStorage}.
-There is, in addition, the notion of a
-{@link org.apache.http.client.cache.Resource} and an associated
-{@link org.apache.http.client.cache.ResourceFactory}, which are used for
-managing the handling of cached response bodies. The default implementation
-used by the {@code CachingHttpClient} stores response bodies in memory;
-alternative implementations might involve storing these in a filesystem. A new
-{@code ResourceFactory} can be provided along with a {@code HttpCacheStorage}
-in one of the constructors to the {@code CachingHttpClient}. Finally, some
-of the additional storage backends we provide, like the
-{@link org.apache.http.impl.client.cache.ehcache.EhcacheHttpCacheStorage} and
-{@link org.apache.http.impl.client.cache.memcached.MemcachedHttpCacheStorage},
-can be provided with different serializers for the cache entry metadata;
-developers wanting to experiment with different serialization techniques
-should implement the
-{@link org.apache.http.client.cache.HttpCacheEntrySerializer} interface.
+    New storage backends will need to implement the
+    {@link org.apache.hc.client5.http.client.cache.HttpCacheStorage}
+    interface; they can then be passed to one of the {@code CachingHttpClient}
+    constructors, which will happily make use of the new storage mechanism.
+    The {@link org.apache.hc.client5.http.client.cache.HttpCacheEntry} class shows the
+    datastructure for a cache entry that must be stored by the
+    {@code HttpCacheStorage}.
+    There is, in addition, the notion of a
+    {@link org.apache.hc.client5.http.client.cache.Resource} and an associated
+    {@link org.apache.hc.client5.http.client.cache.ResourceFactory}, which are used for
+    managing the handling of cached response bodies. The default implementation
+    used by the {@code CachingHttpClient} stores response bodies in memory;
+    alternative implementations might involve storing these in a filesystem. A new
+    {@code ResourceFactory} can be provided along with a {@code HttpCacheStorage}
+    in one of the constructors to the {@code CachingHttpClient}. Finally, some
+    of the additional storage backends we provide, like the
+    {@link org.apache.hc.client5.http.impl.client.cache.ehcache.EhcacheHttpCacheStorage} and
+    {@link org.apache.hc.client5.http.impl.client.cache.memcached.MemcachedHttpCacheStorage},
+    can be provided with different serializers for the cache entry metadata;
+    developers wanting to experiment with different serialization techniques
+    should implement the
+    {@link org.apache.hc.client5.http.client.cache.HttpCacheEntrySerializer} interface.
 </p>
 </body>
 </html>

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidationRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidationRequest.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/AsynchronousValidationRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidationRequest.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;
 
@@ -33,13 +33,13 @@ import org.apache.commons.logging.LogFac
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpResponse;
-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.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.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * Class used to represent an asynchronous revalidation event, such as with

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidator.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/AsynchronousValidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidator.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,11 +35,11 @@ import java.util.concurrent.RejectedExec
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.client.cache.HttpCacheEntry;
-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.hc.client5.http.client.cache.HttpCacheEntry;
+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;
 
 /**
  * Class used for asynchronous revalidations to be used when the "stale-

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCache.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/BasicHttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCache.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.Arrays;
@@ -45,16 +45,16 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ByteArrayEntity;
 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.HttpCacheInvalidator;
-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.client.cache.Resource;
-import org.apache.http.client.cache.ResourceFactory;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpRequestWrapper;
+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.HttpCacheInvalidator;
+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.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.ResourceFactory;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
 
 class BasicHttpCache implements HttpCache {
     private static final Set<String> safeRequestMethods = new HashSet<>(

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCacheStorage.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/BasicHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCacheStorage.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.io.IOException;
 
 import org.apache.hc.core5.annotation.ThreadSafe;
-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;
 
 /**
  * Basic {@link HttpCacheStorage} implementation backed by an instance of

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicIdGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicIdGenerator.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/BasicIdGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicIdGenerator.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.InetAddress;
 import java.net.UnknownHostException;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheConfig.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/CacheConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheConfig.java Sat Jan 16 10:33:24 2016
@@ -24,12 +24,12 @@
  * <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.util.Args;
 
 /**
- * <p>Java Beans-style configuration for caching {@link org.apache.http.client.HttpClient}.
+ * <p>Java Beans-style configuration for caching {@link org.apache.hc.client5.http.client.HttpClient}.
  * Any class in the caching module that has configuration options should take a
  * {@link CacheConfig} argument in one of its constructors. A
  * {@code CacheConfig} instance has sane and conservative defaults, so the
@@ -38,7 +38,7 @@ import org.apache.hc.core5.util.Args;
  *
  * <p><b>N.B.</b> This class is only for caching-specific configuration; to
  * configure the behavior of the rest of the client, configure the
- * {@link org.apache.http.client.HttpClient} used as the &quot;backend&quot;
+ * {@link org.apache.hc.client5.http.client.HttpClient} used as the &quot;backend&quot;
  * for the {@code CachingHttpClient}.</p>
  *
  * <p>Cache configuration can be grouped into the following categories:</p>

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntity.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/CacheEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntity.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;
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpEnti
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.TrailerSupplier;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 @Immutable
 class CacheEntity implements HttpEntity, Serializable {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntryUpdater.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/CacheEntryUpdater.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntryUpdater.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;
@@ -39,11 +39,11 @@ import org.apache.hc.core5.http.HttpHead
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.util.Args;
-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.cache.ResourceFactory;
-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.cache.ResourceFactory;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * Update a {@link HttpCacheEntry} with new or updated information based on the latest

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheInvalidator.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/CacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheInvalidator.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.net.MalformedURLException;
@@ -39,11 +39,11 @@ import org.apache.hc.core5.http.HttpHead
 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.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheInvalidator;
-import org.apache.http.client.cache.HttpCacheStorage;
-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.HttpCacheInvalidator;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * Given a particular HttpRequest, flush any cache entries that this request

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheKeyGenerator.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/CacheKeyGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheKeyGenerator.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.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -41,9 +41,9 @@ import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.utils.URIUtils;
+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.URIUtils;
 
 /**
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheMap.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheMap.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/CacheMap.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheMap.java Sat Jan 16 10:33:24 2016
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 final class CacheMap extends LinkedHashMap<String, HttpCacheEntry> {
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheValidityPolicy.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/CacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheValidityPolicy.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;
 
@@ -33,9 +33,9 @@ import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpRequest;
-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;
 
 /**
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheableRequestPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheableRequestPolicy.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/CacheableRequestPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheableRequestPolicy.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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@ import org.apache.hc.core5.http.HeaderEl
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.http.client.cache.HeaderConstants;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
 
 /**
  * Determines if an HttpRequest is allowed to be served from the cache.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedHttpResponseGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedHttpResponseGenerator.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/CachedHttpResponseGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedHttpResponseGenerator.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;
 
@@ -37,11 +37,11 @@ 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.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.CloseableHttpResponse;
-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.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 
 /**
  * Rebuilds an {@link HttpResponse} from a {@link net.sf.ehcache.CacheEntry}

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedResponseSuitabilityChecker.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/CachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedResponseSuitabilityChecker.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;
 
@@ -36,9 +36,9 @@ import org.apache.hc.core5.http.HeaderEl
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpStatus;
-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;
 
 /**
  * Determines whether a given {@link HttpCacheEntry} is suitable to be

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingExec.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/CachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingExec.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.net.URI;
@@ -37,6 +37,20 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.client.cache.CacheResponseStatus;
+import org.apache.hc.client5.http.client.cache.HeaderConstants;
+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.cache.ResourceFactory;
+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.client.utils.URIUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
@@ -56,20 +70,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.VersionInfo;
-import org.apache.http.client.cache.CacheResponseStatus;
-import org.apache.http.client.cache.HeaderConstants;
-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.cache.ResourceFactory;
-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.client.utils.URIUtils;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.execchain.ClientExecChain;
 
 /**
  * <p>
@@ -86,9 +86,9 @@ import org.apache.http.impl.execchain.Cl
  * Folks that would like to experiment with alternative storage backends
  * should look at the {@link HttpCacheStorage} interface and the related
  * package documentation there. You may also be interested in the provided
- * {@link org.apache.http.impl.client.cache.ehcache.EhcacheHttpCacheStorage
+ * {@link org.apache.hc.client5.http.impl.client.cache.ehcache.EhcacheHttpCacheStorage
  * EhCache} and {@link
- * org.apache.http.impl.client.cache.memcached.MemcachedHttpCacheStorage
+ * org.apache.hc.client5.http.impl.client.cache.memcached.MemcachedHttpCacheStorage
  * memcached} storage backends.
  * </p>
  * <p>
@@ -523,7 +523,7 @@ public class CachingExec implements Clie
             return existingEntry;
         }
 
-        final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader());
+        final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.hc.client5", getClass().getClassLoader());
         final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
 
         String value;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingHttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingHttpClientBuilder.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/CachingHttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingHttpClientBuilder.java Sat Jan 16 10:33:24 2016
@@ -24,20 +24,20 @@
  * <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;
 import java.io.IOException;
 
-import org.apache.http.client.cache.HttpCacheInvalidator;
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.client.cache.ResourceFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.cache.HttpCacheInvalidator;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.client.cache.ResourceFactory;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 
 /**
- * Builder for {@link org.apache.http.impl.client.CloseableHttpClient}
+ * Builder for {@link org.apache.hc.client5.http.impl.client.CloseableHttpClient}
  * instances capable of client-side caching.
  *
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingHttpClients.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingHttpClients.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/CachingHttpClients.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachingHttpClients.java Sat Jan 16 10:33:24 2016
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.File;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
 
 /**
  * Factory methods for {@link CloseableHttpClient} instances

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CombinedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CombinedEntity.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/CombinedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CombinedEntity.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.FilterInputStream;
 import java.io.IOException;
@@ -35,7 +35,7 @@ import java.io.SequenceInputStream;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.entity.AbstractHttpEntity;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.Resource;
 
 @NotThreadSafe
 class CombinedEntity extends AbstractHttpEntity {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ConditionalRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ConditionalRequestBuilder.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/ConditionalRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ConditionalRequestBuilder.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.Map;
 
@@ -32,9 +32,9 @@ import org.apache.hc.core5.annotation.Im
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.ProtocolException;
-import org.apache.http.client.cache.HeaderConstants;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.HttpRequestWrapper;
+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;
 
 /**
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/DefaultFailureCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/DefaultFailureCache.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/DefaultFailureCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/DefaultFailureCache.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.Map;
 import java.util.concurrent.ConcurrentHashMap;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/DefaultHttpCacheEntrySerializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/DefaultHttpCacheEntrySerializer.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/DefaultHttpCacheEntrySerializer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/DefaultHttpCacheEntrySerializer.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;
@@ -33,9 +33,9 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheEntrySerializationException;
-import org.apache.http.client.cache.HttpCacheEntrySerializer;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntrySerializationException;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntrySerializer;
 
 /**
  * {@link HttpCacheEntrySerializer} implementation that uses the default (native)

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.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/ExponentialBackOffSchedulingStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.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.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -72,7 +72,7 @@ public class ExponentialBackOffSchedulin
     /**
      * Create a new scheduling strategy using a fixed pool of worker threads.
      * @param cacheConfig the thread pool configuration to be used; not {@code null}
-     * @see org.apache.http.impl.client.cache.CacheConfig#getAsynchronousWorkersMax()
+     * @see org.apache.hc.client5.http.impl.client.cache.CacheConfig#getAsynchronousWorkersMax()
      * @see #DEFAULT_BACK_OFF_RATE
      * @see #DEFAULT_INITIAL_EXPIRY_IN_MILLIS
      * @see #DEFAULT_MAX_EXPIRY_IN_MILLIS
@@ -92,7 +92,7 @@ public class ExponentialBackOffSchedulin
      * @param backOffRate the back off rate to be used; not negative
      * @param initialExpiryInMillis the initial expiry in milli seconds; not negative
      * @param maxExpiryInMillis the upper limit of the delay in milli seconds; not negative
-     * @see org.apache.http.impl.client.cache.CacheConfig#getAsynchronousWorkersMax()
+     * @see org.apache.hc.client5.http.impl.client.cache.CacheConfig#getAsynchronousWorkersMax()
      * @see ExponentialBackOffSchedulingStrategy
      */
     public ExponentialBackOffSchedulingStrategy(

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FailureCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FailureCache.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/FailureCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FailureCache.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;
 
 /**
  * Increase and reset the number of errors associated with a specific

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FailureCacheValue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FailureCacheValue.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/FailureCacheValue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FailureCacheValue.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.annotation.Immutable;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FileResource.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FileResource.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/FileResource.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FileResource.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.File;
 import java.io.FileInputStream;
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.Resource;
 
 /**
  * Cache resource backed by a file.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FileResourceFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FileResourceFactory.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/FileResourceFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/FileResourceFactory.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.File;
 import java.io.FileOutputStream;
@@ -32,9 +32,9 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.client.cache.InputLimit;
-import org.apache.http.client.cache.Resource;
-import org.apache.http.client.cache.ResourceFactory;
+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;
 
 /**
  * Generates {@link Resource} instances whose body is stored in a temporary file.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HeapResource.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HeapResource.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/HeapResource.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HeapResource.java Sat Jan 16 10:33:24 2016
@@ -24,13 +24,13 @@
  * <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.InputStream;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.client.cache.Resource;
+import org.apache.hc.client5.http.client.cache.Resource;
 
 /**
  * Cache resource backed by a byte array on the heap.

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HeapResourceFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HeapResourceFactory.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/HeapResourceFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/HeapResourceFactory.java Sat Jan 16 10:33:24 2016
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.client.cache.InputLimit;
-import org.apache.http.client.cache.Resource;
-import org.apache.http.client.cache.ResourceFactory;
+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;
 
 /**
  * Generates {@link Resource} instances stored entirely in heap.




Mime
View raw message