You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/01/16 11:33:34 UTC
svn commit: r1724949 [8/10] - in /httpcomponents/httpclient/trunk:
fluent-hc/src/examples/org/apache/hc/
fluent-hc/src/examples/org/apache/hc/client5/
fluent-hc/src/examples/org/apache/hc/client5/http/
fluent-hc/src/examples/org/apache/hc/client5/http/...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ManagedHttpClientConnectionFactory.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
@@ -44,9 +44,9 @@ import org.apache.hc.core5.http.impl.Def
import org.apache.hc.core5.http.impl.io.DefaultHttpRequestWriterFactory;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
-import org.apache.http.conn.HttpConnectionFactory;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.HttpConnectionFactory;
+import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
/**
* Factory for {@link ManagedHttpClientConnection} instances.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/PoolingHttpClientConnectionManager.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
import java.io.Closeable;
import java.io.IOException;
@@ -54,18 +54,18 @@ import org.apache.hc.core5.pool.PoolStat
import org.apache.hc.core5.pool.io.ConnFactory;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
-import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.DnsResolver;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.HttpClientConnectionOperator;
-import org.apache.http.conn.HttpConnectionFactory;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.SchemePortResolver;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException;
+import org.apache.hc.client5.http.conn.ConnectionRequest;
+import org.apache.hc.client5.http.conn.DnsResolver;
+import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
+import org.apache.hc.client5.http.conn.HttpClientConnectionOperator;
+import org.apache.hc.client5.http.conn.HttpConnectionFactory;
+import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.conn.SchemePortResolver;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
/**
* {@code ClientConnectionPoolManager} maintains a pool of
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultDnsResolver.java Sat Jan 16 10:33:24 2016
@@ -24,12 +24,12 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.http.conn.DnsResolver;
+import org.apache.hc.client5.http.conn.DnsResolver;
/**
* DNS resolver that uses the default OS implementation for resolving host names.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/SystemDefaultRoutePlanner.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
import java.net.InetSocketAddress;
import java.net.Proxy;
@@ -39,10 +39,10 @@ import org.apache.hc.core5.http.HttpExce
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.conn.SchemePortResolver;
+import org.apache.hc.client5.http.conn.SchemePortResolver;
/**
- * {@link org.apache.http.conn.routing.HttpRoutePlanner} implementation
+ * {@link org.apache.hc.client5.http.conn.routing.HttpRoutePlanner} implementation
* based on {@link ProxySelector}. By default, this class will pick up
* the proxy settings of the JVM, either from system properties
* or from the browser running the application.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/Wire.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/package-info.java Sat Jan 16 10:33:24 2016
@@ -29,4 +29,4 @@
* Default implementations of client connection management
* functions.
*/
-package org.apache.http.impl.conn;
+package org.apache.hc.client5.http.impl.conn;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java Sat Jan 16 10:33:24 2016
@@ -24,13 +24,13 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Collection;
import java.util.HashMap;
@@ -34,9 +34,9 @@ import java.util.concurrent.ConcurrentHa
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.util.Asserts;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CookieSpec;
/**
* Abstract cookie specification which can delegate the job of parsing,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.io.Serializable;
import java.util.Date;
@@ -35,8 +35,8 @@ import java.util.Map;
import org.apache.hc.core5.annotation.NotThreadSafe;
import org.apache.hc.core5.util.Args;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
* Default implementation of {@link SetCookie}.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java Sat Jan 16 10:33:24 2016
@@ -24,20 +24,20 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Locale;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.http.conn.util.InetAddressUtils;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookieRestrictionViolationException;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.conn.util.InetAddressUtils;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookieRestrictionViolationException;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java Sat Jan 16 10:33:24 2016
@@ -24,17 +24,17 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Date;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java Sat Jan 16 10:33:24 2016
@@ -24,16 +24,16 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Date;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java Sat Jan 16 10:33:24 2016
@@ -24,17 +24,17 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookieRestrictionViolationException;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookieRestrictionViolationException;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java Sat Jan 16 10:33:24 2016
@@ -24,15 +24,15 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.ArrayList;
import java.util.HashMap;
@@ -36,11 +36,11 @@ import org.apache.hc.core5.annotation.Th
import org.apache.hc.core5.http.HeaderElement;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.util.Args;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
/**
* Cookie management functions shared by all specification.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java Sat Jan 16 10:33:24 2016
@@ -25,16 +25,16 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Collections;
import java.util.List;
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.http.Header;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
/**
* CookieSpec that ignores all cookies
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java Sat Jan 16 10:33:24 2016
@@ -25,15 +25,15 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.cookie.CookieSpec;
-import org.apache.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
/**
- * {@link org.apache.http.cookie.CookieSpecProvider} implementation that ignores all cookies.
+ * {@link org.apache.hc.client5.http.cookie.CookieSpecProvider} implementation that ignores all cookies.
*
* @since 4.4
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.BitSet;
import java.util.Calendar;
@@ -38,10 +38,10 @@ import java.util.regex.Pattern;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.http.message.ParserCursor;
import org.apache.hc.core5.util.Args;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Date;
import java.util.regex.Matcher;
@@ -33,10 +33,10 @@ import java.util.regex.Pattern;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java Sat Jan 16 10:33:24 2016
@@ -24,29 +24,29 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
-import org.apache.http.conn.util.PublicSuffixList;
-import org.apache.http.conn.util.PublicSuffixMatcher;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.cookie.SetCookie;
+import org.apache.hc.client5.http.conn.util.PublicSuffixList;
+import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.SetCookie;
/**
- * Wraps a {@link org.apache.http.cookie.CookieAttributeHandler} and leverages its match method
+ * Wraps a {@link org.apache.hc.client5.http.cookie.CookieAttributeHandler} and leverages its match method
* to never match a suffix from a black list. May be used to provide additional security for
* cross-site attack types by preventing cookies from apparent domains that are not publicly
* available.
*
- * @see org.apache.http.conn.util.PublicSuffixList
- * @see org.apache.http.conn.util.PublicSuffixMatcher
+ * @see org.apache.hc.client5.http.conn.util.PublicSuffixList
+ * @see org.apache.hc.client5.http.conn.util.PublicSuffixMatcher
*
* @since 4.4
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import java.util.ArrayList;
import java.util.BitSet;
@@ -46,13 +46,13 @@ import org.apache.hc.core5.http.message.
import org.apache.hc.core5.http.message.TokenParser;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.CharArrayBuffer;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieAttributeHandler;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookiePriorityComparator;
-import org.apache.http.cookie.CookieSpec;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookiePriorityComparator;
+import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
/**
* Cookie management functions shared by RFC C6265 compliant specification.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java Sat Jan 16 10:33:24 2016
@@ -25,9 +25,9 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
class RFC6265CookieSpecBase extends RFC6265CookieSpec {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java Sat Jan 16 10:33:24 2016
@@ -25,19 +25,19 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.conn.util.PublicSuffixMatcher;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookieSpec;
-import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.cookie.MalformedCookieException;
+import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.cookie.MalformedCookieException;
/**
- * {@link org.apache.http.cookie.CookieSpecProvider} implementation that provides an instance of
+ * {@link org.apache.hc.client5.http.cookie.CookieSpecProvider} implementation that provides an instance of
* RFC 6265 conformant cookie policy. The instance returned by this factory can be shared by
* multiple threads.
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java Sat Jan 16 10:33:24 2016
@@ -25,13 +25,13 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
/**
- * Standard {@link org.apache.http.cookie.CookieSpec} implementation that enforces a more relaxed
+ * Standard {@link org.apache.hc.client5.http.cookie.CookieSpec} implementation that enforces a more relaxed
* interpretation of the HTTP state management specification (RFC 6265, section 5)
* for interoperability with existing servers that do not conform to the well behaved profile
* (RFC 6265, section 4).
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java Sat Jan 16 10:33:24 2016
@@ -25,14 +25,14 @@
*
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
/**
- * Standard {@link org.apache.http.cookie.CookieSpec} implementation that enforces syntax
+ * Standard {@link org.apache.hc.client5.http.cookie.CookieSpec} implementation that enforces syntax
* and semantics of the well-behaved profile of the HTTP state management specification
* (RFC 6265, section 4).
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java Sat Jan 16 10:33:24 2016
@@ -29,4 +29,4 @@
* Default implementations of standard and common HTTP state
* management policies.
*/
-package org.apache.http.impl.cookie;
+package org.apache.hc.client5.http.impl.cookie;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/BackoffStrategyExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
@@ -33,13 +33,13 @@ import java.lang.reflect.UndeclaredThrow
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.util.Args;
-import org.apache.http.client.BackoffManager;
-import org.apache.http.client.ConnectionBackoffStrategy;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.BackoffManager;
+import org.apache.hc.client5.http.client.ConnectionBackoffStrategy;
+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;
/**
* @since 4.3
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ClientExecChain.java Sat Jan 16 10:33:24 2016
@@ -25,16 +25,16 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import org.apache.hc.core5.http.HttpException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.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;
/**
* This interface represents an element in the HTTP request execution chain. Each element can
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ConnectionHolder.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.Closeable;
import java.io.IOException;
@@ -36,8 +36,8 @@ import org.apache.commons.logging.Log;
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.concurrent.Cancellable;
import org.apache.hc.core5.http.io.HttpClientConnection;
-import org.apache.http.conn.ConnectionReleaseTrigger;
-import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.hc.client5.http.conn.ConnectionReleaseTrigger;
+import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
/**
* Internal connection holder.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/HttpResponseProxy.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.util.Iterator;
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.HttpEnti
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.StatusLine;
-import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
/**
* A proxy class for {@link org.apache.hc.core5.http.HttpResponse} that can be used to release client connection
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MainClientExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -52,25 +52,25 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.util.Args;
-import org.apache.http.auth.AuthExchange;
-import org.apache.http.auth.ChallengeType;
-import org.apache.http.client.AuthenticationStrategy;
-import org.apache.http.client.NonRepeatableRequestException;
-import org.apache.http.client.UserTokenHandler;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.routing.BasicRouteDirector;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.routing.HttpRouteDirector;
-import org.apache.http.conn.routing.RouteTracker;
-import org.apache.http.impl.auth.HttpAuthenticator;
-import org.apache.http.impl.conn.ConnectionShutdownException;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.ChallengeType;
+import org.apache.hc.client5.http.client.AuthenticationStrategy;
+import org.apache.hc.client5.http.client.NonRepeatableRequestException;
+import org.apache.hc.client5.http.client.UserTokenHandler;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+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.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.conn.ConnectionRequest;
+import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
+import org.apache.hc.client5.http.conn.routing.BasicRouteDirector;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.routing.HttpRouteDirector;
+import org.apache.hc.client5.http.conn.routing.RouteTracker;
+import org.apache.hc.client5.http.impl.auth.HttpAuthenticator;
+import org.apache.hc.client5.http.impl.conn.ConnectionShutdownException;
/**
* The last request executor in the HTTP request execution chain
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/MinimalClientExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -54,19 +54,19 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.http.protocol.RequestUserAgent;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.VersionInfo;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.protocol.RequestClientConnControl;
-import org.apache.http.client.utils.URIUtils;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.conn.ConnectionShutdownException;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+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.methods.HttpUriRequest;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.protocol.RequestClientConnControl;
+import org.apache.hc.client5.http.client.utils.URIUtils;
+import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.conn.ConnectionRequest;
+import org.apache.hc.client5.http.conn.HttpClientConnectionManager;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.impl.conn.ConnectionShutdownException;
/**
* Request executor that implements the most fundamental aspects of
@@ -102,7 +102,7 @@ public class MinimalClientExec implement
new RequestTargetHost(),
new RequestClientConnControl(),
new RequestUserAgent(VersionInfo.getUserAgent(
- "Apache-HttpClient", "org.apache.http.client", getClass())));
+ "Apache-HttpClient", "org.apache.hc.client5", getClass())));
this.requestExecutor = requestExecutor;
this.connManager = connManager;
this.reuseStrategy = reuseStrategy;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ProtocolExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.net.URI;
@@ -41,17 +41,17 @@ import org.apache.hc.core5.http.Protocol
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.util.Args;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.CredentialsProvider;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsStore;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIUtils;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.client.CredentialsStore;
+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.methods.HttpUriRequest;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.utils.URIUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
/**
* Request executor in the request execution chain that is responsible
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RedirectExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.net.URI;
@@ -40,18 +40,18 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.util.Args;
-import org.apache.http.auth.AuthExchange;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.client.RedirectException;
-import org.apache.http.client.RedirectStrategy;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIUtils;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.routing.HttpRoutePlanner;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.client.RedirectException;
+import org.apache.hc.client5.http.client.RedirectStrategy;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.utils.URIUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.routing.HttpRoutePlanner;
/**
* Request executor in the request execution chain that is responsible
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestAbortedException.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.InterruptedIOException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestEntityProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestEntityProxy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestEntityProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RequestEntityProxy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.io.InputStream;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ResponseEntityProxy.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.io.InputStream;
@@ -36,8 +36,8 @@ import org.apache.hc.core5.annotation.No
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.entity.HttpEntityWrapper;
-import org.apache.http.conn.EofSensorInputStream;
-import org.apache.http.conn.EofSensorWatcher;
+import org.apache.hc.client5.http.conn.EofSensorInputStream;
+import org.apache.hc.client5.http.conn.EofSensorWatcher;
/**
* A wrapper class for {@link HttpEntity} enclosed in a response message.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/RetryExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
@@ -36,13 +36,13 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.NoHttpResponseException;
import org.apache.hc.core5.util.Args;
-import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.NonRepeatableRequestException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.HttpRequestRetryHandler;
+import org.apache.hc.client5.http.client.NonRepeatableRequestException;
+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;
/**
* Request executor in the request execution chain that is responsible
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/ServiceUnavailableRetryExec.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -36,12 +36,12 @@ import org.apache.hc.core5.annotation.Im
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.util.Args;
-import org.apache.http.client.ServiceUnavailableRetryStrategy;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.ServiceUnavailableRetryStrategy;
+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;
/**
* Request executor in the request execution chain that is responsible
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/TunnelRefusedException.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.http.HttpException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/execchain/package-info.java Sat Jan 16 10:33:24 2016
@@ -28,4 +28,4 @@
/**
* HTTP request execution chain APIs.
*/
-package org.apache.http.impl.execchain;
+package org.apache.hc.client5.http.impl.execchain;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.auth;
+package org.apache.hc.client5.http.auth;
import java.util.Arrays;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java Sat Jan 16 10:33:24 2016
@@ -24,14 +24,14 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.auth;
+package org.apache.hc.client5.http.auth;
import org.apache.hc.core5.http.HttpHost;
import org.junit.Assert;
import org.junit.Test;
/**
- * Tests for {@link org.apache.http.auth.AuthScope}.
+ * Tests for {@link org.apache.hc.client5.http.auth.AuthScope}.
*/
public class TestAuthScope {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.auth;
+package org.apache.hc.client5.http.auth;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.auth.util;
+package org.apache.hc.client5.http.auth.util;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/config/TestRequestConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/config/TestRequestConfig.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/config/TestRequestConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/config/TestRequestConfig.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.config;
+package org.apache.hc.client5.http.client.config;
import java.net.InetAddress;
import java.util.Arrays;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDecompressingEntity.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDecompressingEntity.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.entity;
+package org.apache.hc.client5.http.client.entity;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDeflate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDeflate.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDeflate.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestDeflate.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.entity;
+package org.apache.hc.client5.http.client.entity;
import java.nio.charset.StandardCharsets;
import java.util.zip.Deflater;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestEntityBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestEntityBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestEntityBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestEntityBuilder.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.entity;
+package org.apache.hc.client5.http.client.entity;
import java.io.File;
import java.io.InputStream;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestGZip.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestGZip.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestGZip.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/entity/TestGZip.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.entity;
+package org.apache.hc.client5.http.client.entity;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpOptions.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpOptions.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpOptions.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpOptions.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.methods;
+package org.apache.hc.client5.http.client.methods;
import java.util.Set;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpRequestBase.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestHttpRequestBase.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.methods;
+package org.apache.hc.client5.http.client.methods;
import org.apache.hc.core5.http.HttpVersion;
import org.junit.Assert;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestRequestBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/methods/TestRequestBuilder.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.methods;
+package org.apache.hc.client5.http.client.methods;
import java.net.URI;
import java.util.List;
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.entity.E
import org.apache.hc.core5.http.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicHeader;
import org.apache.hc.core5.http.message.BasicNameValuePair;
-import org.apache.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.config.RequestConfig;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAcceptEncoding.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAcceptEncoding.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpRequest;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAddCookies.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAddCookies.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import java.util.Date;
@@ -36,20 +36,20 @@ import org.apache.hc.core5.http.config.L
import org.apache.hc.core5.http.config.RegistryBuilder;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.routing.RouteInfo.LayerType;
-import org.apache.http.conn.routing.RouteInfo.TunnelType;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookieSpec;
-import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.apache.http.impl.cookie.IgnoreSpecProvider;
-import org.apache.http.impl.cookie.RFC6265CookieSpecProvider;
-import org.apache.http.impl.cookie.RFC6265StrictSpec;
+import org.apache.hc.client5.http.client.CookieStore;
+import org.apache.hc.client5.http.client.config.CookieSpecs;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.routing.RouteInfo.LayerType;
+import org.apache.hc.client5.http.conn.routing.RouteInfo.TunnelType;
+import org.apache.hc.client5.http.cookie.CookieOrigin;
+import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.impl.client.BasicCookieStore;
+import org.apache.hc.client5.http.impl.cookie.BasicClientCookie;
+import org.apache.hc.client5.http.impl.cookie.IgnoreSpecProvider;
+import org.apache.hc.client5.http.impl.cookie.RFC6265CookieSpecProvider;
+import org.apache.hc.client5.http.impl.cookie.RFC6265StrictSpec;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAuthCache.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAuthCache.java Sat Jan 16 10:33:24 2016
@@ -24,22 +24,22 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.http.auth.AuthExchange;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.client.AuthCache;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+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.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestClientConnControl.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestClientConnControl.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HeaderElements;
@@ -33,9 +33,9 @@ import org.apache.hc.core5.http.HttpHost
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.routing.RouteInfo.LayerType;
-import org.apache.http.conn.routing.RouteInfo.TunnelType;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.routing.RouteInfo.LayerType;
+import org.apache.hc.client5.http.conn.routing.RouteInfo.TunnelType;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestDefaultHeaders.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestDefaultHeaders.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import java.util.ArrayList;
import java.util.List;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestExpectContinue.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestExpectContinue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestExpectContinue.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import java.nio.charset.StandardCharsets;
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.entity.S
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.config.RequestConfig;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestResponseContentEncoding.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestResponseContentEncoding.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.client.protocol;
+package org.apache.hc.client5.http.client.protocol;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
@@ -35,9 +35,9 @@ import org.apache.hc.core5.http.entity.S
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.DecompressingEntity;
-import org.apache.http.client.entity.GzipDecompressingEntity;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.entity.DecompressingEntity;
+import org.apache.hc.client5.http.client.entity.GzipDecompressingEntity;
import org.junit.Assert;
import org.junit.Test;