Moved code to org.apache.hc.client5 namespace

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1724949 13f79535-47bb-0310-9956-ffa450edef68
cash · Jan 16, 2016 · dc86ba0 · dc86ba0
1 parent a4cd379
commit dc86ba0
Show file tree

Hide file tree

Showing 574 changed files with 2,328 additions and 2,316 deletions.
diff --git a/...pache/http/client/fluent/FluentAsync.java → ...p/examples/client/fluent/FluentAsync.java b/...pache/http/client/fluent/FluentAsync.java → ...p/examples/client/fluent/FluentAsync.java
@@ -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.util.LinkedList;
 import java.util.Queue;
@@ -33,6 +33,9 @@
 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.core5.concurrent.FutureCallback;
 
 /**

diff --git a/...he/http/client/fluent/FluentExecutor.java → ...xamples/client/fluent/FluentExecutor.java b/...he/http/client/fluent/FluentExecutor.java → ...xamples/client/fluent/FluentExecutor.java
@@ -24,10 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.examples.client.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.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ContentType;

diff --git a/.../http/client/fluent/FluentQuickStart.java → ...mples/client/fluent/FluentQuickStart.java b/.../http/client/fluent/FluentQuickStart.java → ...mples/client/fluent/FluentQuickStart.java
@@ -24,7 +24,10 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.examples.client.fluent;
+
+import org.apache.hc.client5.http.client.fluent.Form;
+import org.apache.hc.client5.http.client.fluent.Request;
 
 public class FluentQuickStart {
 

diff --git a/...he/http/client/fluent/FluentRequests.java → ...xamples/client/fluent/FluentRequests.java b/...he/http/client/fluent/FluentRequests.java → ...xamples/client/fluent/FluentRequests.java
@@ -24,10 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.examples.client.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.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.ContentType;

diff --git a/...client/fluent/FluentResponseHandling.java → ...client/fluent/FluentResponseHandling.java b/...client/fluent/FluentResponseHandling.java → ...client/fluent/FluentResponseHandling.java
@@ -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.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;
 

diff --git a/.../org/apache/http/client/fluent/Async.java → .../hc/client5/http/client/fluent/Async.java b/.../org/apache/http/client/fluent/Async.java → .../hc/client5/http/client/fluent/Async.java
@@ -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 {
 

diff --git a/...rg/apache/http/client/fluent/Content.java → ...c/client5/http/client/fluent/Content.java b/...rg/apache/http/client/fluent/Content.java → ...c/client5/http/client/fluent/Content.java
@@ -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;

diff --git a/...client/fluent/ContentResponseHandler.java → ...client/fluent/ContentResponseHandler.java b/...client/fluent/ContentResponseHandler.java → ...client/fluent/ContentResponseHandler.java
@@ -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
  */

diff --git a/...g/apache/http/client/fluent/Executor.java → .../client5/http/client/fluent/Executor.java b/...g/apache/http/client/fluent/Executor.java → .../client5/http/client/fluent/Executor.java
@@ -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 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 Executor clearCookies() {
      * 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(

diff --git a/...a/org/apache/http/client/fluent/Form.java → ...e/hc/client5/http/client/fluent/Form.java b/...a/org/apache/http/client/fluent/Form.java → ...e/hc/client5/http/client/fluent/Form.java
@@ -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;

diff --git a/...apache/http/client/fluent/HttpHeader.java → ...lient5/http/client/fluent/HttpHeader.java b/...apache/http/client/fluent/HttpHeader.java → ...lient5/http/client/fluent/HttpHeader.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.client.fluent;
+package org.apache.hc.client5.http.client.fluent;
 
 class HttpHeader {
 

diff --git a/...lient/fluent/InternalByteArrayEntity.java → ...lient/fluent/InternalByteArrayEntity.java b/...lient/fluent/InternalByteArrayEntity.java → ...lient/fluent/InternalByteArrayEntity.java
@@ -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;

diff --git a/...ttp/client/fluent/InternalFileEntity.java → ...ttp/client/fluent/InternalFileEntity.java b/...ttp/client/fluent/InternalFileEntity.java → ...ttp/client/fluent/InternalFileEntity.java
@@ -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;

diff --git a/...tp/client/fluent/InternalHttpRequest.java → ...tp/client/fluent/InternalHttpRequest.java b/...tp/client/fluent/InternalHttpRequest.java → ...tp/client/fluent/InternalHttpRequest.java
@@ -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.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

diff --git a/...ent/fluent/InternalInputStreamEntity.java → ...ent/fluent/InternalInputStreamEntity.java b/...ent/fluent/InternalInputStreamEntity.java → ...ent/fluent/InternalInputStreamEntity.java
@@ -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;

diff --git a/...rg/apache/http/client/fluent/Request.java → ...c/client5/http/client/fluent/Request.java b/...rg/apache/http/client/fluent/Request.java → ...c/client5/http/client/fluent/Request.java
@@ -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.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 {
 

diff --git a/...g/apache/http/client/fluent/Response.java → .../client5/http/client/fluent/Response.java b/...g/apache/http/client/fluent/Response.java → .../client5/http/client/fluent/Response.java
@@ -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.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 {
 

diff --git a/...ache/http/client/fluent/package-info.java → ...ent5/http/client/fluent/package-info.java b/...ache/http/client/fluent/package-info.java → ...ent5/http/client/fluent/package-info.java
@@ -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;
diff --git a/...apache/http/client/fluent/TestFluent.java → ...lient5/http/client/fluent/TestFluent.java b/...apache/http/client/fluent/TestFluent.java → ...lient5/http/client/fluent/TestFluent.java
@@ -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.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;

diff --git a/...ttp/client/cache/CacheResponseStatus.java → ...ttp/client/cache/CacheResponseStatus.java b/...ttp/client/cache/CacheResponseStatus.java → ...ttp/client/cache/CacheResponseStatus.java
@@ -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 {
 

diff --git a/...he/http/client/cache/HeaderConstants.java → ...t5/http/client/cache/HeaderConstants.java b/...he/http/client/cache/HeaderConstants.java → ...t5/http/client/cache/HeaderConstants.java
@@ -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;