You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2010/04/23 21:19:31 UTC
svn commit: r937479 [1/12] - in /httpcomponents/httpclient/trunk:
httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/
httpclient-contrib/src/main/java/org/apache/http/contrib/auth/
httpclient/src/main/java/org/apache/http/auth/ httpcli...
Author: olegk
Date: Fri Apr 23 19:19:23 2010
New Revision: 937479
URL: http://svn.apache.org/viewvc?rev=937479&view=rev
Log:
TABS -> SPACES
Modified:
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Benchmark.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Stats.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpAgent.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient3.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient4.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpCore.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpJRE.java
httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestJettyHttpClient.java
httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSScheme.java
httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AUTH.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/ContextAwareAuthScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/Credentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CookieStore.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/UserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpUriRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/package.html
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/package.html
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/OperatedClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/package.html
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRoutePNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteInfo.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/package.html
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustManagerDecorator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/ClientCookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieRestrictionViolationException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SM.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngine.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RedirectLocations.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ConnectionShutdownException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/auth/TestCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpOptions.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestCookie2Support.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRedirects.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestRfc3492Idn.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestConnectionAutoRelease.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestConnectionReuse.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestHttpRoute.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/scheme/TestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/CertificatesToPlayWith.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestInetAddressUtils.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/cookie/TestCookieOrigin.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/cookie/TestCookiePathComparator.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/cookie/TestCookiePolicy.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestClientAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestContentCodings.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCookieIdentityComparator.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultConnKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestRedirectLocation.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/ExecReqThread.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/GetConnThread.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestLocalServer.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestSCMWithServer.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/tsccm/AwaitThread.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/tsccm/TestConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieBestMatchSpec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestDateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestNetscapeCookieAttribHandlers.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestNetscapeDraftHeaderParser.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestRFC2109CookieAttribHandlers.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/BasicServerTestBase.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RequestBasicAuth.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/ResponseBasicUnauthorized.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/ServerTestBase.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/HttpConnectionMockup.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/Header.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipartMode.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MIME.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MinimalField.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ContentBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ContentDescriptor.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/package.html
httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Benchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Benchmark.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Benchmark.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Benchmark.java Fri Apr 23 19:19:23 2010
@@ -52,21 +52,21 @@ public class Benchmark {
connector.setRequestBufferSize(12 * 1024);
connector.setResponseBufferSize(12 * 1024);
connector.setAcceptors(2);
-
+
QueuedThreadPool threadpool = new QueuedThreadPool();
threadpool.setMinThreads(25);
threadpool.setMaxThreads(200);
-
+
Server server = new Server();
server.addConnector(connector);
server.setThreadPool(threadpool);
server.setHandler(new RandomDataHandler());
-
+
server.start();
int port = connector.getLocalPort();
int n = 200000;
int contentLen = 2048;
-
+
TestHttpAgent[] agents = new TestHttpAgent[] {
new TestHttpClient3(),
new TestHttpJRE(),
@@ -78,7 +78,7 @@ public class Benchmark {
for (TestHttpAgent agent: agents) {
agent.init();
}
-
+
byte[] content = new byte[contentLen];
int r = Math.abs(content.hashCode());
for (int i = 0; i < content.length; i++) {
@@ -87,7 +87,7 @@ public class Benchmark {
URI target1 = new URI("http", null, "localhost", port, "/rnd", "c=" + contentLen, null);
URI target2 = new URI("http", null, "localhost", port, "/echo", null, null);
-
+
try {
for (TestHttpAgent agent: agents) {
System.out.println("=================================");
@@ -95,7 +95,7 @@ public class Benchmark {
System.out.println("---------------------------------");
System.out.println(n + " GET requests");
System.out.println("---------------------------------");
-
+
long startTime1 = System.currentTimeMillis();
Stats stats1 = agent.get(target1, n);
long finishTime1 = System.currentTimeMillis();
@@ -103,7 +103,7 @@ public class Benchmark {
System.out.println("---------------------------------");
System.out.println(n + " POST requests");
System.out.println("---------------------------------");
-
+
long startTime2 = System.currentTimeMillis();
Stats stats2 = agent.post(target2, content, n);
long finishTime2 = System.currentTimeMillis();
@@ -117,15 +117,15 @@ public class Benchmark {
}
static class RandomDataHandler extends AbstractHandler {
-
+
public RandomDataHandler() {
super();
}
-
+
public void handle(
- final String target,
- final Request baseRequest,
- final HttpServletRequest request,
+ final String target,
+ final Request baseRequest,
+ final HttpServletRequest request,
final HttpServletResponse response) throws IOException, ServletException {
if (target.equals("/rnd")) {
rnd(request, response);
@@ -140,7 +140,7 @@ public class Benchmark {
}
private void rnd(
- final HttpServletRequest request,
+ final HttpServletRequest request,
final HttpServletResponse response) throws IOException, ServletException {
int count = 100;
String s = request.getParameter("c");
@@ -153,10 +153,10 @@ public class Benchmark {
writer.flush();
return;
}
-
+
response.setStatus(200);
response.setContentLength(count);
-
+
OutputStream outstream = response.getOutputStream();
byte[] tmp = new byte[1024];
int r = Math.abs(tmp.hashCode());
@@ -171,28 +171,28 @@ public class Benchmark {
}
outstream.flush();
}
-
+
private void echo(
- final HttpServletRequest request,
+ final HttpServletRequest request,
final HttpServletResponse response) throws IOException, ServletException {
- ByteArrayOutputStream2 buffer = new ByteArrayOutputStream2();
+ ByteArrayOutputStream2 buffer = new ByteArrayOutputStream2();
InputStream instream = request.getInputStream();
if (instream != null) {
IO.copy(instream, buffer);
buffer.flush();
}
byte[] content = buffer.getBuf();
-
+
response.setStatus(200);
response.setContentLength(content.length);
-
+
OutputStream outstream = response.getOutputStream();
outstream.write(content);
outstream.flush();
}
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Stats.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Stats.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Stats.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Stats.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ public class Stats {
private String serverName = "unknown";
private long contentLen = 0;
private long totalContentLen = 0;
-
+
public Stats() {
super();
}
@@ -78,13 +78,13 @@ public class Stats {
public void setTotalContentLen(long totalContentLen) {
this.totalContentLen = totalContentLen;
}
-
+
public static void printStats(
final URI targetURI, long startTime, long finishTime, final Stats stats) {
float totalTimeSec = (float) (finishTime - startTime) / 1000;
float reqsPerSec = (float) stats.getSuccessCount() / totalTimeSec;
float timePerReqMs = (float) (finishTime - startTime) / (float) stats.getSuccessCount();
-
+
System.out.print("Server Software:\t");
System.out.println(stats.getServerName());
System.out.println();
@@ -111,5 +111,5 @@ public class Stats {
System.out.print(timePerReqMs);
System.out.println(" [ms] (mean)");
}
-
+
}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpAgent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpAgent.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpAgent.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpAgent.java Fri Apr 23 19:19:23 2010
@@ -30,11 +30,11 @@ import java.net.URI;
public interface TestHttpAgent {
void init() throws Exception;
-
+
String getClientName();
-
+
Stats get(URI target, int count) throws Exception;
-
+
Stats post(URI target, byte[] content, int n) throws Exception;
-
+
}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient3.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient3.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient3.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient3.java Fri Apr 23 19:19:23 2010
@@ -41,7 +41,7 @@ import org.apache.commons.httpclient.par
public class TestHttpClient3 implements TestHttpAgent {
private final HttpClient httpclient;
-
+
public TestHttpClient3() {
super();
this.httpclient = new HttpClient();
@@ -59,14 +59,14 @@ public class TestHttpClient3 implements
public Stats execute(final HttpMethod httpmethod, int n) throws Exception {
Stats stats = new Stats();
-
+
int successCount = 0;
int failureCount = 0;
long contentLen = 0;
long totalContentLen = 0;
-
+
byte[] buffer = new byte[4096];
-
+
for (int i = 0; i < n; i++) {
try {
this.httpclient.executeMethod(httpmethod);
@@ -97,7 +97,7 @@ public class TestHttpClient3 implements
stats.setTotalContentLen(totalContentLen);
return stats;
}
-
+
public Stats get(final URI target, int n) throws Exception {
GetMethod httpget = new GetMethod(target.toASCIIString());
return execute(httpget, n);
@@ -120,13 +120,13 @@ public class TestHttpClient3 implements
}
URI targetURI = new URI(args[0]);
int n = Integer.parseInt(args[1]);
-
- TestHttpClient3 test = new TestHttpClient3();
-
+
+ TestHttpClient3 test = new TestHttpClient3();
+
long startTime = System.currentTimeMillis();
Stats stats = test.get(targetURI, n);
long finishTime = System.currentTimeMillis();
-
+
Stats.printStats(targetURI, startTime, finishTime, stats);
}
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient4.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient4.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpClient4.java Fri Apr 23 19:19:23 2010
@@ -48,7 +48,7 @@ import org.apache.http.util.VersionInfo;
public class TestHttpClient4 implements TestHttpAgent {
private final HttpClient httpclient;
-
+
public TestHttpClient4() {
super();
HttpParams params = new SyncBasicHttpParams();
@@ -60,7 +60,7 @@ public class TestHttpClient4 implements
false);
params.setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE,
8 * 1024);
-
+
this.httpclient = new DefaultHttpClient(params);
}
@@ -69,14 +69,14 @@ public class TestHttpClient4 implements
public Stats execute(final HttpUriRequest request, int n) throws Exception {
Stats stats = new Stats();
-
+
int successCount = 0;
int failureCount = 0;
long contentLen = 0;
long totalContentLen = 0;
-
+
byte[] buffer = new byte[4096];
-
+
for (int i = 0; i < n; i++) {
HttpResponse response = this.httpclient.execute(request);
HttpEntity entity = response.getEntity();
@@ -109,23 +109,23 @@ public class TestHttpClient4 implements
stats.setContentLen(contentLen);
stats.setTotalContentLen(totalContentLen);
return stats;
- }
-
+ }
+
public Stats get(final URI target, int n) throws Exception {
HttpGet httpget = new HttpGet(target);
return execute(httpget, n);
}
-
+
public Stats post(final URI target, byte[] content, int n) throws Exception {
HttpPost httppost = new HttpPost(target);
httppost.setEntity(new ByteArrayEntity(content));
return execute(httppost, n);
}
-
+
public String getClientName() {
- VersionInfo vinfo = VersionInfo.loadVersionInfo("org.apache.http.client",
+ VersionInfo vinfo = VersionInfo.loadVersionInfo("org.apache.http.client",
Thread.currentThread().getContextClassLoader());
- return "Apache HttpClient 4 (ver: " +
+ return "Apache HttpClient 4 (ver: " +
((vinfo != null) ? vinfo.getRelease() : VersionInfo.UNAVAILABLE) + ")";
}
@@ -136,14 +136,14 @@ public class TestHttpClient4 implements
}
URI targetURI = new URI(args[0]);
int n = Integer.parseInt(args[1]);
-
- TestHttpClient4 test = new TestHttpClient4();
-
+
+ TestHttpClient4 test = new TestHttpClient4();
+
long startTime = System.currentTimeMillis();
Stats stats = test.get(targetURI, n);
long finishTime = System.currentTimeMillis();
-
+
Stats.printStats(targetURI, startTime, finishTime, stats);
}
-
-}
\ No newline at end of file
+
+}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpCore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpCore.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpCore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpCore.java Fri Apr 23 19:19:23 2010
@@ -66,7 +66,7 @@ public class TestHttpCore implements Tes
private final HttpProcessor httpproc;
private final HttpRequestExecutor httpexecutor;
private final ConnectionReuseStrategy connStrategy;
-
+
public TestHttpCore() {
super();
this.params = new SyncBasicHttpParams();
@@ -78,32 +78,32 @@ public class TestHttpCore implements Tes
false);
this.params.setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE,
8 * 1024);
-
+
this.httpproc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
new RequestContent(),
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent()
-
+
}, null);
this.httpexecutor = new HttpRequestExecutor();
this.connStrategy = new DefaultConnectionReuseStrategy();
}
-
+
public void init() {
}
public Stats execute(
final HttpHost targetHost, final HttpRequest request, int n) throws Exception {
-
+
Stats stats = new Stats();
-
+
int successCount = 0;
int failureCount = 0;
long contentLen = 0;
long totalContentLen = 0;
-
+
byte[] buffer = new byte[4096];
HttpContext context = new BasicHttpContext();
@@ -122,7 +122,7 @@ public class TestHttpCore implements Tes
this.httpexecutor.preProcess(request, this.httpproc, context);
HttpResponse response = this.httpexecutor.execute(request, conn, context);
this.httpexecutor.postProcess(response, this.httpproc, context);
-
+
HttpEntity entity = response.getEntity();
if (entity != null) {
InputStream instream = entity.getContent();
@@ -161,7 +161,7 @@ public class TestHttpCore implements Tes
stats.setTotalContentLen(totalContentLen);
return stats;
}
-
+
public Stats get(final URI target, int n) throws Exception {
HttpHost targetHost = new HttpHost(target.getHost(), target.getPort());
StringBuilder buffer = new StringBuilder();
@@ -173,7 +173,7 @@ public class TestHttpCore implements Tes
BasicHttpRequest httpget = new BasicHttpRequest("GET", buffer.toString());
return execute(targetHost, httpget, n);
}
-
+
public Stats post(final URI target, byte[] content, int n) throws Exception {
HttpHost targetHost = new HttpHost(target.getHost(), target.getPort());
StringBuilder buffer = new StringBuilder();
@@ -182,16 +182,16 @@ public class TestHttpCore implements Tes
buffer.append("?");
buffer.append(target.getQuery());
}
- BasicHttpEntityEnclosingRequest httppost = new BasicHttpEntityEnclosingRequest("POST",
+ BasicHttpEntityEnclosingRequest httppost = new BasicHttpEntityEnclosingRequest("POST",
buffer.toString());
httppost.setEntity(new ByteArrayEntity(content));
return execute(targetHost, httppost, n);
}
-
+
public String getClientName() {
- VersionInfo vinfo = VersionInfo.loadVersionInfo("org.apache.http",
+ VersionInfo vinfo = VersionInfo.loadVersionInfo("org.apache.http",
Thread.currentThread().getContextClassLoader());
- return "Apache HttpCore 4 (ver: " +
+ return "Apache HttpCore 4 (ver: " +
((vinfo != null) ? vinfo.getRelease() : VersionInfo.UNAVAILABLE) + ")";
}
@@ -203,13 +203,13 @@ public class TestHttpCore implements Tes
URI targetURI = new URI(args[0]);
int n = Integer.parseInt(args[1]);
- TestHttpCore test = new TestHttpCore();
-
+ TestHttpCore test = new TestHttpCore();
+
long startTime = System.currentTimeMillis();
Stats stats = test.get(targetURI, n);
long finishTime = System.currentTimeMillis();
-
+
Stats.printStats(targetURI, startTime, finishTime, stats);
}
-
+
}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpJRE.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpJRE.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpJRE.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestHttpJRE.java Fri Apr 23 19:19:23 2010
@@ -37,25 +37,25 @@ public class TestHttpJRE implements Test
public TestHttpJRE() {
super();
}
-
+
public void init() {
}
public Stats execute(final URI targetURI, byte[] content, int n) throws Exception {
Stats stats = new Stats();
-
+
int successCount = 0;
int failureCount = 0;
long contentLen = 0;
long totalContentLen = 0;
-
+
byte[] buffer = new byte[4096];
-
+
URL url = targetURI.toURL();
for (int i = 0; i < n; i++) {
HttpURLConnection c = (HttpURLConnection) url.openConnection();
-
+
if (content != null) {
c.setRequestMethod("POST");
c.setFixedLengthStreamingMode(content.length);
@@ -96,15 +96,15 @@ public class TestHttpJRE implements Test
stats.setTotalContentLen(totalContentLen);
return stats;
}
-
+
public Stats get(final URI target, int n) throws Exception {
return execute(target, null, n);
}
-
+
public Stats post(final URI target, byte[] content, int n) throws Exception {
return execute(target, content, n);
}
-
+
public String getClientName() {
return "JRE HTTP " + System.getProperty("java.version");
}
@@ -117,13 +117,13 @@ public class TestHttpJRE implements Test
URI targetURI = new URI(args[0]);
int n = Integer.parseInt(args[1]);
- TestHttpJRE test = new TestHttpJRE();
-
+ TestHttpJRE test = new TestHttpJRE();
+
long startTime = System.currentTimeMillis();
Stats stats = test.get(targetURI, n);
long finishTime = System.currentTimeMillis();
-
+
Stats.printStats(targetURI, startTime, finishTime, stats);
}
-
-}
\ No newline at end of file
+
+}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestJettyHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestJettyHttpClient.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestJettyHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/TestJettyHttpClient.java Fri Apr 23 19:19:23 2010
@@ -37,7 +37,7 @@ import org.eclipse.jetty.server.Server;
public class TestJettyHttpClient implements TestHttpAgent {
private final HttpClient client;
-
+
public TestJettyHttpClient() {
super();
this.client = new HttpClient();
@@ -45,7 +45,7 @@ public class TestJettyHttpClient impleme
this.client.setRequestBufferSize(8 * 1024);
this.client.setResponseBufferSize(8 * 1024);
}
-
+
public void init() throws Exception {
this.client.start();
}
@@ -53,11 +53,11 @@ public class TestJettyHttpClient impleme
public Stats execute(final URI targetURI, byte[] content, int n) throws Exception {
Stats stats = new Stats();
-
+
int successCount = 0;
int failureCount = 0;
long totalContentLen = 0;
-
+
for (int i = 0; i < n; i++) {
SimpleHttpExchange exchange = new SimpleHttpExchange();
exchange.setURL(targetURI.toASCIIString());
@@ -66,7 +66,7 @@ public class TestJettyHttpClient impleme
exchange.setMethod("POST");
exchange.setRequestContent(new ByteArrayBuffer(content));
}
-
+
try {
this.client.send(exchange);
exchange.waitForDone();
@@ -89,15 +89,15 @@ public class TestJettyHttpClient impleme
stats.setTotalContentLen(totalContentLen);
return stats;
}
-
+
public Stats get(final URI target, int n) throws Exception {
return execute(target, null, n);
}
-
+
public Stats post(final URI target, byte[] content, int n) throws Exception {
return execute(target, content, n);
}
-
+
public String getClientName() {
return "Jetty " + Server.getVersion();
}
@@ -110,34 +110,34 @@ public class TestJettyHttpClient impleme
URI targetURI = new URI(args[0]);
int n = Integer.parseInt(args[1]);
- TestJettyHttpClient test = new TestJettyHttpClient();
-
+ TestJettyHttpClient test = new TestJettyHttpClient();
+
long startTime = System.currentTimeMillis();
Stats stats = test.get(targetURI, n);
long finishTime = System.currentTimeMillis();
-
+
Stats.printStats(targetURI, startTime, finishTime, stats);
}
static class SimpleHttpExchange extends HttpExchange {
-
+
private final Buffer serverHeader = new ByteArrayBuffer("Server");
-
+
long contentLen = 0;
int status = 0;
String server;
-
+
protected void onResponseStatus(
final Buffer version, int status, final Buffer reason) throws IOException {
this.status = status;
super.onResponseStatus(version, status, reason);
}
-
+
@Override
protected void onResponseHeader(final Buffer name, final Buffer value) throws IOException {
super.onResponseHeader(name, value);
if (name.equalsIgnoreCase(this.serverHeader)) {
- this.server = value.toString("ASCII");
+ this.server = value.toString("ASCII");
}
}
@@ -146,7 +146,7 @@ public class TestJettyHttpClient impleme
this.contentLen += content.length();
super.onResponseContent(content);
}
-
+
};
-
-}
\ No newline at end of file
+
+}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSScheme.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSScheme.java Fri Apr 23 19:19:23 2010
@@ -58,7 +58,7 @@ import org.apache.http.message.BasicHead
* .html?RESTAuthentication.html}
*/
public class AWSScheme implements AuthScheme {
-
+
private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1";
public static final String NAME = "AWS";
@@ -66,7 +66,7 @@ public class AWSScheme implements AuthSc
}
public Header authenticate(
- final Credentials credentials,
+ final Credentials credentials,
final HttpRequest request) throws AuthenticationException {
// If the Date header has not been provided add it as it is required
if (request.getFirstHeader("Date") == null) {
@@ -102,7 +102,7 @@ public class AWSScheme implements AuthSc
/**
* Computes RFC 2104-compliant HMAC signature.
- *
+ *
* @param data
* The data to be signed.
* @param key
@@ -112,7 +112,7 @@ public class AWSScheme implements AuthSc
* when signature generation fails
*/
private static String calculateRFC2104HMAC(
- final String data,
+ final String data,
final String key) throws AuthenticationException {
try {
// get an hmac_sha1 key from the raw key bytes
@@ -131,14 +131,14 @@ public class AWSScheme implements AuthSc
} catch (InvalidKeyException ex) {
throw new AuthenticationException("Failed to generate HMAC: " + ex.getMessage(), ex);
} catch (NoSuchAlgorithmException ex) {
- throw new AuthenticationException(HMAC_SHA1_ALGORITHM +
+ throw new AuthenticationException(HMAC_SHA1_ALGORITHM +
" algorithm is not supported", ex);
}
}
/**
* Returns the canonicalized AMZ headers.
- *
+ *
* @param headers
* The list of request headers.
* @return The canonicalized AMZ headers.
@@ -179,7 +179,7 @@ public class AWSScheme implements AuthSc
/**
* Returns the canonicalized resource.
- *
+ *
* @param uri
* The resource uri
* @param hostName
Modified: httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSSchemeFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/AWSSchemeFactory.java Fri Apr 23 19:19:23 2010
@@ -36,9 +36,9 @@ import org.apache.http.params.HttpParams
* {@link AWSScheme} instances.
*/
public class AWSSchemeFactory implements AuthSchemeFactory {
-
+
public AuthScheme newInstance(final HttpParams params) {
return new AWSScheme();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-contrib/src/main/java/org/apache/http/contrib/auth/BouncySpnegoTokenGenerator.java Fri Apr 23 19:19:23 2010
@@ -51,7 +51,7 @@ public class BouncySpnegoTokenGenerator
private final DERObjectIdentifier spnegoOid;
private final DERObjectIdentifier kerbOid;
-
+
public BouncySpnegoTokenGenerator() {
super();
this.spnegoOid = new DERObjectIdentifier("1.3.6.1.5.5.2");
@@ -60,7 +60,7 @@ public class BouncySpnegoTokenGenerator
public byte [] generateSpnegoDERObject(byte [] kerbTicket) throws IOException {
DEROctetString ourKerberosTicket = new DEROctetString(kerbTicket);
-
+
DERSequence kerbOidSeq = new DERSequence(kerbOid);
DERTaggedObject tagged0 = new DERTaggedObject(0, kerbOidSeq);
DERTaggedObject tagged2 = new DERTaggedObject(2, ourKerberosTicket);
@@ -69,22 +69,22 @@ public class BouncySpnegoTokenGenerator
v.add(tagged2);
DERSequence seq = new DERSequence(v);
DERTaggedObject taggedSpnego = new DERTaggedObject(0, seq);
-
+
ByteArrayOutputStream out = new ByteArrayOutputStream();
ASN1OutputStream asn1Out = new ASN1OutputStream(out);
ASN1Object spnegoOIDASN1 = (ASN1Object) spnegoOid.toASN1Object();
ASN1Object taggedSpnegoASN1 = (ASN1Object) taggedSpnego.toASN1Object();
-
+
int length = spnegoOIDASN1.getDEREncoded().length + taggedSpnegoASN1.getDEREncoded().length;
byte [] lenBytes = writeLength(length);
byte[] appWrap = new byte[lenBytes.length + 1];
-
+
appWrap[0] = 0x60;
for(int i=1; i < appWrap.length; i++){
appWrap[i] = lenBytes[i-1];
}
-
+
asn1Out.write(appWrap);
asn1Out.writeObject(spnegoOid.toASN1Object());
asn1Out.writeObject(taggedSpnego.toASN1Object());
@@ -101,7 +101,7 @@ public class BouncySpnegoTokenGenerator
ASN1InputStream ourSpnego = new ASN1InputStream( manipBytes );
log.debug(ASN1Dump.dumpAsString(ourSpnego.readObject()));
}
-
+
return in.readObject().getDEREncoded();
}
@@ -114,7 +114,7 @@ public class BouncySpnegoTokenGenerator
while ((val >>>= 8) != 0) {
size++;
}
-
+
out.write((byte) (size | 0x80));
for (int i = (size - 1) * 8; i >= 0; i -= 8) {
@@ -125,5 +125,5 @@ public class BouncySpnegoTokenGenerator
}
return out.toByteArray();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AUTH.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AUTH.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AUTH.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AUTH.java Fri Apr 23 19:19:23 2010
@@ -31,7 +31,7 @@ import org.apache.http.annotation.Immuta
/**
* Constants and static helpers related to the HTTP authentication.
- *
+ *
*
* @since 4.0
*/
@@ -57,8 +57,8 @@ public final class AUTH {
* The proxy authenticate response header.
*/
public static final String PROXY_AUTH_RESP = "Proxy-Authorization";
-
+
private AUTH() {
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@ import org.apache.http.Header;
import org.apache.http.HttpRequest;
/**
- * This interface represents an abstract challenge-response oriented
+ * This interface represents an abstract challenge-response oriented
* authentication scheme.
* <p>
* An authentication scheme should be able to support the following
@@ -43,15 +43,15 @@ import org.apache.http.HttpRequest;
* <li>Provide the realm this authentication scheme is applicable to,
* if available
* <li>Generate authorization string for the given set of credentials
- * and the HTTP request in response to the authorization challenge.
+ * and the HTTP request in response to the authorization challenge.
* </ul>
* <p>
- * Authentication schemes may be stateful involving a series of
+ * Authentication schemes may be stateful involving a series of
* challenge-response exchanges.
* <p>
* IMPORTANT: implementations of this interface MUST also implement {@link ContextAwareAuthScheme}
- * interface in order to remain API compatible with newer versions of HttpClient.
- *
+ * interface in order to remain API compatible with newer versions of HttpClient.
+ *
* @since 4.0
*/
@@ -59,25 +59,25 @@ public interface AuthScheme {
/**
* Processes the given challenge token. Some authentication schemes
- * may involve multiple challenge-response exchanges. Such schemes must be able
- * to maintain the state information when dealing with sequential challenges
- *
+ * may involve multiple challenge-response exchanges. Such schemes must be able
+ * to maintain the state information when dealing with sequential challenges
+ *
* @param header the challenge header
*/
void processChallenge(final Header header) throws MalformedChallengeException;
-
+
/**
* Returns textual designation of the given authentication scheme.
- *
+ *
* @return the name of the given authentication scheme
*/
String getSchemeName();
/**
* Returns authentication parameter with the given name, if available.
- *
+ *
* @param name The name of the parameter to be returned
- *
+ *
* @return the parameter with the given name
*/
String getParameter(final String name);
@@ -86,45 +86,45 @@ public interface AuthScheme {
* Returns authentication realm. If the concept of an authentication
* realm is not applicable to the given authentication scheme, returns
* <code>null</code>.
- *
+ *
* @return the authentication realm
*/
String getRealm();
-
+
/**
* Tests if the authentication scheme is provides authorization on a per
* connection basis instead of usual per request basis
- *
+ *
* @return <tt>true</tt> if the scheme is connection based, <tt>false</tt>
* if the scheme is request based.
*/
- boolean isConnectionBased();
-
+ boolean isConnectionBased();
+
/**
* Authentication process may involve a series of challenge-response exchanges.
* This method tests if the authorization process has been completed, either
- * successfully or unsuccessfully, that is, all the required authorization
+ * successfully or unsuccessfully, that is, all the required authorization
* challenges have been processed in their entirety.
- *
- * @return <tt>true</tt> if the authentication process has been completed,
+ *
+ * @return <tt>true</tt> if the authentication process has been completed,
* <tt>false</tt> otherwise.
*/
- boolean isComplete();
+ boolean isComplete();
/**
* Produces an authorization string for the given set of {@link Credentials}.
- *
+ *
* @param credentials The set of credentials to be used for athentication
* @param request The request being authenticated
- * @throws AuthenticationException if authorization string cannot
+ * @throws AuthenticationException if authorization string cannot
* be generated due to an authentication failure
- *
+ *
* @return the authorization string
- *
+ *
* @deprecated Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
*/
@Deprecated
- Header authenticate(Credentials credentials, HttpRequest request)
+ Header authenticate(Credentials credentials, HttpRequest request)
throws AuthenticationException;
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeFactory.java Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@ package org.apache.http.auth;
import org.apache.http.params.HttpParams;
/**
- * Factory for {@link AuthScheme} implementations.
+ * Factory for {@link AuthScheme} implementations.
*
* @since 4.0
*/
@@ -38,9 +38,9 @@ public interface AuthSchemeFactory {
/**
* Creates an instance of {@link AuthScheme} using given HTTP parameters.
- *
+ *
* @param params HTTP parameters.
- *
+ *
* @return auth scheme.
*/
AuthScheme newInstance(HttpParams params);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java Fri Apr 23 19:19:23 2010
@@ -39,36 +39,36 @@ import org.apache.http.params.HttpParams
/**
* Authentication scheme registry that can be used to obtain the corresponding
* authentication scheme implementation for a given type of authorization challenge.
- *
+ *
* @since 4.0
*/
@ThreadSafe
public final class AuthSchemeRegistry {
private final ConcurrentHashMap<String,AuthSchemeFactory> registeredSchemes;
-
+
public AuthSchemeRegistry() {
super();
this.registeredSchemes = new ConcurrentHashMap<String,AuthSchemeFactory>();
}
-
+
/**
- * Registers a {@link AuthSchemeFactory} with the given identifier. If a factory with the
- * given name already exists it will be overridden. This name is the same one used to
+ * Registers a {@link AuthSchemeFactory} with the given identifier. If a factory with the
+ * given name already exists it will be overridden. This name is the same one used to
* retrieve the {@link AuthScheme authentication scheme} from {@link #getAuthScheme}.
- *
+ *
* <p>
- * Please note that custom authentication preferences, if used, need to be updated accordingly
+ * Please note that custom authentication preferences, if used, need to be updated accordingly
* for the new {@link AuthScheme authentication scheme} to take effect.
- * </p>
- *
+ * </p>
+ *
* @param name the identifier for this scheme
* @param factory the {@link AuthSchemeFactory} class to register
- *
+ *
* @see #getAuthScheme
*/
public void register(
- final String name,
+ final String name,
final AuthSchemeFactory factory) {
if (name == null) {
throw new IllegalArgumentException("Name may not be null");
@@ -80,9 +80,9 @@ public final class AuthSchemeRegistry {
}
/**
- * Unregisters the class implementing an {@link AuthScheme authentication scheme} with
+ * Unregisters the class implementing an {@link AuthScheme authentication scheme} with
* the given name.
- *
+ *
* @param name the identifier of the class to unregister
*/
public void unregister(final String name) {
@@ -94,16 +94,16 @@ public final class AuthSchemeRegistry {
/**
* Gets the {@link AuthScheme authentication scheme} with the given name.
- *
+ *
* @param name the {@link AuthScheme authentication scheme} identifier
* @param params the {@link HttpParams HTTP parameters} for the authentication
- * scheme.
- *
+ * scheme.
+ *
* @return {@link AuthScheme authentication scheme}
- *
+ *
* @throws IllegalStateException if a scheme with the given name cannot be found
*/
- public AuthScheme getAuthScheme(final String name, final HttpParams params)
+ public AuthScheme getAuthScheme(final String name, final HttpParams params)
throws IllegalStateException {
if (name == null) {
@@ -115,22 +115,22 @@ public final class AuthSchemeRegistry {
} else {
throw new IllegalStateException("Unsupported authentication scheme: " + name);
}
- }
+ }
/**
- * Obtains a list containing the names of all registered {@link AuthScheme authentication
+ * Obtains a list containing the names of all registered {@link AuthScheme authentication
* schemes}
- *
+ *
* @return list of registered scheme names
*/
public List<String> getSchemeNames() {
- return new ArrayList<String>(registeredSchemes.keySet());
- }
-
+ return new ArrayList<String>(registeredSchemes.keySet());
+ }
+
/**
- * Populates the internal collection of registered {@link AuthScheme authentication schemes}
+ * Populates the internal collection of registered {@link AuthScheme authentication schemes}
* with the content of the map passed as a parameter.
- *
+ *
* @param map authentication schemes
*/
public void setItems(final Map<String, AuthSchemeFactory> map) {
@@ -140,5 +140,5 @@ public final class AuthSchemeRegistry {
registeredSchemes.clear();
registeredSchemes.putAll(map);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java Fri Apr 23 19:19:23 2010
@@ -32,75 +32,75 @@ import org.apache.http.annotation.Immuta
import org.apache.http.util.LangUtils;
-/**
+/**
* The class represents an authentication scope consisting of a host name,
- * a port number, a realm name and an authentication scheme name which
+ * a port number, a realm name and an authentication scheme name which
* {@link Credentials Credentials} apply to.
- *
- *
+ *
+ *
* @since 4.0
*/
@Immutable
public class AuthScope {
-
- /**
- * The <tt>null</tt> value represents any host. In the future versions of
- * HttpClient the use of this parameter will be discontinued.
+
+ /**
+ * The <tt>null</tt> value represents any host. In the future versions of
+ * HttpClient the use of this parameter will be discontinued.
*/
public static final String ANY_HOST = null;
- /**
- * The <tt>-1</tt> value represents any port.
+ /**
+ * The <tt>-1</tt> value represents any port.
*/
public static final int ANY_PORT = -1;
- /**
- * The <tt>null</tt> value represents any realm.
+ /**
+ * The <tt>null</tt> value represents any realm.
*/
public static final String ANY_REALM = null;
- /**
- * The <tt>null</tt> value represents any authentication scheme.
+ /**
+ * The <tt>null</tt> value represents any authentication scheme.
*/
public static final String ANY_SCHEME = null;
-
- /**
- * Default scope matching any host, port, realm and authentication scheme.
- * In the future versions of HttpClient the use of this parameter will be
- * discontinued.
+
+ /**
+ * Default scope matching any host, port, realm and authentication scheme.
+ * In the future versions of HttpClient the use of this parameter will be
+ * discontinued.
*/
public static final AuthScope ANY = new AuthScope(ANY_HOST, ANY_PORT, ANY_REALM, ANY_SCHEME);
/** The authentication scheme the credentials apply to. */
private final String scheme;
-
+
/** The realm the credentials apply to. */
private final String realm;
-
+
/** The host the credentials apply to. */
private final String host;
-
+
/** The port the credentials apply to. */
private final int port;
-
- /** Creates a new credentials scope for the given
- * <tt>host</tt>, <tt>port</tt>, <tt>realm</tt>, and
+
+ /** Creates a new credentials scope for the given
+ * <tt>host</tt>, <tt>port</tt>, <tt>realm</tt>, and
* <tt>authentication scheme</tt>.
- *
+ *
* @param host the host the credentials apply to. May be set
* to <tt>null</tt> if credenticals are applicable to
- * any host.
+ * any host.
* @param port the port the credentials apply to. May be set
* to negative value if credenticals are applicable to
- * any port.
- * @param realm the realm the credentials apply to. May be set
+ * any port.
+ * @param realm the realm the credentials apply to. May be set
* to <tt>null</tt> if credenticals are applicable to
- * any realm.
- * @param scheme the authentication scheme the credentials apply to.
+ * any realm.
+ * @param scheme the authentication scheme the credentials apply to.
* May be set to <tt>null</tt> if credenticals are applicable to
- * any authentication scheme.
+ * any authentication scheme.
*/
- public AuthScope(final String host, int port,
+ public AuthScope(final String host, int port,
final String realm, final String scheme)
{
this.host = (host == null) ? ANY_HOST: host.toLowerCase(Locale.ENGLISH);
@@ -108,41 +108,41 @@ public class AuthScope {
this.realm = (realm == null) ? ANY_REALM: realm;
this.scheme = (scheme == null) ? ANY_SCHEME: scheme.toUpperCase(Locale.ENGLISH);
}
-
- /** Creates a new credentials scope for the given
+
+ /** Creates a new credentials scope for the given
* <tt>host</tt>, <tt>port</tt>, <tt>realm</tt>, and any
* authentication scheme.
- *
+ *
* @param host the host the credentials apply to. May be set
* to <tt>null</tt> if credenticals are applicable to
- * any host.
+ * any host.
* @param port the port the credentials apply to. May be set
* to negative value if credenticals are applicable to
- * any port.
- * @param realm the realm the credentials apply to. May be set
+ * any port.
+ * @param realm the realm the credentials apply to. May be set
* to <tt>null</tt> if credenticals are applicable to
- * any realm.
+ * any realm.
*/
public AuthScope(final String host, int port, final String realm) {
this(host, port, realm, ANY_SCHEME);
}
-
- /** Creates a new credentials scope for the given
+
+ /** Creates a new credentials scope for the given
* <tt>host</tt>, <tt>port</tt>, any realm name, and any
* authentication scheme.
- *
+ *
* @param host the host the credentials apply to. May be set
* to <tt>null</tt> if credenticals are applicable to
- * any host.
+ * any host.
* @param port the port the credentials apply to. May be set
* to negative value if credenticals are applicable to
- * any port.
+ * any port.
*/
public AuthScope(final String host, int port) {
this(host, port, ANY_REALM, ANY_SCHEME);
}
-
- /**
+
+ /**
* Creates a copy of the given credentials scope.
*/
public AuthScope(final AuthScope authscope) {
@@ -155,7 +155,7 @@ public class AuthScope {
this.realm = authscope.getRealm();
this.scheme = authscope.getScheme();
}
-
+
/**
* @return the host
*/
@@ -185,10 +185,10 @@ public class AuthScope {
}
/**
- * Tests if the authentication scopes match.
- *
- * @return the match factor. Negative value signifies no match.
- * Non-negative signifies a match. The greater the returned value
+ * Tests if the authentication scopes match.
+ *
+ * @return the match factor. Negative value signifies no match.
+ * Non-negative signifies a match. The greater the returned value
* the closer the match.
*/
public int match(final AuthScope that) {
@@ -239,8 +239,8 @@ public class AuthScope {
return super.equals(o);
}
AuthScope that = (AuthScope) o;
- return
- LangUtils.equals(this.host, that.host)
+ return
+ LangUtils.equals(this.host, that.host)
&& this.port == that.port
&& LangUtils.equals(this.realm, that.realm)
&& LangUtils.equals(this.scheme, that.scheme);
@@ -273,7 +273,7 @@ public class AuthScope {
}
return buffer.toString();
}
-
+
/**
* @see java.lang.Object#hashCode()
*/