Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3CAA818382 for ; Sat, 16 Jan 2016 12:58:59 +0000 (UTC) Received: (qmail 55444 invoked by uid 500); 16 Jan 2016 12:58:59 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 55399 invoked by uid 500); 16 Jan 2016 12:58:59 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 55390 invoked by uid 99); 16 Jan 2016 12:58:59 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Jan 2016 12:58:59 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 82361C11EA for ; Sat, 16 Jan 2016 12:58:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.8 X-Spam-Level: * X-Spam-Status: No, score=1.8 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id rcgMQpooa9Mi for ; Sat, 16 Jan 2016 12:58:49 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 86C5431AD6 for ; Sat, 16 Jan 2016 12:58:47 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id E9583E1022 for ; Sat, 16 Jan 2016 12:58:45 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E09DD3A0572 for ; Sat, 16 Jan 2016 12:58:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1724967 [9/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 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160116125845.E09DD3A0572@svn01-us-west.apache.org> Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixListParser.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixListParser.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixListParser.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.conn.util; +package org.apache.hc.client5.http.psl; import java.io.BufferedReader; import java.io.IOException; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixMatcher.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixMatcher.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixMatcher.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.conn.util; +package org.apache.hc.client5.http.psl; import java.net.IDN; import java.util.Collection; @@ -42,7 +42,7 @@ import org.apache.hc.core5.util.Args; * An up-to-date list of suffixes can be obtained from * publicsuffix.org * - * @see org.apache.hc.client5.http.conn.util.PublicSuffixList + * @see PublicSuffixList * * @since 4.4 */ Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixMatcherLoader.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixMatcherLoader.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/PublicSuffixMatcherLoader.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.conn.util; +package org.apache.hc.client5.http.psl; import java.io.File; import java.io.FileInputStream; @@ -42,7 +42,7 @@ import org.apache.hc.core5.annotation.Th import org.apache.hc.core5.util.Args; /** - * {@link org.apache.hc.client5.http.conn.util.PublicSuffixMatcher} loader. + * {@link PublicSuffixMatcher} loader. * * @since 4.4 */ Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,9 @@ * */ -package org.apache.hc.client5.http.conn.routing; +package org.apache.hc.client5.http.routing; + +import org.apache.hc.client5.http.RouteInfo; /** * Provides directions on establishing a route. Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java Sat Jan 16 12:58:34 2016 @@ -25,8 +25,9 @@ * */ -package org.apache.hc.client5.http.conn.routing; +package org.apache.hc.client5.http.routing; +import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/package-info.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/package-info.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/routing/package-info.java Sat Jan 16 12:58:34 2016 @@ -28,4 +28,4 @@ /** * Client connection routing APIs. */ -package org.apache.hc.client5.http.conn.routing; +package org.apache.hc.client5.http.routing; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.socket; +package org.apache.hc.client5.http.socket; import java.io.IOException; import java.net.InetSocketAddress; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.socket; +package org.apache.hc.client5.http.socket; import java.io.IOException; import java.net.Socket; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.socket; +package org.apache.hc.client5.http.socket; import java.io.IOException; import java.net.InetSocketAddress; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/package-info.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/package-info.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/socket/package-info.java Sat Jan 16 12:58:34 2016 @@ -28,4 +28,4 @@ /** * Client connection socket APIs. */ -package org.apache.hc.client5.http.conn.socket; +package org.apache.hc.client5.http.socket; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.ssl; +package org.apache.hc.client5.http.ssl; import java.net.InetAddress; import java.net.UnknownHostException; @@ -51,10 +51,10 @@ import javax.security.auth.x500.X500Prin import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hc.client5.http.psl.DomainType; +import org.apache.hc.client5.http.psl.PublicSuffixMatcher; +import org.apache.hc.client5.http.utils.InetAddressUtils; import org.apache.hc.core5.annotation.Immutable; -import org.apache.hc.client5.http.conn.util.DomainType; -import org.apache.hc.client5.http.conn.util.InetAddressUtils; -import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher; /** * Default {@link javax.net.ssl.HostnameVerifier} implementation. Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.ssl; +package org.apache.hc.client5.http.ssl; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.ssl; +package org.apache.hc.client5.http.ssl; import java.io.IOException; import java.io.InputStream; @@ -49,14 +49,14 @@ import javax.security.auth.x500.X500Prin import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader; +import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory; import org.apache.hc.core5.annotation.ThreadSafe; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.ssl.SSLContexts; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TextUtils; -import org.apache.hc.client5.http.conn.socket.LayeredConnectionSocketFactory; -import org.apache.hc.client5.http.conn.util.PublicSuffixMatcherLoader; /** * Layered socket factory for TLS/SSL connections. @@ -75,7 +75,7 @@ import org.apache.hc.client5.http.conn.u * *

* In special cases the standard trust verification process can be bypassed by using a custom - * {@link org.apache.hc.client5.http.conn.ssl.TrustStrategy}. This interface is primarily intended for allowing self-signed + * {@link org.apache.hc.core5.ssl.TrustStrategy}. This interface is primarily intended for allowing self-signed * certificates to be accepted as trusted without having to add them to the trust-store file. *

* SSLSocketFactory will enable client authentication when supplied with Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.conn.ssl; +package org.apache.hc.client5.http.ssl; public class SSLInitializationException extends IllegalStateException { Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.conn.ssl; +package org.apache.hc.client5.http.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/package-info.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/package-info.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/ssl/package-info.java Sat Jan 16 12:58:34 2016 @@ -28,4 +28,4 @@ /** * Client TLS/SSL support. */ -package org.apache.hc.client5.http.conn.ssl; +package org.apache.hc.client5.http.ssl; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/BackoffManager.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/BackoffManager.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/BackoffManager.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java Sat Jan 16 12:58:34 2016 @@ -24,9 +24,9 @@ * . * */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; -import org.apache.hc.client5.http.conn.routing.HttpRoute; +import org.apache.hc.client5.http.HttpRoute; /** * Represents a controller that dynamically adjusts the size Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ConnectionBackoffStrategy.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ConnectionBackoffStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ConnectionBackoffStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; import org.apache.hc.core5.http.HttpResponse; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/HttpClient.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/HttpClient.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/HttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java Sat Jan 16 12:58:34 2016 @@ -25,15 +25,15 @@ * */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; import java.io.IOException; +import org.apache.hc.client5.http.methods.HttpUriRequest; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.hc.client5.http.client.methods.HttpUriRequest; /** * This interface represents only the most basic contract for HTTP request @@ -56,7 +56,6 @@ public interface HttpClient { * or handled automatically depends on the implementation and * configuration of this client. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ HttpResponse execute(HttpUriRequest request) throws IOException; @@ -74,7 +73,6 @@ public interface HttpClient { * or handled automatically depends on the implementation and * configuration of this client. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ HttpResponse execute(HttpUriRequest request, HttpContext context) throws IOException; @@ -94,7 +92,6 @@ public interface HttpClient { * or handled automatically depends on the implementation and * configuration of this client. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ HttpResponse execute(HttpHost target, HttpRequest request) throws IOException; @@ -116,7 +113,6 @@ public interface HttpClient { * or handled automatically depends on the implementation and * configuration of this client. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ HttpResponse execute(HttpHost target, HttpRequest request, HttpContext context) @@ -138,7 +134,6 @@ public interface HttpClient { * * @return the response object as generated by the response handler. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ T execute( HttpUriRequest request, @@ -163,7 +158,6 @@ public interface HttpClient { * * @return the response object as generated by the response handler. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ T execute( HttpUriRequest request, @@ -191,7 +185,6 @@ public interface HttpClient { * * @return the response object as generated by the response handler. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ T execute( HttpHost target, @@ -221,7 +214,6 @@ public interface HttpClient { * * @return the response object as generated by the response handler. * @throws IOException in case of a problem or the connection was aborted - * @throws ClientProtocolException in case of an http protocol error */ T execute( HttpHost target, Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/HttpRequestRetryHandler.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/HttpRequestRetryHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/HttpRequestRetryHandler.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; import java.io.IOException; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ResponseHandler.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ResponseHandler.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; import java.io.IOException; @@ -46,7 +46,6 @@ public interface ResponseHandler { * @param response The response to process * @return A value determined by the response * - * @throws ClientProtocolException in case of an http protocol error * @throws IOException in case of a problem or the connection was aborted */ T handleResponse(HttpResponse response) throws IOException; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ServiceUnavailableRetryStrategy.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ServiceUnavailableRetryStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/ServiceUnavailableRetryStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.protocol.HttpContext; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/package-info.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/package-info.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/package-info.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/package-info.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/package-info.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/client/package-info.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/sync/package-info.java Sat Jan 16 12:58:34 2016 @@ -28,4 +28,4 @@ /** * Client HTTP communication APIs. */ -package org.apache.hc.client5.http.client; +package org.apache.hc.client5.http.sync; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.client.utils; +package org.apache.hc.client5.http.utils; import java.lang.ref.SoftReference; import java.text.ParsePosition; Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/InetAddressUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/InetAddressUtils.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/conn/util/InetAddressUtils.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn.util; +package org.apache.hc.client5.http.utils; import java.util.regex.Pattern; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.client.utils; +package org.apache.hc.client5.http.utils; import java.net.URI; import java.net.URISyntaxException; @@ -37,7 +37,6 @@ import java.util.List; import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.NameValuePair; import org.apache.hc.core5.http.message.BasicNameValuePair; -import org.apache.hc.client5.http.conn.util.InetAddressUtils; /** * Builder for {@link URI} instances. Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.client.utils; +package org.apache.hc.client5.http.utils; import java.net.URI; import java.net.URISyntaxException; @@ -32,11 +32,11 @@ import java.util.List; import java.util.Locale; import java.util.Stack; +import org.apache.hc.client5.http.RouteInfo; 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.core5.util.TextUtils; -import org.apache.hc.client5.http.conn.routing.RouteInfo; /** * A collection of utilities for {@link URI URIs}, to workaround Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.client.utils; +package org.apache.hc.client5.http.utils; import java.io.IOException; import java.io.InputStream; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/package-info.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/package-info.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/package-info.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/hc/client5/http/utils/package-info.java Sat Jan 16 12:58:34 2016 @@ -28,4 +28,4 @@ /** * Client utility classes. */ -package org.apache.hc.client5.http.client.utils; +package org.apache.hc.client5.http.utils; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/TestExceptions.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/TestExceptions.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/TestExceptions.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/TestExceptions.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/TestExceptions.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/conn/TestExceptions.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/TestExceptions.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.conn; +package org.apache.hc.client5.http; import java.io.IOException; import java.net.InetAddress; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.client.config; +package org.apache.hc.client5.http.config; import java.net.InetAddress; import java.util.Arrays; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.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.ByteArrayInputStream; import java.io.ByteArrayOutputStream; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.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.nio.charset.StandardCharsets; import java.util.zip.Deflater; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.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; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestGZip.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.ByteArrayOutputStream; import java.io.IOException; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAbstractResponseHandler.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAbstractResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestAbstractResponseHandler.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java Sat Jan 16 12:58:34 2016 @@ -25,11 +25,13 @@ * */ -package org.apache.hc.client5.http.impl.client; +package org.apache.hc.client5.http.impl; import java.io.IOException; import java.io.InputStream; +import org.apache.hc.client5.http.impl.sync.AbstractResponseHandler; +import org.apache.hc.client5.http.protocol.HttpResponseException; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpVersion; @@ -37,7 +39,6 @@ import org.apache.hc.core5.http.StatusLi import org.apache.hc.core5.http.entity.EntityUtils; import org.apache.hc.core5.http.entity.StringEntity; import org.apache.hc.core5.http.message.BasicStatusLine; -import org.apache.hc.client5.http.client.HttpResponseException; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicResponseHandler.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicResponseHandler.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicResponseHandler.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java Sat Jan 16 12:58:34 2016 @@ -25,17 +25,17 @@ * */ -package org.apache.hc.client5.http.impl.client; +package org.apache.hc.client5.http.impl; import java.io.InputStream; +import org.apache.hc.client5.http.protocol.HttpResponseException; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.StatusLine; import org.apache.hc.core5.http.entity.StringEntity; import org.apache.hc.core5.http.message.BasicStatusLine; -import org.apache.hc.client5.http.client.HttpResponseException; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultConnKeepAliveStrategy.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultConnKeepAliveStrategy.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestDefaultConnKeepAliveStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java Sat Jan 16 12:58:34 2016 @@ -24,8 +24,9 @@ * . * */ -package org.apache.hc.client5.http.impl.client; +package org.apache.hc.client5.http.impl; +import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.HttpVersion; @@ -33,7 +34,6 @@ import org.apache.hc.core5.http.message. import org.apache.hc.core5.http.message.BasicStatusLine; import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.hc.client5.http.conn.ConnectionKeepAliveStrategy; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java Sat Jan 16 12:58:34 2016 @@ -28,12 +28,12 @@ package org.apache.hc.client5.http.impl. 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.util.CharArrayBuffer; -import org.apache.hc.client5.http.auth.AuthChallenge; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicAuthCache.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicAuthCache.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicAuthCache.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java Sat Jan 16 12:58:34 2016 @@ -25,13 +25,11 @@ * */ -package org.apache.hc.client5.http.impl.client; +package org.apache.hc.client5.http.impl.auth; -import org.apache.hc.core5.http.HttpHost; +import org.apache.hc.client5.http.SchemePortResolver; import org.apache.hc.client5.http.auth.AuthScheme; -import org.apache.hc.client5.http.conn.SchemePortResolver; -import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.hc.client5.http.impl.auth.NTLMScheme; +import org.apache.hc.core5.http.HttpHost; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicCredentialsProvider.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicCredentialsProvider.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicCredentialsProvider.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java Sat Jan 16 12:58:34 2016 @@ -24,12 +24,13 @@ * . * */ -package org.apache.hc.client5.http.impl.client; +package org.apache.hc.client5.http.impl.auth; -import org.apache.hc.core5.http.HttpHost; 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.impl.sync.BasicCredentialsProvider; +import org.apache.hc.core5.http.HttpHost; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java Sat Jan 16 12:58:34 2016 @@ -34,17 +34,17 @@ import java.nio.charset.StandardCharsets import java.util.List; import org.apache.commons.codec.binary.Base64; +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.UsernamePasswordCredentials; +import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.ParseException; import org.apache.hc.core5.http.message.BasicHttpRequest; import org.apache.hc.core5.http.message.ParserCursor; import org.apache.hc.core5.util.CharArrayBuffer; -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.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java Sat Jan 16 12:58:34 2016 @@ -37,6 +37,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +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.MalformedChallengeException; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; import org.apache.hc.core5.http.HeaderElement; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; @@ -47,14 +55,6 @@ import org.apache.hc.core5.http.message. import org.apache.hc.core5.http.message.BasicHttpRequest; import org.apache.hc.core5.http.message.ParserCursor; import org.apache.hc.core5.util.CharArrayBuffer; -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.MalformedChallengeException; -import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java Sat Jan 16 12:58:34 2016 @@ -29,6 +29,18 @@ package org.apache.hc.client5.http.impl. import java.util.LinkedList; import java.util.Queue; +import org.apache.hc.client5.http.auth.AuthCache; +import org.apache.hc.client5.http.auth.AuthExchange; +import org.apache.hc.client5.http.auth.AuthScheme; +import org.apache.hc.client5.http.auth.AuthSchemeProvider; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.AuthenticationException; +import org.apache.hc.client5.http.auth.ChallengeType; +import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; +import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; @@ -43,18 +55,6 @@ import org.apache.hc.core5.http.message. import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.http.protocol.HttpCoreContext; -import org.apache.hc.client5.http.auth.AuthExchange; -import org.apache.hc.client5.http.auth.AuthScheme; -import org.apache.hc.client5.http.auth.AuthSchemeProvider; -import org.apache.hc.client5.http.auth.AuthScope; -import org.apache.hc.client5.http.auth.AuthenticationException; -import org.apache.hc.client5.http.auth.ChallengeType; -import org.apache.hc.client5.http.auth.Credentials; -import org.apache.hc.client5.http.auth.CredentialsProvider; -import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.client.AuthCache; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.impl.client.DefaultAuthenticationStrategy; import org.junit.Assert; import org.junit.Before; import org.junit.Test; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java (from r1724949, 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/impl/auth/TestRequestAuthCache.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/client/protocol/TestRequestAuthCache.java&r1=1724949&r2=1724967&rev=1724967&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/impl/auth/TestRequestAuthCache.java Sat Jan 16 12:58:34 2016 @@ -24,22 +24,22 @@ * . * */ -package org.apache.hc.client5.http.client.protocol; +package org.apache.hc.client5.http.impl.auth; +import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.auth.AuthCache; +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.impl.sync.BasicCredentialsProvider; +import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.protocol.RequestAuthCache; 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.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/impl/cookie/TestBasicCookieAttribHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java Sat Jan 16 12:58:34 2016 @@ -33,13 +33,13 @@ import java.util.Arrays; import java.util.Date; import java.util.Locale; -import org.apache.hc.client5.http.client.utils.DateUtils; -import org.apache.hc.client5.http.conn.util.DomainType; -import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher; 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.client5.http.psl.DomainType; +import org.apache.hc.client5.http.psl.PublicSuffixMatcher; +import org.apache.hc.client5.http.utils.DateUtils; import org.junit.Assert; import org.junit.Test; Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java (from r1724949, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicCookieStore.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicCookieStore.java&r1=1724949&r2=1724967&rev=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/client/TestBasicCookieStore.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java Sat Jan 16 12:58:34 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.client5.http.impl.client; +package org.apache.hc.client5.http.impl.cookie; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,8 +34,8 @@ import java.io.ObjectOutputStream; import java.util.Calendar; import java.util.List; +import org.apache.hc.client5.http.cookie.BasicCookieStore; import org.apache.hc.client5.http.cookie.Cookie; -import org.apache.hc.client5.http.impl.cookie.BasicClientCookie; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java Sat Jan 16 12:58:34 2016 @@ -31,10 +31,11 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -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.Cookie; import org.apache.hc.client5.http.cookie.CookieOrigin; +import org.apache.hc.client5.http.psl.PublicSuffixList; +import org.apache.hc.client5.http.psl.PublicSuffixListParser; +import org.apache.hc.client5.http.psl.PublicSuffixMatcher; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -52,7 +53,7 @@ public class TestPublicSuffixListParser Assert.assertNotNull(in); final PublicSuffixList suffixList; try { - final org.apache.hc.client5.http.conn.util.PublicSuffixListParser parser = new org.apache.hc.client5.http.conn.util.PublicSuffixListParser(); + final PublicSuffixListParser parser = new PublicSuffixListParser(); suffixList = parser.parse(new InputStreamReader(in, StandardCharsets.UTF_8)); } finally { in.close(); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java?rev=1724967&r1=1724966&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java Sat Jan 16 12:58:34 2016 @@ -30,13 +30,13 @@ package org.apache.hc.client5.http.impl. import java.util.Arrays; import java.util.List; -import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.message.BasicHeader; 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.http.Header; +import org.apache.hc.core5.http.message.BasicHeader; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.IOException; import java.net.ConnectException; @@ -33,6 +33,16 @@ import java.util.concurrent.CountDownLat import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.hc.client5.http.ConnectionPoolTimeoutException; +import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.sync.CloseableHttpClient; +import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.io.ConnectionRequest; +import org.apache.hc.client5.http.io.HttpClientConnectionManager; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.concurrent.Cancellable; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; @@ -47,16 +57,6 @@ import org.apache.hc.core5.http.io.UriHt import org.apache.hc.core5.http.message.BasicHeader; import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.hc.client5.http.client.HttpClient; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException; -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.client.HttpClients; -import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; @@ -302,7 +302,7 @@ public class TestAbortHandling extends L Mockito.when(connmgr.requestConnection( Mockito.any(HttpRoute.class), Mockito.any())).thenReturn(connrequest); - final HttpClient client = HttpClients.custom().setConnectionManager(connmgr).build(); + final CloseableHttpClient client = HttpClients.custom().setConnectionManager(connmgr).build(); final HttpContext context = new BasicHttpContext(); final HttpGet httpget = new HttpGet("http://www.example.com/a"); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java Sat Jan 16 12:58:34 2016 @@ -24,14 +24,14 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; +import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.methods.CloseableHttpResponse; +import org.apache.hc.client5.http.methods.HttpGet; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.entity.EntityUtils; -import org.apache.hc.client5.http.client.methods.CloseableHttpResponse; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.impl.conn.BasicHttpClientConnectionManager; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java Sat Jan 16 12:58:34 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -34,6 +34,29 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hc.client5.http.auth.AuthCache; +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.ChallengeType; +import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.auth.BasicAuthCache; +import org.apache.hc.client5.http.impl.auth.BasicScheme; +import org.apache.hc.client5.http.impl.protocol.DefaultAuthenticationStrategy; +import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; +import org.apache.hc.client5.http.localserver.BasicAuthTokenExtractor; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.localserver.RequestBasicAuth; +import org.apache.hc.client5.http.localserver.ResponseBasicUnauthorized; +import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.methods.HttpPost; +import org.apache.hc.client5.http.methods.HttpPut; +import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; import org.apache.hc.core5.http.HeaderElements; import org.apache.hc.core5.http.HttpConnection; import org.apache.hc.core5.http.HttpEntity; @@ -57,29 +80,6 @@ import org.apache.hc.core5.http.protocol import org.apache.hc.core5.http.protocol.ResponseContent; import org.apache.hc.core5.http.protocol.ResponseDate; import org.apache.hc.core5.http.protocol.ResponseServer; -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.ChallengeType; -import org.apache.hc.client5.http.auth.Credentials; -import org.apache.hc.client5.http.auth.CredentialsProvider; -import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.client.AuthCache; -import org.apache.hc.client5.http.client.ClientProtocolException; -import org.apache.hc.client5.http.client.NonRepeatableRequestException; -import org.apache.hc.client5.http.client.config.RequestConfig; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.client.methods.HttpPost; -import org.apache.hc.client5.http.client.methods.HttpPut; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.hc.client5.http.impl.client.BasicAuthCache; -import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.client.DefaultAuthenticationStrategy; -import org.apache.hc.client5.http.localserver.BasicAuthTokenExtractor; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.localserver.RequestBasicAuth; -import org.apache.hc.client5.http.localserver.ResponseBasicUnauthorized; 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/impl/integration/TestClientAuthenticationFakeNTLM.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java Sat Jan 16 12:58:34 2016 @@ -24,10 +24,17 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.IOException; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.NTCredentials; +import org.apache.hc.client5.http.impl.sync.BasicCredentialsProvider; +import org.apache.hc.client5.http.impl.sync.HttpClients; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; @@ -39,13 +46,6 @@ import org.apache.hc.core5.http.entity.E import org.apache.hc.core5.http.io.HttpRequestHandler; import org.apache.hc.core5.http.message.BasicStatusLine; import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.hc.client5.http.auth.AuthScope; -import org.apache.hc.client5.http.auth.NTCredentials; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider; -import org.apache.hc.client5.http.impl.client.HttpClients; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java Sat Jan 16 12:58:34 2016 @@ -24,11 +24,19 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.IOException; import java.nio.charset.StandardCharsets; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.localserver.RequestBasicAuth; +import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; @@ -47,14 +55,6 @@ import org.apache.hc.core5.http.protocol import org.apache.hc.core5.http.protocol.ResponseContent; import org.apache.hc.core5.http.protocol.ResponseDate; import org.apache.hc.core5.http.protocol.ResponseServer; -import org.apache.hc.client5.http.auth.AuthScope; -import org.apache.hc.client5.http.auth.Credentials; -import org.apache.hc.client5.http.auth.CredentialsProvider; -import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.localserver.RequestBasicAuth; 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/impl/integration/TestClientReauthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java Sat Jan 16 12:58:34 2016 @@ -24,13 +24,27 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hc.client5.http.auth.AuthScheme; +import org.apache.hc.client5.http.auth.AuthSchemeProvider; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.auth.CredentialsProvider; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.auth.BasicScheme; +import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.localserver.RequestBasicAuth; +import org.apache.hc.client5.http.methods.CloseableHttpResponse; +import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.protocol.HttpClientContext; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; @@ -51,20 +65,6 @@ import org.apache.hc.core5.http.protocol import org.apache.hc.core5.http.protocol.ResponseContent; import org.apache.hc.core5.http.protocol.ResponseDate; import org.apache.hc.core5.http.protocol.ResponseServer; -import org.apache.hc.client5.http.auth.AuthScheme; -import org.apache.hc.client5.http.auth.AuthSchemeProvider; -import org.apache.hc.client5.http.auth.AuthScope; -import org.apache.hc.client5.http.auth.Credentials; -import org.apache.hc.client5.http.auth.CredentialsProvider; -import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; -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.HttpGet; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; -import org.apache.hc.client5.http.localserver.RequestBasicAuth; 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/impl/integration/TestClientRequestExecution.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java Sat Jan 16 12:58:34 2016 @@ -24,13 +24,22 @@ * . * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; import java.util.List; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.methods.HttpGet; +import org.apache.hc.client5.http.methods.HttpPost; +import org.apache.hc.client5.http.protocol.ClientProtocolException; +import org.apache.hc.client5.http.protocol.HttpClientContext; +import org.apache.hc.client5.http.protocol.NonRepeatableRequestException; +import org.apache.hc.client5.http.sync.HttpRequestRetryHandler; +import org.apache.hc.client5.http.utils.URIBuilder; +import org.apache.hc.client5.http.utils.URIUtils; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; @@ -46,15 +55,6 @@ import org.apache.hc.core5.http.io.HttpC import org.apache.hc.core5.http.io.HttpRequestHandler; import org.apache.hc.core5.http.message.BasicHttpRequest; import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.hc.client5.http.client.ClientProtocolException; -import org.apache.hc.client5.http.client.HttpRequestRetryHandler; -import org.apache.hc.client5.http.client.NonRepeatableRequestException; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.client.methods.HttpPost; -import org.apache.hc.client5.http.client.protocol.HttpClientContext; -import org.apache.hc.client5.http.client.utils.URIBuilder; -import org.apache.hc.client5.http.client.utils.URIUtils; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.junit.Assert; import org.junit.Test; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java?rev=1724967&r1=1724949&r2=1724967&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java Sat Jan 16 12:58:34 2016 @@ -25,13 +25,18 @@ * */ -package org.apache.hc.client5.http.impl.client.integration; +package org.apache.hc.client5.http.impl.integration; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.concurrent.TimeUnit; +import org.apache.hc.client5.http.ConnectionPoolTimeoutException; +import org.apache.hc.client5.http.HttpRoute; +import org.apache.hc.client5.http.io.ConnectionRequest; +import org.apache.hc.client5.http.localserver.LocalServerTestBase; +import org.apache.hc.client5.http.methods.HttpGet; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; @@ -46,11 +51,6 @@ import org.apache.hc.core5.http.io.HttpR import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.pool.PoolStats; -import org.apache.hc.client5.http.client.methods.HttpGet; -import org.apache.hc.client5.http.conn.ConnectionPoolTimeoutException; -import org.apache.hc.client5.http.conn.ConnectionRequest; -import org.apache.hc.client5.http.conn.routing.HttpRoute; -import org.apache.hc.client5.http.localserver.LocalServerTestBase; import org.junit.Assert; import org.junit.Test;