Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B3543200BB1 for ; Thu, 3 Nov 2016 20:36:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B1CE2160AFF; Thu, 3 Nov 2016 19:36:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B51E160AE5 for ; Thu, 3 Nov 2016 20:36:17 +0100 (CET) Received: (qmail 47006 invoked by uid 500); 3 Nov 2016 19:36:16 -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 46996 invoked by uid 99); 3 Nov 2016 19:36:16 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2016 19:36:16 +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 20E2AC7323 for ; Thu, 3 Nov 2016 19:36:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.198 X-Spam-Level: X-Spam-Status: No, score=-1.198 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id MYHWQXlnA7D6 for ; Thu, 3 Nov 2016 19:36:13 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id AAA065F24F for ; Thu, 3 Nov 2016 19:36:13 +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 B1D60E0045 for ; Thu, 3 Nov 2016 19:36:06 +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 8FAF93A0230 for ; Thu, 3 Nov 2016 19:36:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1767956 - in /httpcomponents/httpcore/trunk: httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ httpcore5/src/... Date: Thu, 03 Nov 2016 19:36:05 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161103193606.8FAF93A0230@svn01-us-west.apache.org> archived-at: Thu, 03 Nov 2016 19:36:18 -0000 Author: olegk Date: Thu Nov 3 19:36:05 2016 New Revision: 1767956 URL: http://svn.apache.org/viewvc?rev=1767956&view=rev Log: Moved java.net related util classes to org.apache.hc.core5.net package Added: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java (contents, props changed) - copied, changed from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java (contents, props changed) - copied, changed from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java (contents, props changed) - copied, changed from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java (contents, props changed) - copied, changed from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java (contents, props changed) - copied, changed from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java (contents, props changed) - copied, changed from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java Removed: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/NetUtils.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java?rev=1767956&r1=1767955&r2=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java (original) +++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java Thu Nov 3 19:36:05 2016 @@ -71,11 +71,11 @@ import org.apache.hc.core5.http2.frame.S import org.apache.hc.core5.http2.hpack.HPackDecoder; import org.apache.hc.core5.http2.hpack.HPackEncoder; import org.apache.hc.core5.http2.impl.BasicH2TransportMetrics; +import org.apache.hc.core5.net.InetAddressUtils; import org.apache.hc.core5.reactor.Command; import org.apache.hc.core5.reactor.IOSession; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.apache.hc.core5.util.NetUtils; abstract class AbstractHttp2StreamMultiplexer implements HttpConnection { @@ -1111,9 +1111,9 @@ abstract class AbstractHttp2StreamMultip final SocketAddress remoteAddress = ioSession.getRemoteAddress(); final SocketAddress localAddress = ioSession.getLocalAddress(); final StringBuilder buffer = new StringBuilder(); - NetUtils.formatAddress(buffer, localAddress); + InetAddressUtils.formatAddress(buffer, localAddress); buffer.append("->"); - NetUtils.formatAddress(buffer, remoteAddress); + InetAddressUtils.formatAddress(buffer, remoteAddress); return buffer.toString(); } Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java?rev=1767956&r1=1767955&r2=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java Thu Nov 3 19:36:05 2016 @@ -47,14 +47,14 @@ import org.apache.hc.core5.http.HttpMess import org.apache.hc.core5.http.ProtocolVersion; import org.apache.hc.core5.http.TrailerSupplier; import org.apache.hc.core5.http.config.H1Config; -import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.impl.BasicHttpConnectionMetrics; +import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.impl.IncomingHttpEntity; import org.apache.hc.core5.http.io.BHttpConnection; import org.apache.hc.core5.http.io.SessionInputBuffer; import org.apache.hc.core5.http.io.SessionOutputBuffer; +import org.apache.hc.core5.net.InetAddressUtils; import org.apache.hc.core5.util.Args; -import org.apache.hc.core5.util.NetUtils; class BHttpConnectionBase implements BHttpConnection { @@ -324,9 +324,9 @@ class BHttpConnectionBase implements BHt final SocketAddress remoteAddress = socket.getRemoteSocketAddress(); final SocketAddress localAddress = socket.getLocalSocketAddress(); if (remoteAddress != null && localAddress != null) { - NetUtils.formatAddress(buffer, localAddress); + InetAddressUtils.formatAddress(buffer, localAddress); buffer.append("<->"); - NetUtils.formatAddress(buffer, remoteAddress); + InetAddressUtils.formatAddress(buffer, remoteAddress); } return buffer.toString(); } Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java?rev=1767956&r1=1767955&r2=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java Thu Nov 3 19:36:05 2016 @@ -59,12 +59,12 @@ import org.apache.hc.core5.http.nio.Sess import org.apache.hc.core5.http.nio.command.ExecutionCommand; import org.apache.hc.core5.http.nio.command.ShutdownCommand; import org.apache.hc.core5.http.nio.command.ShutdownType; +import org.apache.hc.core5.net.InetAddressUtils; import org.apache.hc.core5.reactor.Command; import org.apache.hc.core5.reactor.EventMask; import org.apache.hc.core5.reactor.IOSession; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.HeapByteBufferAllocator; -import org.apache.hc.core5.util.NetUtils; abstract class AbstractHttp1StreamDuplexer implements ResourceHolder, HttpConnection { @@ -479,9 +479,9 @@ abstract class AbstractHttp1StreamDuplex final SocketAddress remoteAddress = ioSession.getRemoteAddress(); final SocketAddress localAddress = ioSession.getLocalAddress(); final StringBuilder buffer = new StringBuilder(); - NetUtils.formatAddress(buffer, localAddress); + InetAddressUtils.formatAddress(buffer, localAddress); buffer.append("->"); - NetUtils.formatAddress(buffer, remoteAddress); + InetAddressUtils.formatAddress(buffer, remoteAddress); return buffer.toString(); } Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java?rev=1767956&r1=1767955&r2=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/bootstrap/ServerBootstrap.java Thu Nov 3 19:36:05 2016 @@ -48,7 +48,7 @@ import org.apache.hc.core5.http.nio.supp import org.apache.hc.core5.http.protocol.HttpProcessor; import org.apache.hc.core5.reactor.IOReactorConfig; import org.apache.hc.core5.util.Args; -import org.apache.hc.core5.util.InetAddressUtils; +import org.apache.hc.core5.net.InetAddressUtils; /** * @since 4.4 Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java (from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java&r1=1767954&r2=1767956&rev=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java Thu Nov 3 19:36:05 2016 @@ -25,12 +25,16 @@ * */ -package org.apache.hc.core5.util; +package org.apache.hc.core5.net; import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.SocketAddress; import java.net.UnknownHostException; import java.util.regex.Pattern; +import org.apache.hc.core5.util.Args; + /** * A collection of utilities relating to InetAddresses. * @@ -121,6 +125,28 @@ public class InetAddressUtils { } /** + * Formats {@link SocketAddress} as text. + * + * @since 5.0 + */ + public static void formatAddress( + final StringBuilder buffer, + final SocketAddress socketAddress) { + Args.notNull(buffer, "Buffer"); + if (socketAddress instanceof InetSocketAddress) { + final InetSocketAddress socketaddr = (InetSocketAddress) socketAddress; + final InetAddress inetaddr = socketaddr.getAddress(); + if (inetaddr != null) { + buffer.append(inetaddr.getHostAddress()).append(':').append(socketaddr.getPort()); + } else { + buffer.append(socketAddress); + } + } else { + buffer.append(socketAddress); + } + } + + /** * Returns canonical name (fully qualified domain name) of the localhost. * * @since 5.0 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 3 19:36:05 2016 @@ -0,0 +1,6 @@ +/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:950681-950688 +/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1079518-1080165 +/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1376150-1376151,1447062 +/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:755593-811107 +/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1154913-1160573 +/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1024348-1031454 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/InetAddressUtils.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java (from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java&r1=1767954&r2=1767956&rev=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java Thu Nov 3 19:36:05 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.core5.util; +package org.apache.hc.core5.net; import java.net.URI; import java.net.URISyntaxException; Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 3 19:36:05 2016 @@ -0,0 +1,6 @@ +/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:950681-950688 +/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1079518-1080165 +/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1376150-1376151,1447062 +/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:755593-811107 +/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1154913-1160573 +/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1024348-1031454 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java (from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java&r1=1767954&r2=1767956&rev=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java Thu Nov 3 19:36:05 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.core5.util; +package org.apache.hc.core5.net; import java.net.URI; import java.nio.ByteBuffer; @@ -41,6 +41,8 @@ import org.apache.hc.core5.http.NameValu 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.core5.util.Args; +import org.apache.hc.core5.util.CharArrayBuffer; /** * A collection of utilities for encoding URLs. Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 3 19:36:05 2016 @@ -0,0 +1,6 @@ +/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:950681-950688 +/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1079518-1080165 +/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1376150-1376151,1447062 +/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:755593-811107 +/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1154913-1160573 +/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1024348-1031454 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java (from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java&r1=1767954&r2=1767956&rev=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java Thu Nov 3 19:36:05 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.core5.util; +package org.apache.hc.core5.net; import org.junit.Assert; import org.junit.Test; Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 3 19:36:05 2016 @@ -0,0 +1,6 @@ +/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:950681-950688 +/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1079518-1080165 +/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1376150-1376151,1447062 +/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:755593-811107 +/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1154913-1160573 +/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1024348-1031454 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestInetAddressUtils.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java (from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java&r1=1767954&r2=1767956&rev=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java Thu Nov 3 19:36:05 2016 @@ -24,7 +24,7 @@ * . * */ -package org.apache.hc.core5.util; +package org.apache.hc.core5.net; import java.net.URI; import java.net.URLEncoder; Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 3 19:36:05 2016 @@ -0,0 +1,6 @@ +/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:950681-950688 +/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1079518-1080165 +/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1376150-1376151,1447062 +/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:755593-811107 +/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1154913-1160573 +/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1024348-1031454 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java (from r1767954, httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java&r1=1767954&r2=1767956&rev=1767956&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java Thu Nov 3 19:36:05 2016 @@ -25,7 +25,7 @@ * */ -package org.apache.hc.core5.util; +package org.apache.hc.core5.net; import java.net.URI; import java.nio.charset.StandardCharsets; Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Nov 3 19:36:05 2016 @@ -0,0 +1,6 @@ +/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:950681-950688 +/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1079518-1080165 +/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1376150-1376151,1447062 +/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:755593-811107 +/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1154913-1160573 +/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1024348-1031454 Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/net/TestURLEncodedUtils.java ------------------------------------------------------------------------------ svn:mime-type = text/plain