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 2013/07/27 15:16:41 UTC
svn commit: r1507633 - in /httpcomponents/httpclient/trunk: ./ fluent-hc/
httpclient-cache/ httpclient-cache/src/main/java-deprecated/
httpclient-cache/src/main/java-deprecated/org/
httpclient-cache/src/main/java-deprecated/org/apache/ httpclient-cache...
Author: olegk
Date: Sat Jul 27 13:16:37 2013
New Revision: 1507633
URL: http://svn.apache.org/r1507633
Log:
Moved deprecated classes to a separate scr folder
Added:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/apache/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/apache/http/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/auth/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/auth/params/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParamBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParams.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/AuthenticationHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RedirectHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/params/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/params/AuthPolicy.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/params/HttpClientParams.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContext.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestAuthenticationBase.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthenticationBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionManagerFactory.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionOperator.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/OperatedClientConnection.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/OperatedClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnConnectionParamBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRoute.java
- copied, changed from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/cookie/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateSchemeFactory.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/SpnegoTokenGenerator.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SpnegoTokenGenerator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/HttpAuthenticator.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/TunnelRefusedException.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPoolEntry.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultResponseParser.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpConnPool.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/HttpPoolEntry.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/IdleConnectionHandler.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SchemeRegistryFactory.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SchemeRegistryFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThread.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/doc-files/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/doc-files/tsccm-structure.png
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/doc-files/tsccm-structure.png
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/package.html
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/package.html
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/apache/
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/apache/http/
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/apache/http/entity/
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/HttpMultipart.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/MultipartEntity.java
- copied unchanged from r1507616, httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java
Removed:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.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/AuthenticationHandler.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/async/
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/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/RequestAuthenticationBase.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/conn/BasicEofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.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/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/params/ConnConnectionParamBean.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/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/scheme/PlainSocketFactory.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/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/SpnegoTokenGenerator.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/AuthenticationStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.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/DecompressingHttpClient.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/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/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/HttpAuthenticator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.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/client/exec/
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/BasicClientConnectionManager.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/HttpConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpPoolEntry.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/ManagedClientConnectionImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.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/SchemeRegistryFactory.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/tsccm/
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.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/scheme/
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAutoRetryHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.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/MultipartEntity.java
Modified:
httpcomponents/httpclient/trunk/ (props changed)
httpcomponents/httpclient/trunk/fluent-hc/ (props changed)
httpcomponents/httpclient/trunk/httpclient/ (props changed)
httpcomponents/httpclient/trunk/httpclient-cache/ (props changed)
httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
httpcomponents/httpclient/trunk/httpclient-osgi/ (props changed)
httpcomponents/httpclient/trunk/httpclient/pom.xml
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ProxyClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java
httpcomponents/httpclient/trunk/httpmime/ (props changed)
httpcomponents/httpclient/trunk/httpmime/pom.xml
Propchange: httpcomponents/httpclient/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 27 13:16:37 2013
@@ -6,3 +6,7 @@ target
.fbprefs
.settings
.pmd
+
+.idea
+
+*.iml
Propchange: httpcomponents/httpclient/trunk/fluent-hc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 27 13:16:37 2013
@@ -5,3 +5,5 @@ target
.externalToolBuilders
maven-eclipse.xml
.pmd
+
+*.iml
Propchange: httpcomponents/httpclient/trunk/httpclient/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 27 13:16:37 2013
@@ -7,3 +7,5 @@ lib
.pmd
.externalToolBuilders
maven-eclipse.xml
+
+*.iml
Propchange: httpcomponents/httpclient/trunk/httpclient-cache/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 27 13:16:37 2013
@@ -5,3 +5,5 @@ target
.externalToolBuilders
maven-eclipse.xml
.pmd
+
+*.iml
Modified: httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/pom.xml?rev=1507633&r1=1507632&r2=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/pom.xml Sat Jul 27 13:16:37 2013
@@ -100,6 +100,25 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java-deprecated</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -110,9 +129,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
Propchange: httpcomponents/httpclient/trunk/httpclient-osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 27 13:16:37 2013
@@ -5,3 +5,5 @@ target
.externalToolBuilders
maven-eclipse.xml
.pmd
+
+*.iml
Modified: httpcomponents/httpclient/trunk/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/pom.xml?rev=1507633&r1=1507632&r2=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient/pom.xml Sat Jul 27 13:16:37 2013
@@ -80,6 +80,25 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java-deprecated</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -90,9 +109,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRoute.java (from r1507616, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRoute.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRoute.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java&r1=1507616&r2=1507633&rev=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRoute.java Sat Jul 27 13:16:37 2013
@@ -35,7 +35,10 @@ import org.apache.http.conn.routing.Http
* a fine-grained control of connections on a per route basis.
*
* @since 4.0
+ *
+ * @deprecated (4.3) no longer used.
*/
+@Deprecated
public interface ConnPerRoute {
int getMaxForRoute(HttpRoute route);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java?rev=1507633&r1=1507632&r2=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java Sat Jul 27 13:16:37 2013
@@ -27,14 +27,16 @@
package org.apache.http.client.params;
+import java.net.InetAddress;
import java.util.Collection;
+import org.apache.http.HttpHost;
import org.apache.http.auth.params.AuthPNames;
import org.apache.http.client.config.RequestConfig;
-import org.apache.http.conn.params.ConnRouteParams;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
/**
* @deprecated (4.3) provided for compatibility with {@link HttpParams}. Do not use.
@@ -50,23 +52,36 @@ public final class HttpClientParamConfig
@SuppressWarnings("unchecked")
public static RequestConfig getRequestConfig(final HttpParams params) {
return RequestConfig.custom()
- .setAuthenticationEnabled(HttpClientParams.isAuthenticating(params))
- .setCircularRedirectsAllowed(params.getBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS, false))
- .setConnectionRequestTimeout((int) HttpClientParams.getConnectionManagerTimeout(params))
- .setConnectTimeout(HttpConnectionParams.getConnectionTimeout(params))
- .setCookieSpec(HttpClientParams.getCookiePolicy(params))
- .setProxy(ConnRouteParams.getDefaultProxy(params))
- .setExpectContinueEnabled(HttpProtocolParams.useExpectContinue(params))
- .setLocalAddress(ConnRouteParams.getLocalAddress(params))
- .setMaxRedirects(params.getIntParameter(ClientPNames.MAX_REDIRECTS, 50))
+ .setSocketTimeout(params.getIntParameter(
+ CoreConnectionPNames.SO_TIMEOUT, 0))
+ .setStaleConnectionCheckEnabled(params.getBooleanParameter(
+ CoreConnectionPNames.STALE_CONNECTION_CHECK, true))
+ .setConnectTimeout(params.getIntParameter(
+ CoreConnectionPNames.CONNECTION_TIMEOUT, 0))
+ .setExpectContinueEnabled(params.getBooleanParameter(
+ CoreProtocolPNames.USE_EXPECT_CONTINUE, false))
+ .setProxy((HttpHost) params.getParameter(
+ ConnRoutePNames.DEFAULT_PROXY))
+ .setLocalAddress((InetAddress) params.getParameter(
+ ConnRoutePNames.LOCAL_ADDRESS))
.setProxyPreferredAuthSchemes((Collection<String>) params.getParameter(
AuthPNames.PROXY_AUTH_PREF))
.setTargetPreferredAuthSchemes((Collection<String>) params.getParameter(
AuthPNames.TARGET_AUTH_PREF))
- .setRedirectsEnabled(HttpClientParams.isRedirecting(params))
- .setRelativeRedirectsAllowed(!params.getBooleanParameter(ClientPNames.REJECT_RELATIVE_REDIRECT, false))
- .setSocketTimeout(HttpConnectionParams.getSoTimeout(params))
- .setStaleConnectionCheckEnabled(HttpConnectionParams.isStaleCheckingEnabled(params))
+ .setAuthenticationEnabled(params.getBooleanParameter(
+ ClientPNames.HANDLE_AUTHENTICATION, true))
+ .setCircularRedirectsAllowed(params.getBooleanParameter(
+ ClientPNames.ALLOW_CIRCULAR_REDIRECTS, false))
+ .setConnectionRequestTimeout(params.getIntParameter(
+ ClientPNames.CONN_MANAGER_TIMEOUT, 0))
+ .setCookieSpec((String) params.getParameter(
+ ClientPNames.COOKIE_POLICY))
+ .setMaxRedirects(params.getIntParameter(
+ ClientPNames.MAX_REDIRECTS, 50))
+ .setRedirectsEnabled(params.getBooleanParameter(
+ ClientPNames.HANDLE_REDIRECTS, true))
+ .setRelativeRedirectsAllowed(!params.getBooleanParameter(
+ ClientPNames.REJECT_RELATIVE_REDIRECT, false))
.build();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ProxyClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ProxyClient.java?rev=1507633&r1=1507632&r2=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ProxyClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ProxyClient.java Sat Jul 27 13:16:37 2013
@@ -46,7 +46,7 @@ import org.apache.http.auth.Credentials;
import org.apache.http.client.config.AuthSchemes;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.params.HttpClientParamConfig;
-import org.apache.http.client.protocol.ClientContext;
+import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.client.protocol.RequestClientConnControl;
import org.apache.http.config.ConnectionConfig;
import org.apache.http.conn.HttpConnectionFactory;
@@ -58,17 +58,19 @@ import org.apache.http.entity.BufferedHt
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.auth.BasicSchemeFactory;
import org.apache.http.impl.auth.DigestSchemeFactory;
+import org.apache.http.impl.auth.HttpAuthenticator;
import org.apache.http.impl.auth.KerberosSchemeFactory;
import org.apache.http.impl.auth.NTLMSchemeFactory;
import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
+import org.apache.http.impl.execchain.TunnelRefusedException;
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParamConfig;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpCoreContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.ImmutableHttpProcessor;
@@ -184,14 +186,14 @@ public class ProxyClient {
credsProvider.setCredentials(new AuthScope(proxy), credentials);
// Populate the execution context
- context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target);
- context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
- context.setAttribute(ExecutionContext.HTTP_REQUEST, connect);
- context.setAttribute(ClientContext.ROUTE, route);
- context.setAttribute(ClientContext.PROXY_AUTH_STATE, this.proxyAuthState);
- context.setAttribute(ClientContext.CREDS_PROVIDER, credsProvider);
- context.setAttribute(ClientContext.AUTHSCHEME_REGISTRY, this.authSchemeRegistry);
- context.setAttribute(ClientContext.REQUEST_CONFIG, this.requestConfig);
+ context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, target);
+ context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
+ context.setAttribute(HttpCoreContext.HTTP_REQUEST, connect);
+ context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
+ context.setAttribute(HttpClientContext.PROXY_AUTH_STATE, this.proxyAuthState);
+ context.setAttribute(HttpClientContext.CREDS_PROVIDER, credsProvider);
+ context.setAttribute(HttpClientContext.AUTHSCHEME_REGISTRY, this.authSchemeRegistry);
+ context.setAttribute(HttpClientContext.REQUEST_CONFIG, this.requestConfig);
this.requestExec.preProcess(connect, this.httpProcessor, context);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java?rev=1507633&r1=1507632&r2=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java Sat Jul 27 13:16:37 2013
@@ -46,7 +46,6 @@ import org.apache.http.conn.routing.Http
import org.apache.http.conn.routing.HttpRoutePlanner;
import org.apache.http.cookie.CookieSpecProvider;
import org.apache.http.impl.execchain.ClientExecChain;
-import org.apache.http.params.CoreConnectionPNames;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -158,20 +157,6 @@ public class TestInternalHttpClient {
Assert.assertSame(config, context.getRequestConfig());
}
- @Test
- public void testExecuteRequestConfigDeprecated() throws Exception {
- final HttpGet httpget = new HttpGet("http://somehost/stuff");
- httpget.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, new Integer(123));
-
- final HttpClientContext context = HttpClientContext.create();
- client.execute(httpget, context);
-
- final RequestConfig config = context.getRequestConfig();
-
- Assert.assertNotSame(config, defaultConfig);
- Assert.assertEquals(123, config.getConnectionRequestTimeout());
- }
-
@SuppressWarnings("unchecked")
@Test
public void testExecuteLocalContext() throws Exception {
Propchange: httpcomponents/httpclient/trunk/httpmime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 27 13:16:37 2013
@@ -7,3 +7,5 @@ target
.pmd
.externalToolBuilders
maven-eclipse.xml
+
+*.iml
Modified: httpcomponents/httpclient/trunk/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/pom.xml?rev=1507633&r1=1507632&r2=1507633&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpmime/pom.xml Sat Jul 27 13:16:37 2013
@@ -73,6 +73,25 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java-deprecated</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -82,9 +101,6 @@
<showDeprecations>${maven.compile.deprecation}</showDeprecations>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
</plugins>
</build>