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 1855C10A05 for ; Mon, 3 Mar 2014 12:11:11 +0000 (UTC) Received: (qmail 63650 invoked by uid 500); 3 Mar 2014 12:11:10 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 63565 invoked by uid 500); 3 Mar 2014 12:11:08 -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 63468 invoked by uid 99); 3 Mar 2014 12:11:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 12:11:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 12:10:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AFE2123889BB for ; Mon, 3 Mar 2014 12:10:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1573532 [1/5] - in /httpcomponents/httpclient-android/branches/4.3.3-android/src/main: ./ java/org/apache/http/auth/ java/org/apache/http/client/entity/ java/org/apache/http/client/methods/ java/org/apache/http/client/params/ java/org/apac... Date: Mon, 03 Mar 2014 12:10:18 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140303121024.AFE2123889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Mon Mar 3 12:10:15 2014 New Revision: 1573532 URL: http://svn.apache.org/r1573532 Log: Android specific modifications of HttpClient 4.3.3 Added: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml (with props) Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/auth/AuthStateHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DecompressingEntity.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/EntityBuilder.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpGetHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPatch.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPostHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPutHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/RequestBuilder.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/HttpClientContext.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/HttpClientUtils.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIBuilder.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/ContentType.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/FileEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/SerializableEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/entity/StringEntityHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/BHttpConnectionBase.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategyHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpRequestFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/DefaultHttpResponseFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalogHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/NoConnectionReuseStrategyHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/AuthSchemeBaseHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/DigestSchemeHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/NTLMSchemeHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/auth/RFC2617SchemeHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCookieStoreHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicCredentialsProviderHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/BasicResponseHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/CloseableHttpResponseProxy.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategyHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapperHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/InternalHttpClient.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/ProxyClient.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/RedirectLocationsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/package-info.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/WireHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpecHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2HC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookieHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicCommentHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicDomainHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicPathHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicSecureHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/CookieSpecBaseHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParserHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParserHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109SpecHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactoryHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965SpecHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandlerHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategyHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategyHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/execchain/MainClientExec.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/execchain/RedirectExec.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/execchain/RetryExec.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/AbstractMessageWriterHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/ChunkedInputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/ContentLengthInputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/ContentLengthOutputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/IdentityInputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/io/IdentityOutputStreamHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/io/HttpMessageParserFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/io/HttpMessageWriterFactory.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/message/BasicHeaderValueFormatterHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/message/BasicHeaderValueParserHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/message/BasicLineFormatterHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/message/BasicLineParserHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/params/HttpParamConfig.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/BasicHttpContextHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/HttpCoreContext.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/RequestConnControlHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/RequestContentHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/RequestDateHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/RequestTargetHostHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/RequestUserAgentHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/protocol/ResponseConnControlHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/util/EntityUtilsHC4.java httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/util/VersionInfoHC4.java Added: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml?rev=1573532&view=auto ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml (added) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml Mon Mar 3 12:10:15 2014 @@ -0,0 +1,8 @@ + + + + + Propchange: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/AndroidManifest.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/auth/AuthStateHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/auth/AuthStateHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/auth/AuthStateHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/auth/AuthStateHC4.java Mon Mar 3 12:10:15 2014 @@ -37,7 +37,7 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class AuthState { +public class AuthStateHC4 { /** Actual state of authentication protocol */ private AuthProtocolState state; @@ -54,7 +54,7 @@ public class AuthState { /** Available auth options */ private Queue authOptions; - public AuthState() { + public AuthStateHC4() { super(); this.state = AuthProtocolState.UNCHALLENGED; } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DecompressingEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DecompressingEntity.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DecompressingEntity.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DecompressingEntity.java Mon Mar 3 12:10:15 2014 @@ -31,7 +31,7 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.http.HttpEntity; -import org.apache.http.entity.HttpEntityWrapper; +import org.apache.http.entity.HttpEntityWrapperHC4; import org.apache.http.util.Args; /** @@ -39,7 +39,7 @@ import org.apache.http.util.Args; * * @since 4.1 */ -abstract class DecompressingEntity extends HttpEntityWrapper { +abstract class DecompressingEntity extends HttpEntityWrapperHC4 { /** * Default buffer size. Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java Mon Mar 3 12:10:15 2014 @@ -79,7 +79,7 @@ public class DeflateDecompressingEntity @Override public Header getContentEncoding() { - /* This HttpEntityWrapper has dealt with the Content-Encoding. */ + /* This HttpEntityWrapperHC4 has dealt with the Content-Encoding. */ return null; } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/EntityBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/EntityBuilder.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/EntityBuilder.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/EntityBuilder.java Mon Mar 3 12:10:15 2014 @@ -36,14 +36,14 @@ import java.util.List; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.entity.AbstractHttpEntity; -import org.apache.http.entity.BasicHttpEntity; -import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.AbstractHttpEntityHC4; +import org.apache.http.entity.BasicHttpEntityHC4; +import org.apache.http.entity.ByteArrayEntityHC4; import org.apache.http.entity.ContentType; -import org.apache.http.entity.FileEntity; -import org.apache.http.entity.InputStreamEntity; -import org.apache.http.entity.SerializableEntity; -import org.apache.http.entity.StringEntity; +import org.apache.http.entity.FileEntityHC4; +import org.apache.http.entity.InputStreamEntityHC4; +import org.apache.http.entity.SerializableEntityHC4; +import org.apache.http.entity.StringEntityHC4; /** * Builder for {@link HttpEntity} instances. @@ -310,23 +310,23 @@ public class EntityBuilder { * Creates new instance of {@link HttpEntity} based on the current state. */ public HttpEntity build() { - final AbstractHttpEntity e; + final AbstractHttpEntityHC4 e; if (this.text != null) { - e = new StringEntity(this.text, getContentOrDefault(ContentType.DEFAULT_TEXT)); + e = new StringEntityHC4(this.text, getContentOrDefault(ContentType.DEFAULT_TEXT)); } else if (this.binary != null) { - e = new ByteArrayEntity(this.binary, getContentOrDefault(ContentType.DEFAULT_BINARY)); + e = new ByteArrayEntityHC4(this.binary, getContentOrDefault(ContentType.DEFAULT_BINARY)); } else if (this.stream != null) { - e = new InputStreamEntity(this.stream, 1, getContentOrDefault(ContentType.DEFAULT_BINARY)); + e = new InputStreamEntityHC4(this.stream, 1, getContentOrDefault(ContentType.DEFAULT_BINARY)); } else if (this.parameters != null) { - e = new UrlEncodedFormEntity(this.parameters, + e = new UrlEncodedFormEntityHC4(this.parameters, this.contentType != null ? this.contentType.getCharset() : null); } else if (this.serializable != null) { - e = new SerializableEntity(this.serializable); + e = new SerializableEntityHC4(this.serializable); e.setContentType(ContentType.DEFAULT_BINARY.toString()); } else if (this.file != null) { - e = new FileEntity(this.file, getContentOrDefault(ContentType.DEFAULT_BINARY)); + e = new FileEntityHC4(this.file, getContentOrDefault(ContentType.DEFAULT_BINARY)); } else { - e = new BasicHttpEntity(); + e = new BasicHttpEntityHC4(); } if (e.getContentType() != null && this.contentType != null) { e.setContentType(this.contentType.toString()); Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java Mon Mar 3 12:10:15 2014 @@ -60,7 +60,7 @@ import java.util.zip.GZIPOutputStream; import org.apache.http.Header; import org.apache.http.HttpEntity; -import org.apache.http.entity.HttpEntityWrapper; +import org.apache.http.entity.HttpEntityWrapperHC4; import org.apache.http.message.BasicHeader; import org.apache.http.protocol.HTTP; import org.apache.http.util.Args; @@ -71,7 +71,7 @@ import org.apache.http.util.Args; * * @since 4.0 */ -public class GzipCompressingEntity extends HttpEntityWrapper { +public class GzipCompressingEntity extends HttpEntityWrapperHC4 { private static final String GZIP_CODEC = "gzip"; Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java Mon Mar 3 12:10:15 2014 @@ -63,7 +63,7 @@ public class GzipDecompressingEntity ext @Override public Header getContentEncoding() { - /* This HttpEntityWrapper has dealt with the Content-Encoding. */ + /* This HttpEntityWrapperHC4 has dealt with the Content-Encoding. */ return null; } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntityHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntityHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntityHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntityHC4.java Mon Mar 3 12:10:15 2014 @@ -32,9 +32,9 @@ import java.util.List; import org.apache.http.NameValuePair; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.client.utils.URLEncodedUtilsHC4; import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; +import org.apache.http.entity.StringEntityHC4; import org.apache.http.protocol.HTTP; /** @@ -43,8 +43,8 @@ import org.apache.http.protocol.HTTP; * * @since 4.0 */ -@NotThreadSafe // AbstractHttpEntity is not thread-safe -public class UrlEncodedFormEntity extends StringEntity { +@NotThreadSafe // AbstractHttpEntityHC4 is not thread-safe +public class UrlEncodedFormEntityHC4 extends StringEntityHC4 { /** * Constructs a new {@link UrlEncodedFormEntity} with the list @@ -54,12 +54,12 @@ public class UrlEncodedFormEntity extend * @param charset encoding the name/value pairs be encoded with * @throws UnsupportedEncodingException if the encoding isn't supported */ - public UrlEncodedFormEntity ( + public UrlEncodedFormEntityHC4 ( final List parameters, final String charset) throws UnsupportedEncodingException { - super(URLEncodedUtils.format(parameters, - charset != null ? charset : HTTP.DEF_CONTENT_CHARSET.name()), - ContentType.create(URLEncodedUtils.CONTENT_TYPE, charset)); + super(URLEncodedUtilsHC4.format(parameters, + charset != null ? charset : Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET).name()), + ContentType.create(URLEncodedUtilsHC4.CONTENT_TYPE, charset)); } /** @@ -71,12 +71,12 @@ public class UrlEncodedFormEntity extend * * @since 4.2 */ - public UrlEncodedFormEntity ( + public UrlEncodedFormEntityHC4 ( final Iterable parameters, final Charset charset) { - super(URLEncodedUtils.format(parameters, - charset != null ? charset : HTTP.DEF_CONTENT_CHARSET), - ContentType.create(URLEncodedUtils.CONTENT_TYPE, charset)); + super(URLEncodedUtilsHC4.format(parameters, + charset != null ? charset : Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET)), + ContentType.create(URLEncodedUtilsHC4.CONTENT_TYPE, charset)); } /** @@ -86,7 +86,7 @@ public class UrlEncodedFormEntity extend * @param parameters list of name/value pairs * @throws UnsupportedEncodingException if the default encoding isn't supported */ - public UrlEncodedFormEntity ( + public UrlEncodedFormEntityHC4 ( final List parameters) throws UnsupportedEncodingException { this(parameters, (Charset) null); } @@ -99,7 +99,7 @@ public class UrlEncodedFormEntity extend * * @since 4.2 */ - public UrlEncodedFormEntity ( + public UrlEncodedFormEntityHC4 ( final Iterable parameters) { this(parameters, null); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java Mon Mar 3 12:10:15 2014 @@ -31,7 +31,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import org.apache.http.HttpRequest; -import org.apache.http.client.utils.CloneUtils; +import org.apache.http.client.utils.CloneUtilsHC4; import org.apache.http.concurrent.Cancellable; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ConnectionReleaseTrigger; @@ -136,8 +136,8 @@ public abstract class AbstractExecutionA @Override public Object clone() throws CloneNotSupportedException { final AbstractExecutionAwareRequest clone = (AbstractExecutionAwareRequest) super.clone(); - clone.headergroup = CloneUtils.cloneObject(this.headergroup); - clone.params = CloneUtils.cloneObject(this.params); + clone.headergroup = CloneUtilsHC4.cloneObject(this.headergroup); + clone.params = CloneUtilsHC4.cloneObject(this.params); clone.abortLock = new ReentrantLock(); clone.cancellable = null; clone.aborted = false; Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java Mon Mar 3 12:10:15 2014 @@ -46,17 +46,17 @@ import org.apache.http.annotation.NotThr * * @since 4.0 */ -@NotThreadSafe // HttpRequestBase is @NotThreadSafe -public class HttpDelete extends HttpRequestBase { +@NotThreadSafe // HttpRequestBaseHC4 is @NotThreadSafe +public class HttpDeleteHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "DELETE"; - public HttpDelete() { + public HttpDeleteHC4() { super(); } - public HttpDelete(final URI uri) { + public HttpDeleteHC4(final URI uri) { super(); setURI(uri); } @@ -64,7 +64,7 @@ public class HttpDelete extends HttpRequ /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpDelete(final String uri) { + public HttpDeleteHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java Mon Mar 3 12:10:15 2014 @@ -31,7 +31,7 @@ import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.client.utils.CloneUtils; +import org.apache.http.client.utils.CloneUtilsHC4; import org.apache.http.protocol.HTTP; /** @@ -40,13 +40,13 @@ import org.apache.http.protocol.HTTP; * * @since 4.0 */ -@NotThreadSafe // HttpRequestBase is @NotThreadSafe -public abstract class HttpEntityEnclosingRequestBase - extends HttpRequestBase implements HttpEntityEnclosingRequest { +@NotThreadSafe // HttpRequestBaseHC4 is @NotThreadSafe +public abstract class HttpEntityEnclosingRequestBaseHC4 + extends HttpRequestBaseHC4 implements HttpEntityEnclosingRequest { private HttpEntity entity; - public HttpEntityEnclosingRequestBase() { + public HttpEntityEnclosingRequestBaseHC4() { super(); } @@ -65,10 +65,10 @@ public abstract class HttpEntityEnclosin @Override public Object clone() throws CloneNotSupportedException { - final HttpEntityEnclosingRequestBase clone = - (HttpEntityEnclosingRequestBase) super.clone(); + final HttpEntityEnclosingRequestBaseHC4 clone = + (HttpEntityEnclosingRequestBaseHC4) super.clone(); if (this.entity != null) { - clone.entity = CloneUtils.cloneObject(this.entity); + clone.entity = CloneUtilsHC4.cloneObject(this.entity); } return clone; } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpGetHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpGetHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpGetHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpGetHC4.java Mon Mar 3 12:10:15 2014 @@ -48,15 +48,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpGet extends HttpRequestBase { +public class HttpGetHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "GET"; - public HttpGet() { + public HttpGetHC4() { super(); } - public HttpGet(final URI uri) { + public HttpGetHC4(final URI uri) { super(); setURI(uri); } @@ -64,7 +64,7 @@ public class HttpGet extends HttpRequest /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpGet(final String uri) { + public HttpGetHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java Mon Mar 3 12:10:15 2014 @@ -51,15 +51,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpHead extends HttpRequestBase { +public class HttpHeadHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "HEAD"; - public HttpHead() { + public HttpHeadHC4() { super(); } - public HttpHead(final URI uri) { + public HttpHeadHC4(final URI uri) { super(); setURI(uri); } @@ -67,7 +67,7 @@ public class HttpHead extends HttpReques /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpHead(final String uri) { + public HttpHeadHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java Mon Mar 3 12:10:15 2014 @@ -56,15 +56,15 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class HttpOptions extends HttpRequestBase { +public class HttpOptionsHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "OPTIONS"; - public HttpOptions() { + public HttpOptionsHC4() { super(); } - public HttpOptions(final URI uri) { + public HttpOptionsHC4(final URI uri) { super(); setURI(uri); } @@ -72,7 +72,7 @@ public class HttpOptions extends HttpReq /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpOptions(final String uri) { + public HttpOptionsHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPatch.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPatch.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPatch.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPatch.java Mon Mar 3 12:10:15 2014 @@ -49,7 +49,7 @@ import org.apache.http.annotation.NotThr * @since 4.2 */ @NotThreadSafe -public class HttpPatch extends HttpEntityEnclosingRequestBase { +public class HttpPatch extends HttpEntityEnclosingRequestBaseHC4 { public final static String METHOD_NAME = "PATCH"; Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPostHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPostHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPostHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPostHC4.java Mon Mar 3 12:10:15 2014 @@ -55,15 +55,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpPost extends HttpEntityEnclosingRequestBase { +public class HttpPostHC4 extends HttpEntityEnclosingRequestBaseHC4 { public final static String METHOD_NAME = "POST"; - public HttpPost() { + public HttpPostHC4() { super(); } - public HttpPost(final URI uri) { + public HttpPostHC4(final URI uri) { super(); setURI(uri); } @@ -71,7 +71,7 @@ public class HttpPost extends HttpEntity /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpPost(final String uri) { + public HttpPostHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPutHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPutHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPutHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpPutHC4.java Mon Mar 3 12:10:15 2014 @@ -47,15 +47,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpPut extends HttpEntityEnclosingRequestBase { +public class HttpPutHC4 extends HttpEntityEnclosingRequestBaseHC4 { public final static String METHOD_NAME = "PUT"; - public HttpPut() { + public HttpPutHC4() { super(); } - public HttpPut(final URI uri) { + public HttpPutHC4(final URI uri) { super(); setURI(uri); } @@ -63,7 +63,7 @@ public class HttpPut extends HttpEntityE /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpPut(final String uri) { + public HttpPutHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java Mon Mar 3 12:10:15 2014 @@ -43,7 +43,7 @@ import org.apache.http.params.HttpProtoc */ @SuppressWarnings("deprecation") @NotThreadSafe -public abstract class HttpRequestBase extends AbstractExecutionAwareRequest +public abstract class HttpRequestBaseHC4 extends AbstractExecutionAwareRequest implements HttpUriRequest, Configurable { private ProtocolVersion version; Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java Mon Mar 3 12:10:15 2014 @@ -50,15 +50,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpTrace extends HttpRequestBase { +public class HttpTraceHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "TRACE"; - public HttpTrace() { + public HttpTraceHC4() { super(); } - public HttpTrace(final URI uri) { + public HttpTraceHC4(final URI uri) { super(); setURI(uri); } @@ -66,7 +66,7 @@ public class HttpTrace extends HttpReque /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpTrace(final String uri) { + public HttpTraceHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/RequestBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/RequestBuilder.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/RequestBuilder.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/methods/RequestBuilder.java Mon Mar 3 12:10:15 2014 @@ -29,6 +29,7 @@ package org.apache.http.client.methods; import java.net.URI; import java.net.URISyntaxException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -42,7 +43,7 @@ import org.apache.http.NameValuePair; import org.apache.http.ProtocolVersion; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.entity.UrlEncodedFormEntityHC4; import org.apache.http.client.utils.URIBuilder; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicNameValuePair; @@ -57,7 +58,7 @@ import org.apache.http.util.Args; * of the request: if the request has a content entity explicitly set with * {@link #setEntity(org.apache.http.HttpEntity)} or it is not an entity enclosing method * (such as POST or PUT), parameters will be added to the query component of the request URI. - * Otherwise, parameters will be added as a URL encoded {@link UrlEncodedFormEntity entity}. + * Otherwise, parameters will be added as a URL encoded {@link UrlEncodedFormEntityHC4 entity}. * * @since 4.3 */ @@ -87,31 +88,31 @@ public class RequestBuilder { } public static RequestBuilder get() { - return new RequestBuilder(HttpGet.METHOD_NAME); + return new RequestBuilder(HttpGetHC4.METHOD_NAME); } public static RequestBuilder head() { - return new RequestBuilder(HttpHead.METHOD_NAME); + return new RequestBuilder(HttpHeadHC4.METHOD_NAME); } public static RequestBuilder post() { - return new RequestBuilder(HttpPost.METHOD_NAME); + return new RequestBuilder(HttpPostHC4.METHOD_NAME); } public static RequestBuilder put() { - return new RequestBuilder(HttpPut.METHOD_NAME); + return new RequestBuilder(HttpPutHC4.METHOD_NAME); } public static RequestBuilder delete() { - return new RequestBuilder(HttpDelete.METHOD_NAME); + return new RequestBuilder(HttpDeleteHC4.METHOD_NAME); } public static RequestBuilder trace() { - return new RequestBuilder(HttpTrace.METHOD_NAME); + return new RequestBuilder(HttpTraceHC4.METHOD_NAME); } public static RequestBuilder options() { - return new RequestBuilder(HttpOptions.METHOD_NAME); + return new RequestBuilder(HttpOptionsHC4.METHOD_NAME); } public static RequestBuilder copy(final HttpRequest request) { @@ -285,13 +286,13 @@ public class RequestBuilder { } public HttpUriRequest build() { - final HttpRequestBase result; + final HttpRequestBaseHC4 result; URI uri = this.uri != null ? this.uri : URI.create("/"); HttpEntity entity = this.entity; if (parameters != null && !parameters.isEmpty()) { - if (entity == null && (HttpPost.METHOD_NAME.equalsIgnoreCase(method) - || HttpPut.METHOD_NAME.equalsIgnoreCase(method))) { - entity = new UrlEncodedFormEntity(parameters, HTTP.DEF_CONTENT_CHARSET); + if (entity == null && (HttpPostHC4.METHOD_NAME.equalsIgnoreCase(method) + || HttpPutHC4.METHOD_NAME.equalsIgnoreCase(method))) { + entity = new UrlEncodedFormEntityHC4(parameters, Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET)); } else { try { uri = new URIBuilder(uri).addParameters(parameters).build(); @@ -316,7 +317,7 @@ public class RequestBuilder { return result; } - static class InternalRequest extends HttpRequestBase { + static class InternalRequest extends HttpRequestBaseHC4 { private final String method; @@ -332,7 +333,7 @@ public class RequestBuilder { } - static class InternalEntityEclosingRequest extends HttpEntityEnclosingRequestBase { + static class InternalEntityEclosingRequest extends HttpEntityEnclosingRequestBaseHC4 { private final String method; Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java Mon Mar 3 12:10:15 2014 @@ -64,16 +64,10 @@ public final class HttpClientParamConfig ConnRoutePNames.DEFAULT_PROXY)) .setLocalAddress((InetAddress) params.getParameter( ConnRoutePNames.LOCAL_ADDRESS)) - .setProxyPreferredAuthSchemes((Collection) params.getParameter( - AuthPNames.PROXY_AUTH_PREF)) - .setTargetPreferredAuthSchemes((Collection) params.getParameter( - AuthPNames.TARGET_AUTH_PREF)) .setAuthenticationEnabled(params.getBooleanParameter( ClientPNames.HANDLE_AUTHENTICATION, true)) .setCircularRedirectsAllowed(params.getBooleanParameter( ClientPNames.ALLOW_CIRCULAR_REDIRECTS, false)) - .setConnectionRequestTimeout((int) params.getLongParameter( - ClientPNames.CONN_MANAGER_TIMEOUT, 0)) .setCookieSpec((String) params.getParameter( ClientPNames.COOKIE_POLICY)) .setMaxRedirects(params.getIntParameter( Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/HttpClientContext.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/HttpClientContext.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/HttpClientContext.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/HttpClientContext.java Mon Mar 3 12:10:15 2014 @@ -32,7 +32,7 @@ import java.util.List; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AuthSchemeProvider; -import org.apache.http.auth.AuthState; +import org.apache.http.auth.AuthStateHC4; import org.apache.http.client.AuthCache; import org.apache.http.client.CookieStore; import org.apache.http.client.CredentialsProvider; @@ -43,7 +43,7 @@ import org.apache.http.conn.routing.Rout import org.apache.http.cookie.CookieOrigin; import org.apache.http.cookie.CookieSpec; import org.apache.http.cookie.CookieSpecProvider; -import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.BasicHttpContextHC4; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpCoreContext; @@ -144,7 +144,7 @@ public class HttpClientContext extends H } public static HttpClientContext create() { - return new HttpClientContext(new BasicHttpContext()); + return new HttpClientContext(new BasicHttpContextHC4()); } public HttpClientContext(final HttpContext context) { @@ -217,12 +217,12 @@ public class HttpClientContext extends H setAttribute(AUTH_CACHE, authCache); } - public AuthState getTargetAuthState() { - return getAttribute(TARGET_AUTH_STATE, AuthState.class); + public AuthStateHC4 getTargetAuthState() { + return getAttribute(TARGET_AUTH_STATE, AuthStateHC4.class); } - public AuthState getProxyAuthState() { - return getAttribute(PROXY_AUTH_STATE, AuthState.class); + public AuthStateHC4 getProxyAuthState() { + return getAttribute(PROXY_AUTH_STATE, AuthStateHC4.class); } public T getUserToken(final Class clazz) { Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java Mon Mar 3 12:10:15 2014 @@ -65,11 +65,11 @@ import org.apache.http.util.TextUtils; * @since 4.0 */ @Immutable -public class RequestAddCookies implements HttpRequestInterceptor { +public class RequestAddCookiesHC4 implements HttpRequestInterceptor { private final Log log = LogFactory.getLog(getClass()); - public RequestAddCookies() { + public RequestAddCookiesHC4() { super(); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java Mon Mar 3 12:10:15 2014 @@ -39,7 +39,7 @@ import org.apache.http.annotation.Immuta import org.apache.http.auth.AuthProtocolState; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; -import org.apache.http.auth.AuthState; +import org.apache.http.auth.AuthStateHC4; import org.apache.http.auth.Credentials; import org.apache.http.client.AuthCache; import org.apache.http.client.CredentialsProvider; @@ -91,7 +91,7 @@ public class RequestAuthCache implements target.getSchemeName()); } - final AuthState targetState = clientContext.getTargetAuthState(); + final AuthStateHC4 targetState = clientContext.getTargetAuthState(); if (targetState != null && targetState.getState() == AuthProtocolState.UNCHALLENGED) { final AuthScheme authScheme = authCache.get(target); if (authScheme != null) { @@ -100,7 +100,7 @@ public class RequestAuthCache implements } final HttpHost proxy = route.getProxyHost(); - final AuthState proxyState = clientContext.getProxyAuthState(); + final AuthStateHC4 proxyState = clientContext.getProxyAuthState(); if (proxy != null && proxyState != null && proxyState.getState() == AuthProtocolState.UNCHALLENGED) { final AuthScheme authScheme = authCache.get(proxy); if (authScheme != null) { @@ -112,14 +112,14 @@ public class RequestAuthCache implements private void doPreemptiveAuth( final HttpHost host, final AuthScheme authScheme, - final AuthState authState, + final AuthStateHC4 authState, final CredentialsProvider credsProvider) { final String schemeName = authScheme.getSchemeName(); if (this.log.isDebugEnabled()) { this.log.debug("Re-using cached '" + schemeName + "' auth scheme for " + host); } - final AuthScope authScope = new AuthScope(host, AuthScope.ANY_REALM, schemeName); + final AuthScope authScope = new AuthScope(host.getHostName(), host.getPort(), AuthScope.ANY_REALM, schemeName); final Credentials creds = credsProvider.getCredentials(authScope); if (creds != null) { Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java Mon Mar 3 12:10:15 2014 @@ -46,19 +46,19 @@ import org.apache.http.util.Args; */ @SuppressWarnings("deprecation") @Immutable -public class RequestDefaultHeaders implements HttpRequestInterceptor { +public class RequestDefaultHeadersHC4 implements HttpRequestInterceptor { private final Collection defaultHeaders; /** * @since 4.3 */ - public RequestDefaultHeaders(final Collection defaultHeaders) { + public RequestDefaultHeadersHC4(final Collection defaultHeaders) { super(); this.defaultHeaders = defaultHeaders; } - public RequestDefaultHeaders() { + public RequestDefaultHeadersHC4() { this(null); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java Mon Mar 3 12:10:15 2014 @@ -54,11 +54,11 @@ import org.apache.http.util.Args; * @since 4.0 */ @Immutable -public class ResponseProcessCookies implements HttpResponseInterceptor { +public class ResponseProcessCookiesHC4 implements HttpResponseInterceptor { private final Log log = LogFactory.getLog(getClass()); - public ResponseProcessCookies() { + public ResponseProcessCookiesHC4() { super(); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java Mon Mar 3 12:10:15 2014 @@ -37,7 +37,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class CloneUtils { +public class CloneUtilsHC4 { /** * @since 4.3 @@ -80,7 +80,7 @@ public class CloneUtils { /** * This class should not be instantiated. */ - private CloneUtils() { + private CloneUtilsHC4() { } } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/HttpClientUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/HttpClientUtils.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/HttpClientUtils.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/HttpClientUtils.java Mon Mar 3 12:10:15 2014 @@ -33,7 +33,7 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.util.EntityUtils; +import org.apache.http.util.EntityUtilsHC4; /** * Convenience methods for closing response and client objects. @@ -72,7 +72,7 @@ public class HttpClientUtils { final HttpEntity entity = response.getEntity(); if (entity != null) { try { - EntityUtils.consume(entity); + EntityUtilsHC4.consume(entity); } catch (final IOException ex) { } } @@ -105,7 +105,7 @@ public class HttpClientUtils { if (response != null) { try { try { - EntityUtils.consume(response.getEntity()); + EntityUtilsHC4.consume(response.getEntity()); } finally { response.close(); } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIBuilder.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIBuilder.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIBuilder.java Mon Mar 3 12:10:15 2014 @@ -36,7 +36,7 @@ import java.util.List; import org.apache.http.Consts; import org.apache.http.NameValuePair; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.conn.util.InetAddressUtils; +import org.apache.http.conn.util.InetAddressUtilsHC4; import org.apache.http.message.BasicNameValuePair; /** @@ -92,7 +92,7 @@ public class URIBuilder { private List parseQuery(final String query, final Charset charset) { if (query != null && query.length() > 0) { - return URLEncodedUtils.parse(query, charset); + return URLEncodedUtilsHC4.parse(query, charset); } return null; } @@ -121,7 +121,7 @@ public class URIBuilder { } else if (this.userInfo != null) { sb.append(encodeUserInfo(this.userInfo)).append("@"); } - if (InetAddressUtils.isIPv6Address(this.host)) { + if (InetAddressUtilsHC4.isIPv6Address(this.host)) { sb.append("[").append(this.host).append("]"); } else { sb.append(this.host); @@ -168,19 +168,19 @@ public class URIBuilder { } private String encodeUserInfo(final String userInfo) { - return URLEncodedUtils.encUserInfo(userInfo, Consts.UTF_8); + return URLEncodedUtilsHC4.encUserInfo(userInfo, Consts.UTF_8); } private String encodePath(final String path) { - return URLEncodedUtils.encPath(path, Consts.UTF_8); + return URLEncodedUtilsHC4.encPath(path, Consts.UTF_8); } private String encodeUrlForm(final List params) { - return URLEncodedUtils.format(params, Consts.UTF_8); + return URLEncodedUtilsHC4.format(params, Consts.UTF_8); } private String encodeUric(final String fragment) { - return URLEncodedUtils.encUric(fragment, Consts.UTF_8); + return URLEncodedUtilsHC4.encUric(fragment, Consts.UTF_8); } /** @@ -259,7 +259,7 @@ public class URIBuilder { * * @deprecated (4.3) use {@link #setParameters(List)} or {@link #setParameters(NameValuePair...)} * - * @see URLEncodedUtils#parse + * @see URLEncodedUtilsHC4#parse */ @Deprecated public URIBuilder setQuery(final String query) { Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java Mon Mar 3 12:10:15 2014 @@ -44,7 +44,7 @@ import org.apache.http.util.TextUtils; * @since 4.0 */ @Immutable -public class URIUtils { +public class URIUtilsHC4 { /** * Constructs a {@link URI} using all the parameters. This should be @@ -156,7 +156,7 @@ public class URIUtils { /** * A convenience method for - * {@link URIUtils#rewriteURI(URI, HttpHost, boolean)} that always keeps the + * {@link URIUtilsHC4#rewriteURI(URI, HttpHost, boolean)} that always keeps the * fragment. */ public static URI rewriteURI( @@ -204,7 +204,7 @@ public class URIUtils { * @return the resulting URI */ public static URI resolve(final URI baseURI, final String reference) { - return URIUtils.resolve(baseURI, URI.create(reference)); + return URIUtilsHC4.resolve(baseURI, URI.create(reference)); } /** @@ -422,7 +422,7 @@ public class URIUtils { /** * This class should not be instantiated. */ - private URIUtils() { + private URIUtilsHC4() { } } Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java Mon Mar 3 12:10:15 2014 @@ -45,12 +45,12 @@ import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.annotation.Immutable; import org.apache.http.entity.ContentType; -import org.apache.http.message.BasicHeaderValueParser; +import org.apache.http.message.BasicHeaderValueParserHC4; import org.apache.http.message.BasicNameValuePair; import org.apache.http.message.ParserCursor; import org.apache.http.protocol.HTTP; import org.apache.http.util.CharArrayBuffer; -import org.apache.http.util.EntityUtils; +import org.apache.http.util.EntityUtilsHC4; /** * A collection of utilities for encoding URLs. @@ -58,7 +58,7 @@ import org.apache.http.util.EntityUtils; * @since 4.0 */ @Immutable -public class URLEncodedUtils { +public class URLEncodedUtilsHC4 { /** * The default HTML form content type. @@ -111,11 +111,11 @@ public class URLEncodedUtils { final HttpEntity entity) throws IOException { final ContentType contentType = ContentType.get(entity); if (contentType != null && contentType.getMimeType().equalsIgnoreCase(CONTENT_TYPE)) { - final String content = EntityUtils.toString(entity, Consts.ASCII); + final String content = EntityUtilsHC4.toString(entity, Consts.ASCII); if (content != null && content.length() > 0) { Charset charset = contentType.getCharset(); if (charset == null) { - charset = HTTP.DEF_CONTENT_CHARSET; + charset = Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET); } return parse(content, charset, QP_SEPS); } @@ -240,7 +240,7 @@ public class URLEncodedUtils { if (s == null) { return Collections.emptyList(); } - final BasicHeaderValueParser parser = BasicHeaderValueParser.INSTANCE; + final BasicHeaderValueParserHC4 parser = BasicHeaderValueParserHC4.INSTANCE; final CharArrayBuffer buffer = new CharArrayBuffer(s.length()); buffer.append(s); final ParserCursor cursor = new ParserCursor(0, buffer.length()); Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java Mon Mar 3 12:10:15 2014 @@ -44,7 +44,7 @@ import org.apache.http.util.Args; // don't use FilterInputStream as the base class, we'd have to // override markSupported(), mark(), and reset() to disable them @NotThreadSafe -public class EofSensorInputStream extends InputStream implements ConnectionReleaseTrigger { +public class EofSensorInputStreamHC4 extends InputStream implements ConnectionReleaseTrigger { /** * The wrapped input stream, while accessible. @@ -79,7 +79,7 @@ public class EofSensorInputStream extend * @param watcher the watcher for events, or null for * auto-close behavior without notification */ - public EofSensorInputStream(final InputStream in, + public EofSensorInputStreamHC4(final InputStream in, final EofSensorWatcher watcher) { Args.notNull(in, "Wrapped stream"); wrappedStream = in; Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java Mon Mar 3 12:10:15 2014 @@ -49,7 +49,7 @@ import javax.net.ssl.SSLSocket; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.annotation.Immutable; -import org.apache.http.conn.util.InetAddressUtils; +import org.apache.http.conn.util.InetAddressUtilsHC4; /** * Abstract base class for all standard {@link X509HostnameVerifier} @@ -58,7 +58,7 @@ import org.apache.http.conn.util.InetAdd * @since 4.0 */ @Immutable -public abstract class AbstractVerifier implements X509HostnameVerifier { +public abstract class AbstractVerifierHC4 implements X509HostnameVerifier { /** * This contains a list of 2nd-level domains that aren't allowed to @@ -81,7 +81,7 @@ public abstract class AbstractVerifier i private final Log log = LogFactory.getLog(getClass()); - public AbstractVerifier() { + public AbstractVerifierHC4() { super(); } @@ -374,15 +374,15 @@ public abstract class AbstractVerifier i private static boolean isIPAddress(final String hostname) { return hostname != null && - (InetAddressUtils.isIPv4Address(hostname) || - InetAddressUtils.isIPv6Address(hostname)); + (InetAddressUtilsHC4.isIPv4Address(hostname) || + InetAddressUtilsHC4.isIPv6Address(hostname)); } /* * Check if hostname is IPv6, and if so, convert to standard format. */ private String normaliseIPv6Address(final String hostname) { - if (hostname == null || !InetAddressUtils.isIPv6Address(hostname)) { + if (hostname == null || !InetAddressUtilsHC4.isIPv6Address(hostname)) { return hostname; } try { Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java Mon Mar 3 12:10:15 2014 @@ -37,7 +37,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class AllowAllHostnameVerifier extends AbstractVerifier { +public class AllowAllHostnameVerifierHC4 extends AbstractVerifierHC4 { public final void verify( final String host, Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java Mon Mar 3 12:10:15 2014 @@ -45,7 +45,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class BrowserCompatHostnameVerifier extends AbstractVerifier { +public class BrowserCompatHostnameVerifierHC4 extends AbstractVerifierHC4 { public final void verify( final String host, Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java Mon Mar 3 12:10:15 2014 @@ -122,13 +122,13 @@ public class SSLConnectionSocketFactory public static final String SSLV2 = "SSLv2"; public static final X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER - = new AllowAllHostnameVerifier(); + = new AllowAllHostnameVerifierHC4(); public static final X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER - = new BrowserCompatHostnameVerifier(); + = new BrowserCompatHostnameVerifierHC4(); public static final X509HostnameVerifier STRICT_HOSTNAME_VERIFIER - = new StrictHostnameVerifier(); + = new StrictHostnameVerifierHC4(); /** * Obtains default SSL socket factory with an SSL context based on the standard JSSE Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java Mon Mar 3 12:10:15 2014 @@ -52,7 +52,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class StrictHostnameVerifier extends AbstractVerifier { +public class StrictHostnameVerifierHC4 extends AbstractVerifierHC4 { public final void verify( final String host, Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java (original) +++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java Mon Mar 3 12:10:15 2014 @@ -37,9 +37,9 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class InetAddressUtils { +public class InetAddressUtilsHC4 { - private InetAddressUtils() { + private InetAddressUtilsHC4() { } private static final String IPV4_BASIC_PATTERN_STRING =