hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724967 [6/11] - in /httpcomponents/httpclient/trunk: fluent-hc/src/examples/org/apache/hc/client5/http/examples/client/ fluent-hc/src/examples/org/apache/hc/client5/http/examples/fluent/ fluent-hc/src/main/java/org/apache/hc/client5/http/...
Date Sat, 16 Jan 2016 12:58:42 GMT
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,8 +32,8 @@ import java.io.InputStream;
 import org.apache.hc.core5.http.HttpEntity;
 
 /**
- * {@link org.apache.hc.client5.http.entity.HttpEntityWrapper} responsible for handling
- * deflate Content Coded responses. In RFC2616 terms, {@code deflate}
+ * {@link org.apache.hc.core5.http.entity.HttpEntityWrapper} responsible for
+ * handling deflate Content Coded responses. In RFC2616 terms, {@code deflate}
  * means a {@code zlib} stream as defined in RFC1950. Some server
  * implementations have misinterpreted RFC2616 to mean that a
  * {@code deflate} stream as defined in RFC1951 should be used

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.File;
 import java.io.InputStream;
@@ -57,7 +57,7 @@ import org.apache.hc.core5.http.entity.S
  *   <li>{@link #setStream(java.io.InputStream)}</li>
  *   <li>{@link #setSerializable(java.io.Serializable)}</li>
  *   <li>{@link #setParameters(java.util.List)}</li>
- *   <li>{@link #setParameters#setParameters(NameValuePair...)}</li>
+ *   <li>{@link #setParameters(NameValuePair...)}</li>
  *   <li>{@link #setFile(java.io.File)}</li>
  * </ul>
  *

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 /*
  * ====================================================================

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,7 +33,7 @@ import java.util.zip.GZIPInputStream;
 import org.apache.hc.core5.http.HttpEntity;
 
 /**
- * {@link org.apache.hc.client5.http.entity.HttpEntityWrapper} for handling gzip
+ * {@link org.apache.hc.core5.http.entity.HttpEntityWrapper} for handling gzip
  * Content Coded responses.
  *
  * @since 4.1

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java Sat Jan 16 12:58:34 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.hc.client5.http.utils.URLEncodedUtils;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.client5.http.client.utils.URLEncodedUtils;
 
 /**
  * An entity composed of a list of url-encoded pairs.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/entity/package-info.java Sat Jan 16 12:58:34 2016
@@ -28,4 +28,4 @@
 /**
  * Client specific HTTP entity implementations.
  */
-package org.apache.hc.client5.http.client.entity;
+package org.apache.hc.client5.http.entity;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicResponseHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java Sat Jan 16 12:58:34 2016
@@ -25,25 +25,26 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl;
 
 import java.io.IOException;
 
+import org.apache.hc.client5.http.impl.sync.AbstractResponseHandler;
+import org.apache.hc.client5.http.protocol.ClientProtocolException;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.client5.http.client.ClientProtocolException;
 
 /**
- * A {@link org.apache.hc.client5.http.client.ResponseHandler} that returns the response body as a String
+ * A {@link org.apache.hc.client5.http.sync.ResponseHandler} that returns the response body as a String
  * for successful (2xx) responses. If the response code was &gt;= 300, the response
- * body is consumed and an {@link org.apache.hc.client5.http.client.HttpResponseException} is thrown.
+ * body is consumed and an {@link org.apache.hc.client5.http.protocol.HttpResponseException} is thrown.
  * <p>
  * If this is used with
- * {@link org.apache.hc.client5.http.client.HttpClient#execute(
- *  org.apache.hc.client5.http.client.methods.HttpUriRequest, org.apache.hc.client5.http.client.ResponseHandler)},
+ * {@link org.apache.hc.client5.http.sync.HttpClient#execute(
+ *  org.apache.hc.client5.http.methods.HttpUriRequest, org.apache.hc.client5.http.sync.ResponseHandler)},
  * HttpClient may handle redirects (3xx responses) internally.
  * </p>
  *

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultConnectionKeepAliveStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultConnectionKeepAliveStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/DefaultConnectionKeepAliveStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java Sat Jan 16 12:58:34 2016
@@ -24,10 +24,11 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl;
 
 import java.util.Iterator;
 
+import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HeaderElement;
 import org.apache.hc.core5.http.HeaderElements;
@@ -35,7 +36,6 @@ import org.apache.hc.core5.http.HttpResp
 import org.apache.hc.core5.http.message.BasicHeaderElementIterator;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy;
 
 /**
  * Default implementation of a strategy deciding duration

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultSchemePortResolver.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultSchemePortResolver.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultSchemePortResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java Sat Jan 16 12:58:34 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl;
 
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.UnsupportedSchemeException;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.UnsupportedSchemeException;
 
 /**
  * Default {@link SchemePortResolver}.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/InMemoryDnsResolver.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/InMemoryDnsResolver.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/InMemoryDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -34,8 +34,8 @@ import java.util.concurrent.ConcurrentHa
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.conn.DnsResolver;
 
 /**
  * In-memory {@link DnsResolver} implementation.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java Sat Jan 16 12:58:34 2016
@@ -31,12 +31,12 @@ import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
 
+import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.ParseException;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.http.message.ParserCursor;
 import org.apache.hc.core5.http.message.TokenParser;
-import org.apache.hc.client5.http.auth.AuthChallenge;
 
 public class AuthChallengeParser {
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicAuthCache.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicAuthCache.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/BasicAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.auth;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -37,17 +37,17 @@ import java.util.concurrent.ConcurrentHa
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.UnsupportedSchemeException;
+import org.apache.hc.client5.http.auth.AuthCache;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.client.AuthCache;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.UnsupportedSchemeException;
-import org.apache.hc.client5.http.impl.conn.DefaultSchemePortResolver;
 
 /**
- * Default implementation of {@link org.apache.hc.client5.http.client.AuthCache}. This implements
+ * Default implementation of {@link AuthCache}. This implements
  * expects {@link org.apache.hc.client5.http.auth.AuthScheme} to be {@link java.io.Serializable}
  * in order to be cacheable.
  * <p>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java Sat Jan 16 12:58:34 2016
@@ -40,13 +40,6 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.util.Args;
-import org.apache.hc.core5.util.CharsetUtils;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthScope;
@@ -55,6 +48,13 @@ import org.apache.hc.client5.http.auth.C
 import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.auth.MalformedChallengeException;
 import org.apache.hc.client5.http.auth.util.ByteArrayBuilder;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.CharsetUtils;
 
 /**
  * Basic authentication scheme as defined in RFC 2617.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -29,10 +29,10 @@ package org.apache.hc.client5.http.impl.
 
 import java.nio.charset.Charset;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java Sat Jan 16 12:58:34 2016
@@ -43,6 +43,14 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.apache.hc.client5.http.auth.AuthChallenge;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthenticationException;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.auth.MalformedChallengeException;
+import org.apache.hc.client5.http.auth.util.ByteArrayBuilder;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
@@ -54,14 +62,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.CharArrayBuffer;
 import org.apache.hc.core5.util.CharsetUtils;
-import org.apache.hc.client5.http.auth.AuthChallenge;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.AuthenticationException;
-import org.apache.hc.client5.http.auth.Credentials;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.auth.MalformedChallengeException;
-import org.apache.hc.client5.http.auth.util.ByteArrayBuilder;
 
 /**
  * Digest authentication scheme as defined in RFC 2617.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -27,10 +27,10 @@
 
 package org.apache.hc.client5.http.impl.auth;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java Sat Jan 16 12:58:34 2016
@@ -33,11 +33,8 @@ import java.util.Locale;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.util.Args;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthScope;
@@ -47,8 +44,11 @@ import org.apache.hc.client5.http.auth.C
 import org.apache.hc.client5.http.auth.InvalidCredentialsException;
 import org.apache.hc.client5.http.auth.KerberosCredentials;
 import org.apache.hc.client5.http.auth.MalformedChallengeException;
-import org.apache.hc.client5.http.conn.DnsResolver;
-import org.apache.hc.client5.http.impl.conn.SystemDefaultDnsResolver;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.util.Args;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java Sat Jan 16 12:58:34 2016
@@ -37,6 +37,17 @@ import java.util.Queue;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.auth.AuthCache;
+import org.apache.hc.client5.http.auth.AuthChallenge;
+import org.apache.hc.client5.http.auth.AuthExchange;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthenticationException;
+import org.apache.hc.client5.http.auth.ChallengeType;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.auth.MalformedChallengeException;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.protocol.AuthenticationStrategy;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.FormattedHeader;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpException;
@@ -51,18 +62,6 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Asserts;
 import org.apache.hc.core5.util.CharArrayBuffer;
-import org.apache.hc.client5.http.auth.AuthChallenge;
-import org.apache.hc.client5.http.auth.AuthExchange;
-import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthenticationException;
-import org.apache.hc.client5.http.auth.ChallengeType;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.auth.MalformedChallengeException;
-import org.apache.hc.client5.http.client.AuthCache;
-import org.apache.hc.client5.http.client.AuthenticationStrategy;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.impl.client.BasicAuthCache;
 
 /**
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java Sat Jan 16 12:58:34 2016
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.http.impl.auth;
 
+import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.client5.http.conn.DnsResolver;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.Oid;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -26,11 +26,11 @@
  */
 package org.apache.hc.client5.http.impl.auth;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.conn.DnsResolver;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java Sat Jan 16 12:58:34 2016
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.http.impl.auth;
 
-import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.client5.http.auth.AuthenticationException;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  * Signals NTLM protocol failure.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java Sat Jan 16 12:58:34 2016
@@ -38,9 +38,9 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.hc.client5.http.auth.util.ByteArrayBuilder;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.util.CharsetUtils;
-import org.apache.hc.client5.http.auth.util.ByteArrayBuilder;
 
 /**
  * Provides an implementation for NTLMv1, NTLMv2, and NTLM2 Session forms of the NTLM

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java Sat Jan 16 12:58:34 2016
@@ -28,11 +28,6 @@ package org.apache.hc.client5.http.impl.
 
 import java.security.Principal;
 
-import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.util.Args;
 import org.apache.hc.client5.http.auth.AuthChallenge;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthScope;
@@ -41,6 +36,11 @@ import org.apache.hc.client5.http.auth.C
 import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.auth.MalformedChallengeException;
 import org.apache.hc.client5.http.auth.NTCredentials;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.util.Args;
 
 /**
  * NTLM is a proprietary authentication scheme developed by Microsoft

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -27,10 +27,10 @@
 
 package org.apache.hc.client5.http.impl.auth;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java Sat Jan 16 12:58:34 2016
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.http.impl.auth;
 
+import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.client5.http.conn.DnsResolver;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.Oid;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java?rev=1724967&r1=1724966&r2=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java Sat Jan 16 12:58:34 2016
@@ -26,11 +26,11 @@
  */
 package org.apache.hc.client5.http.impl.auth;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.auth.AuthScheme;
 import org.apache.hc.client5.http.auth.AuthSchemeProvider;
-import org.apache.hc.client5.http.conn.DnsResolver;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/SystemDefaultCredentialsProvider.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/SystemDefaultCredentialsProvider.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/client/SystemDefaultCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.client;
+package org.apache.hc.client5.http.impl.auth;
 
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
@@ -32,15 +32,16 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.util.Args;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsStore;
 import org.apache.hc.client5.http.auth.NTCredentials;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.client.CredentialsStore;
-import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.config.AuthSchemes;
+import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Implementation of {@link CredentialsStore} backed by standard

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -26,11 +26,11 @@
  */
 package org.apache.hc.client5.http.impl.cookie;
 
-import org.apache.hc.core5.annotation.Immutable;
 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;
+import org.apache.hc.core5.annotation.Immutable;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -32,11 +32,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.hc.core5.util.Asserts;
 import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
 import org.apache.hc.client5.http.cookie.CookieAttributeHandler;
 import org.apache.hc.client5.http.cookie.CookieSpec;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.util.Asserts;
 
 /**
  * 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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -33,10 +33,10 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.util.Args;
 import org.apache.hc.client5.http.cookie.Cookie;
 import org.apache.hc.client5.http.cookie.SetCookie;
+import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.util.Args;
 
 /**
  * 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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -28,16 +28,16 @@ package org.apache.hc.client5.http.impl.
 
 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.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;
+import org.apache.hc.client5.http.utils.InetAddressUtils;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.TextUtils;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -28,13 +28,13 @@ package org.apache.hc.client5.http.impl.
 
 import java.util.Date;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.util.Args;
-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;
+import org.apache.hc.client5.http.utils.DateUtils;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -28,12 +28,12 @@ package org.apache.hc.client5.http.impl.
 
 import java.util.Date;
 
-import org.apache.hc.core5.annotation.Immutable;
-import org.apache.hc.core5.util.Args;
 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;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -26,15 +26,15 @@
  */
 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.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;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.TextUtils;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -26,13 +26,13 @@
  */
 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.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;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -32,15 +32,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.hc.core5.http.HeaderElement;
-import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.util.Args;
 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;
+import org.apache.hc.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.util.Args;
 
 /**
  * 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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -30,11 +30,11 @@ package org.apache.hc.client5.http.impl.
 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.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.core5.annotation.ThreadSafe;
+import org.apache.hc.core5.http.Header;
 
 /**
  * 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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -27,10 +27,10 @@
 
 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.hc.client5.http.cookie.CookieSpec;
 import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link org.apache.hc.client5.http.cookie.CookieSpecProvider} implementation that ignores all cookies.

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -35,13 +35,13 @@ import java.util.concurrent.ConcurrentHa
 import java.util.regex.Matcher;
 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.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;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.message.ParserCursor;
+import org.apache.hc.core5.util.Args;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -30,13 +30,13 @@ import java.util.Date;
 import java.util.regex.Matcher;
 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.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;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.TextUtils;
 
 /**
  *

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -29,15 +29,15 @@ package org.apache.hc.client5.http.impl.
 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.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;
+import org.apache.hc.client5.http.psl.PublicSuffixList;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Wraps a {@link org.apache.hc.client5.http.cookie.CookieAttributeHandler} and leverages its match method
@@ -45,8 +45,8 @@ import org.apache.hc.client5.http.cookie
  * cross-site attack types by preventing cookies from apparent domains that are not publicly
  * available.
  *
- *  @see org.apache.hc.client5.http.conn.util.PublicSuffixList
- *  @see org.apache.hc.client5.http.conn.util.PublicSuffixMatcher
+ *  @see PublicSuffixList
+ *  @see 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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -37,6 +37,13 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+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;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.FormattedHeader;
 import org.apache.hc.core5.http.Header;
@@ -46,13 +53,6 @@ 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.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/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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -27,14 +27,14 @@
 
 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.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;
+import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
+import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@link org.apache.hc.client5.http.cookie.CookieSpecProvider} implementation that provides an instance of

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -27,8 +27,8 @@
 
 package org.apache.hc.client5.http.impl.cookie;
 
-import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.core5.annotation.ThreadSafe;
 
 /**
  * Standard {@link org.apache.hc.client5.http.cookie.CookieSpec} implementation that enforces a more relaxed

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=1724967&r1=1724966&r2=1724967&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 12:58:34 2016
@@ -27,9 +27,9 @@
 
 package org.apache.hc.client5.http.impl.cookie;
 
-import org.apache.hc.core5.annotation.ThreadSafe;
-import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.apache.hc.client5.http.cookie.CommonCookieAttributeHandler;
+import org.apache.hc.client5.http.utils.DateUtils;
+import org.apache.hc.core5.annotation.ThreadSafe;
 
 /**
  * Standard {@link org.apache.hc.client5.http.cookie.CookieSpec} implementation that enforces syntax

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/BasicHttpClientConnectionManager.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/BasicHttpClientConnectionManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/BasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -36,6 +36,17 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.HttpConnectionFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.io.ConnectionRequest;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.io.HttpClientConnectionOperator;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.core5.annotation.GuardedBy;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.HttpHost;
@@ -49,17 +60,6 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Asserts;
 import org.apache.hc.core5.util.LangUtils;
-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;
 
 /**
  * A connection manager for a single connection. This connection manager maintains only one active

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPool.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java Sat Jan 16 12:58:34 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.pool.io.AbstractConnPool;
 import org.apache.hc.core5.pool.io.ConnFactory;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * @since 4.3

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPoolEntry.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPoolEntry.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java Sat Jan 16 12:58:34 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
+import org.apache.hc.client5.http.HttpRoute;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
 import org.apache.hc.core5.annotation.ThreadSafe;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.pool.PoolEntry;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.routing.HttpRoute;
 
 /**
  * @since 4.3

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPoolProxy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPoolProxy.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/CPoolProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -32,6 +32,7 @@ import java.net.SocketAddress;
 
 import javax.net.ssl.SSLSession;
 
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.HttpConnectionMetrics;
 import org.apache.hc.core5.http.HttpException;
@@ -39,7 +40,6 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.io.HttpClientConnection;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
 
 /**
  * @since 4.3

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ConnectionShutdownException.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ConnectionShutdownException.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/ConnectionShutdownException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import org.apache.hc.core5.annotation.Immutable;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultHttpClientConnectionOperator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultHttpClientConnectionOperator.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultHttpClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java Sat Jan 16 12:58:34 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -36,22 +36,24 @@ import java.net.SocketTimeoutException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hc.client5.http.ConnectTimeoutException;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.HttpHostConnectException;
+import org.apache.hc.client5.http.SchemePortResolver;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.UnsupportedSchemeException;
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
+import org.apache.hc.client5.http.io.HttpClientConnectionOperator;
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.Lookup;
 import org.apache.hc.core5.http.config.SocketConfig;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.client5.http.client.protocol.HttpClientContext;
-import org.apache.hc.client5.http.conn.ConnectTimeoutException;
-import org.apache.hc.client5.http.conn.DnsResolver;
-import org.apache.hc.client5.http.conn.HttpClientConnectionOperator;
-import org.apache.hc.client5.http.conn.HttpHostConnectException;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
-import org.apache.hc.client5.http.conn.SchemePortResolver;
-import org.apache.hc.client5.http.conn.UnsupportedSchemeException;
-import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory;
 
 /**
  * Default implementation of {@link HttpClientConnectionOperator} used as default in Http client,

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultHttpResponseParserFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultHttpResponseParserFactory.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpResponse;

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultManagedHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultManagedHttpClientConnection.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/DefaultManagedHttpClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -39,6 +39,7 @@ import java.util.concurrent.atomic.Atomi
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;
 
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
 import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.HttpRequest;
@@ -48,7 +49,6 @@ import org.apache.hc.core5.http.impl.io.
 import org.apache.hc.core5.http.io.HttpMessageParserFactory;
 import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
 
 /**
  * Default {@link ManagedHttpClientConnection} implementation.

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LenientHttpResponseParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LenientHttpResponseParser.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LenientHttpResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingInputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingInputStream.java&r1=1724949&r2=1724967&rev=1724967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/conn/LoggingInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java Sat Jan 16 12:58:34 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.impl.conn;
+package org.apache.hc.client5.http.impl.io;
 
 import java.io.IOException;
 import java.io.InputStream;




Mime
View raw message