hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [2/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/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java (from r1724949, httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentAsync.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentAsync.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentAsync.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client.fluent;
+package org.apache.hc.client5.http.examples.fluent;
 
 import java.util.LinkedList;
 import java.util.Queue;
@@ -33,9 +33,9 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.hc.client5.http.client.fluent.Async;
-import org.apache.hc.client5.http.client.fluent.Content;
-import org.apache.hc.client5.http.client.fluent.Request;
+import org.apache.hc.client5.http.fluent.Async;
+import org.apache.hc.client5.http.fluent.Content;
+import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.concurrent.FutureCallback;
 
 /**

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java (from r1724949, httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentExecutor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentExecutor.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentExecutor.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client.fluent;
+package org.apache.hc.client5.http.examples.fluent;
 
 import java.io.File;
 
-import org.apache.hc.client5.http.client.fluent.Executor;
-import org.apache.hc.client5.http.client.fluent.Form;
-import org.apache.hc.client5.http.client.fluent.Request;
+import org.apache.hc.client5.http.fluent.Executor;
+import org.apache.hc.client5.http.fluent.Form;
+import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ContentType;

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java (from r1724949, httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentQuickStart.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentQuickStart.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentQuickStart.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java Sat Jan 16 12:58:34 2016
@@ -24,10 +24,10 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client.fluent;
+package org.apache.hc.client5.http.examples.fluent;
 
-import org.apache.hc.client5.http.client.fluent.Form;
-import org.apache.hc.client5.http.client.fluent.Request;
+import org.apache.hc.client5.http.fluent.Form;
+import org.apache.hc.client5.http.fluent.Request;
 
 public class FluentQuickStart {
 

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java (from r1724949, httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentRequests.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentRequests.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentRequests.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client.fluent;
+package org.apache.hc.client5.http.examples.fluent;
 
 import java.io.File;
 
-import org.apache.hc.client5.http.client.fluent.Form;
-import org.apache.hc.client5.http.client.fluent.Request;
+import org.apache.hc.client5.http.fluent.Form;
+import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ContentType;

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java (from r1724949, httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/fluent/FluentResponseHandling.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.examples.client.fluent;
+package org.apache.hc.client5.http.examples.fluent;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -34,14 +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.client5.http.fluent.Request;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.protocol.HttpResponseException;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 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.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;
 

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Async.java (from r1724949, 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/fluent/Async.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Async.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Async.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/Async.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.util.concurrent.Future;
 
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.concurrent.BasicFuture;
 import org.apache.hc.core5.concurrent.FutureCallback;
-import org.apache.hc.client5.http.client.ResponseHandler;
 
 public class Async {
 

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

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java (from r1724949, 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/fluent/ContentResponseHandler.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/ContentResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/ContentResponseHandler.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.impl.sync.AbstractResponseHandler;
 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.hc.client5.http.impl.client.AbstractResponseHandler;
 
 /**
- * {@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}
+ * {@link org.apache.hc.client5.http.sync.ResponseHandler} implementation that converts
+ * {@link org.apache.hc.core5.http.HttpResponse} messages to {@link Content}
  * instances.
  *
- * @see org.apache.hc.client5.http.client.fluent.Content
+ * @see Content
  *
  * @since 4.4
  */

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Executor.java (from r1724949, 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/fluent/Executor.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Executor.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Executor.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/Executor.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.IOException;
 import java.security.KeyManagementException;
@@ -33,28 +33,28 @@ import java.util.concurrent.TimeUnit;
 
 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.hc.client5.http.auth.AuthCache;
 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.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.cookie.CookieStore;
+import org.apache.hc.client5.http.impl.auth.BasicAuthCache;
 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;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.sync.HttpClientBuilder;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLInitializationException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
 
 /**
  * An Executor for fluent requests.
@@ -66,7 +66,7 @@ import org.apache.hc.client5.http.impl.c
 public class Executor {
 
     final static PoolingHttpClientConnectionManager CONNMGR;
-    final static HttpClient CLIENT;
+    final static CloseableHttpClient CLIENT;
 
     static {
         LayeredConnectionSocketFactory ssl = null;
@@ -100,16 +100,16 @@ public class Executor {
         return new Executor(CLIENT);
     }
 
-    public static Executor newInstance(final HttpClient httpclient) {
+    public static Executor newInstance(final CloseableHttpClient httpclient) {
         return new Executor(httpclient != null ? httpclient : CLIENT);
     }
 
-    private final HttpClient httpclient;
+    private final CloseableHttpClient httpclient;
     private final AuthCache authCache;
     private volatile CredentialsStore credentialsStore;
     private volatile CookieStore cookieStore;
 
-    Executor(final HttpClient httpclient) {
+    Executor(final CloseableHttpClient httpclient) {
         super();
         this.httpclient = httpclient;
         this.authCache = new BasicAuthCache();
@@ -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.hc.client5.http.client.ResponseHandler)
+     * @see Response#handleResponse(org.apache.hc.client5.http.sync.ResponseHandler)
      * @see Response#discardContent()
      */
     public Response execute(

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

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

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java (from r1724949, 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/fluent/InternalByteArrayEntity.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalByteArrayEntity.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/InternalByteArrayEntity.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java (from r1724949, 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/fluent/InternalFileEntity.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalFileEntity.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/InternalFileEntity.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.File;
 import java.io.FileInputStream;

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java (from r1724949, 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/fluent/InternalHttpRequest.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalHttpRequest.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/InternalHttpRequest.java Sat Jan 16 12:58:34 2016
@@ -25,12 +25,16 @@
  *
  */
 
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.methods.Configurable;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpUriRequest;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.concurrent.Cancellable;
 import org.apache.hc.core5.http.HttpVersion;
@@ -39,10 +43,6 @@ 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.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

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java (from r1724949, 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/fluent/InternalInputStreamEntity.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/InternalInputStreamEntity.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/InternalInputStreamEntity.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Request.java (from r1724949, 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/fluent/Request.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Request.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Request.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/Request.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,6 +40,18 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
+import org.apache.hc.client5.http.methods.Configurable;
+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.HttpPatch;
+import org.apache.hc.client5.http.methods.HttpPost;
+import org.apache.hc.client5.http.methods.HttpPut;
+import org.apache.hc.client5.http.methods.HttpTrace;
+import org.apache.hc.client5.http.utils.URLEncodedUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -49,18 +61,6 @@ 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.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 {
 
@@ -154,7 +154,7 @@ public class Request {
     }
 
     HttpResponse internalExecute(
-            final HttpClient client,
+            final CloseableHttpClient client,
             final HttpContext localContext) throws IOException {
         final RequestConfig.Builder builder;
         if (client instanceof Configurable) {

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Response.java (from r1724949, 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/fluent/Response.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/Response.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/Response.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/Response.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.hc.client5.http.protocol.HttpResponseException;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 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.ByteArrayEntity;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.HttpResponseException;
-import org.apache.hc.client5.http.client.ResponseHandler;
 
 public class Response {
 

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/package-info.java (from r1724949, 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/fluent/package-info.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/fluent/package-info.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/hc/client5/http/client/fluent/package-info.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/package-info.java Sat Jan 16 12:58:34 2016
@@ -29,4 +29,4 @@
  * Simple facade APIs for HttpClient based on the concept of
  * a fluent interface.
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;

Copied: httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java (from r1724949, 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/fluent/TestFluent.java?p2=httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java&p1=httpcomponents/httpclient/trunk/fluent-hc/src/test/java/org/apache/hc/client5/http/client/fluent/TestFluent.java&r1=1724949&r2=1724967&rev=1724967&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/fluent/TestFluent.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.fluent;
+package org.apache.hc.client5.http.fluent;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.Charset;
 
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
+import org.apache.hc.client5.http.sync.ResponseHandler;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
@@ -41,9 +44,6 @@ import org.apache.hc.core5.http.entity.E
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.client.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;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java (from r1724949, 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/cache/CacheResponseStatus.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/CacheResponseStatus.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheResponseStatus.java Sat Jan 16 12:58:34 2016
@@ -24,15 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.cache;
+package org.apache.hc.client5.http.cache;
 
 /**
  * This enumeration represents the various ways a response can be generated
- * 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}
+ * by the caching {@link org.apache.hc.client5.http.sync.HttpClient};
+ * if a request is executed with an {@link HttpCacheContext}
  * then a parameter with one of these values will be registered in the
- * context under the key
- * {@link org.apache.hc.client5.http.impl.client.cache.CachingHttpClient#CACHE_RESPONSE_STATUS}.
+ * context under the key  {@link HttpCacheContext#CACHE_RESPONSE_STATUS}.
  */
 public enum CacheResponseStatus {
 

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

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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java (from r1724949, 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/cache/HttpCacheEntry.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheEntry.java&r1=1724949&r2=1724967&rev=1724967&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/cache/HttpCacheEntry.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.cache;
+package org.apache.hc.client5.http.cache;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -33,6 +33,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -40,7 +41,6 @@ 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.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.hc.client5.http.client.cache.HttpCacheStorage} where that
+     * {@link 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.
      */

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

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

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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java (from r1724949, 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/cache/HttpCacheStorage.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheStorage.java&r1=1724949&r2=1724967&rev=1724967&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/cache/HttpCacheStorage.java Sat Jan 16 12:58:34 2016
@@ -24,15 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.cache;
+package org.apache.hc.client5.http.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.hc.client5.http.impl.client.cache.CachingHttpClient}
- * implementation.
+ * interface. They can then be plugged into the existing caching
+ * {@link org.apache.hc.client5.http.sync.HttpClient} implementation.
  *
  * @since 4.1
  */

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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java (from r1724949, 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/cache/HttpCacheUpdateException.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/client/cache/HttpCacheUpdateException.java&r1=1724949&r2=1724967&rev=1724967&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/cache/HttpCacheUpdateException.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.cache;
+package org.apache.hc.client5.http.cache;
 
 /**
  * Signals that {@link HttpCacheStorage} encountered an error performing an

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

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

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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java (from r1724949, 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/cache/AsynchronousValidationRequest.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidationRequest.java&r1=1724949&r2=1724967&rev=1724967&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/cache/AsynchronousValidationRequest.java Sat Jan 16 12:58:34 2016
@@ -24,22 +24,22 @@
  * <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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+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.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpResponse;
-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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java (from r1724949, 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/cache/AsynchronousValidator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/AsynchronousValidator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/AsynchronousValidator.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.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.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;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 
 /**
  * Class used for asynchronous revalidations to be used when the "stale-

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java (from r1724949, 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/cache/BasicHttpCache.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCache.java&r1=1724949&r2=1724967&rev=1724967&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/cache/BasicHttpCache.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.util.Arrays;
@@ -36,6 +36,16 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheInvalidator;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.cache.Resource;
+import org.apache.hc.client5.http.cache.ResourceFactory;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
@@ -45,16 +55,6 @@ 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.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<>(

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java (from r1724949, 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/cache/BasicHttpCacheStorage.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicHttpCacheStorage.java&r1=1724949&r2=1724967&rev=1724967&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/cache/BasicHttpCacheStorage.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;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.cache.HttpCacheUpdateCallback;
 import org.apache.hc.core5.annotation.ThreadSafe;
-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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java (from r1724949, 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/cache/BasicIdGenerator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/BasicIdGenerator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/BasicIdGenerator.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.net.InetAddress;
 import java.net.UnknownHostException;

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java (from r1724949, 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/cache/CacheConfig.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheConfig.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheConfig.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,12 @@
  * <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.util.Args;
 
 /**
- * <p>Java Beans-style configuration for caching {@link org.apache.hc.client5.http.client.HttpClient}.
+ * <p>Java Beans-style configuration for caching {@link org.apache.hc.client5.http.sync.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,14 +38,14 @@ 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.hc.client5.http.client.HttpClient} used as the &quot;backend&quot;
+ * {@link org.apache.hc.client5.http.sync.HttpClient} used as the &quot;backend&quot;
  * for the {@code CachingHttpClient}.</p>
  *
  * <p>Cache configuration can be grouped into the following categories:</p>
  *
  * <p><b>Cache size.</b> If the backend storage supports these limits, you
  * can specify the {@link CacheConfig#getMaxCacheEntries maximum number of
- * cache entries} as well as the {@link CacheConfig#getMaxObjectSizeBytes
+ * cache entries} as well as the {@link CacheConfig#getMaxObjectSize()}
  * maximum cacheable response body size}.</p>
  *
  * <p><b>Public/private caching.</b> By default, the caching module considers
@@ -54,7 +54,7 @@ import org.apache.hc.core5.util.Args;
  * marked with {@code Cache-Control: private}. If, however, the cache
  * is only going to be used by one logical "user" (behaving similarly to a
  * browser cache), then you will want to {@link
- * CacheConfig#setSharedCache(boolean) turn off the shared cache setting}.</p>
+ * CacheConfig#isSharedCache()}  turn off the shared cache setting}.</p>
  *
  * <p><b>303 caching</b>. RFC2616 explicitly disallows caching 303 responses;
  * however, the HTTPbis working group says they can be cached

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java (from r1724949, 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/cache/CacheEntity.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntity.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheEntity.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;
@@ -32,13 +32,13 @@ import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Set;
 
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.TrailerSupplier;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
 
 @Immutable
 class CacheEntity implements HttpEntity, Serializable {

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java (from r1724949, 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/cache/CacheEntryUpdater.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheEntryUpdater.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheEntryUpdater.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.util.ArrayList;
@@ -33,17 +33,17 @@ import java.util.Date;
 import java.util.List;
 import java.util.ListIterator;
 
+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.cache.ResourceFactory;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.util.Args;
-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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java (from r1724949, 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/cache/CacheInvalidator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheInvalidator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheInvalidator.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.net.MalformedURLException;
@@ -33,17 +33,17 @@ import java.util.Date;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheInvalidator;
+import org.apache.hc.client5.http.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java (from r1724949, 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/cache/CacheKeyGenerator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheKeyGenerator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheKeyGenerator.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.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -36,14 +36,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.utils.URIUtils;
 import org.apache.hc.core5.annotation.Immutable;
 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.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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java (from r1724949, 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/cache/CacheMap.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheMap.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheMap.java Sat Jan 16 12:58:34 2016
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.cache;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
 
 final class CacheMap extends LinkedHashMap<String, HttpCacheEntry> {
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java (from r1724949, 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/cache/CacheValidityPolicy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheValidityPolicy.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheValidityPolicy.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.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 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.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

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java (from r1724949, 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/cache/CacheableRequestPolicy.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CacheableRequestPolicy.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CacheableRequestPolicy.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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.cache.HeaderConstants;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElement;
 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.client5.http.client.cache.HeaderConstants;
 
 /**
  * Determines if an HttpRequest is allowed to be served from the cache.

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java (from r1724949, 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/cache/CachedHttpResponseGenerator.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedHttpResponseGenerator.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CachedHttpResponseGenerator.java Sat Jan 16 12:58:34 2016
@@ -24,10 +24,15 @@
  * <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.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
@@ -37,11 +42,6 @@ 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.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}

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java (from r1724949, 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/cache/CachedResponseSuitabilityChecker.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/client/cache/CachedResponseSuitabilityChecker.java&r1=1724949&r2=1724967&rev=1724967&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/cache/CachedResponseSuitabilityChecker.java Sat Jan 16 12:58:34 2016
@@ -24,21 +24,21 @@
  * <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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.cache.HeaderConstants;
+import org.apache.hc.client5.http.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.utils.DateUtils;
 import org.apache.hc.core5.annotation.Immutable;
 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.hc.core5.http.HttpStatus;
-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



Mime
View raw message