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/26 22:09:29 UTC
svn commit: r1507419 - in /httpcomponents/httpcore/trunk: ./ httpcore-nio/
httpcore-nio/src/main/java-deprecated/
httpcore-nio/src/main/java-deprecated/org/
httpcore-nio/src/main/java-deprecated/org/apache/
httpcore-nio/src/main/java-deprecated/org/apa...
Author: olegk
Date: Fri Jul 26 20:09:25 2013
New Revision: 1507419
URL: http://svn.apache.org/r1507419
Log:
Moved deprecated classes to a separate src folder
Added:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/codecs/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/codecs/HttpRequestParser.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/codecs/HttpResponseParser.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSession.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLMode.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SessionHandle.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/package.html
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/package.html
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/params/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/params/NIOReactorParamBean.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/params/NIOReactorParams.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/EventListener.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpHandlerBase.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NHttpResponseTrigger.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/NullNHttpEntity.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java-deprecated/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/AbstractHttpClientConnection.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/AbstractHttpServerConnection.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/DefaultHttpClientConnection.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/DefaultHttpServerConnection.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpClientConnection.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpServerConnection.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/entity/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/entity/EntityDeserializer.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/entity/EntitySerializer.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntitySerializer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionOutputBuffer.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/HttpRequestParser.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/HttpRequestWriter.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestWriter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/HttpResponseParser.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/HttpResponseWriter.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseWriter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/SocketInputBuffer.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketInputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/impl/io/SocketOutputBuffer.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketOutputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/DefaultedHttpParams.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/HttpAbstractParamBean.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/HttpConnectionParamBean.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/HttpConnectionParams.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/HttpProtocolParamBean.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/HttpProtocolParams.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/params/SyncBasicHttpParams.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/protocol/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/protocol/BasicHttpProcessor.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/protocol/DefaultedHttpContext.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/DefaultedHttpContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/protocol/ExecutionContext.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ExecutionContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/protocol/HttpRequestHandlerRegistry.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/protocol/SyncBasicHttpContext.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/util/
httpcomponents/httpcore/trunk/httpcore/src/main/java-deprecated/org/apache/http/util/ExceptionUtils.java
- copied unchanged from r1506250, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/ExceptionUtils.java
Removed:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/Job.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/RequestExecutionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/RequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestAsyncNHttpHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestThrottlingNHttpHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpClientEventHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/NHttpServerEventHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleEventListener.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleHttpRequestHandlerResolver.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleNHttpRequestHandlerResolver.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntitySerializer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestWriter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseWriter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketInputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketOutputBuffer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/DefaultedHttpContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ExecutionContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/ExceptionUtils.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestBasicHttpProcessor.java
Modified:
httpcomponents/httpcore/trunk/ (props changed)
httpcomponents/httpcore/trunk/httpcore/ (props changed)
httpcomponents/httpcore/trunk/httpcore-nio/ (props changed)
httpcomponents/httpcore/trunk/httpcore-nio/pom.xml
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestNHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java
httpcomponents/httpcore/trunk/httpcore/pom.xml
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java
Propchange: httpcomponents/httpcore/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 26 20:09:25 2013
@@ -7,3 +7,5 @@ lib
dist
target
.pmd
+.idea
+*.iml
Propchange: httpcomponents/httpcore/trunk/httpcore/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 26 20:09:25 2013
@@ -6,3 +6,5 @@ classes
.pmd
.externalToolBuilders
maven-eclipse.xml
+
+*.iml
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 26 20:09:25 2013
@@ -6,3 +6,5 @@ classes
.pmd
.externalToolBuilders
maven-eclipse.xml
+
+*.iml
Modified: httpcomponents/httpcore/trunk/httpcore-nio/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/pom.xml?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/pom.xml Fri Jul 26 20:09:25 2013
@@ -77,7 +77,23 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <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>
</plugins>
</build>
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java Fri Jul 26 20:09:25 2013
@@ -138,7 +138,7 @@ public class DefaultNHttpClientConnectio
final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
final NHttpMessageParserFactory<HttpResponse> responseParserFactory) {
super(session, buffersize, fragmentSizeHint, allocator, chardecoder, charencoder,
- constraints, incomingContentStrategy, outgoingContentStrategy);
+ incomingContentStrategy, outgoingContentStrategy);
this.requestWriter = (requestWriterFactory != null ? requestWriterFactory :
DefaultHttpRequestWriterFactory.INSTANCE).create(this.outbuf);
this.responseParser = (responseParserFactory != null ? responseParserFactory :
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java Fri Jul 26 20:09:25 2013
@@ -142,7 +142,6 @@ public class DefaultNHttpServerConnectio
final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
super(session, buffersize, fragmentSizeHint, allocator, chardecoder, charencoder,
- constraints,
incomingContentStrategy != null ? incomingContentStrategy :
DisallowIdentityContentLengthStrategy.INSTANCE,
outgoingContentStrategy != null ? outgoingContentStrategy :
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java Fri Jul 26 20:09:25 2013
@@ -50,7 +50,6 @@ import org.apache.http.HttpMessage;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.config.MessageConstraints;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.entity.ContentLengthStrategy;
import org.apache.http.impl.HttpConnectionMetricsImpl;
@@ -77,8 +76,8 @@ import org.apache.http.nio.reactor.Sessi
import org.apache.http.nio.reactor.SocketAccessor;
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.Args;
@@ -128,7 +127,7 @@ public class NHttpConnectionBase
*
* @deprecated (4.3) use
* {@link NHttpConnectionBase#NHttpConnectionBase(IOSession, int, int, ByteBufferAllocator,
- * CharsetDecoder, CharsetEncoder, MessageConstraints, ContentLengthStrategy, ContentLengthStrategy)}
+ * CharsetDecoder, CharsetEncoder, ContentLengthStrategy, ContentLengthStrategy)}
*/
@Deprecated
public NHttpConnectionBase(
@@ -150,17 +149,18 @@ public class NHttpConnectionBase
CharsetDecoder decoder = null;
CharsetEncoder encoder = null;
- Charset charset = CharsetUtils.lookup(HttpProtocolParams.getHttpElementCharset(params));
+ Charset charset = CharsetUtils.lookup(
+ (String) params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET));
if (charset != null) {
charset = Consts.ASCII;
decoder = charset.newDecoder();
encoder = charset.newEncoder();
- final CodingErrorAction malformedCharAction = HttpProtocolParams.getMalformedInputAction(params);
- final CodingErrorAction unmappableCharAction = HttpProtocolParams.getUnmappableInputAction(params);
- decoder.onMalformedInput(malformedCharAction);
- decoder.onUnmappableCharacter(unmappableCharAction);
- encoder.onMalformedInput(malformedCharAction);
- encoder.onUnmappableCharacter(unmappableCharAction);
+ final CodingErrorAction malformedCharAction = (CodingErrorAction) params.getParameter(
+ CoreProtocolPNames.HTTP_MALFORMED_INPUT_ACTION);
+ final CodingErrorAction unmappableCharAction = (CodingErrorAction) params.getParameter(
+ CoreProtocolPNames.HTTP_UNMAPPABLE_INPUT_ACTION);
+ decoder.onMalformedInput(malformedCharAction).onUnmappableCharacter(unmappableCharAction);
+ encoder.onMalformedInput(malformedCharAction).onUnmappableCharacter(unmappableCharAction);
}
this.inbuf = new SessionInputBufferImpl(buffersize, linebuffersize, decoder, allocator);
this.outbuf = new SessionOutputBufferImpl(buffersize, linebuffersize, encoder, allocator);
@@ -192,8 +192,6 @@ public class NHttpConnectionBase
* If <code>null</code> simple type cast will be used for byte to char conversion.
* @param charencoder encoder to be used for encoding HTTP protocol elements.
* If <code>null</code> simple type cast will be used for char to byte conversion.
- * @param constraints Message constraints. If <code>null</code>
- * {@link MessageConstraints#DEFAULT} will be used.
* @param incomingContentStrategy incoming content length strategy. If <code>null</code>
* {@link LaxContentLengthStrategy#INSTANCE} will be used.
* @param outgoingContentStrategy outgoing content length strategy. If <code>null</code>
@@ -208,7 +206,6 @@ public class NHttpConnectionBase
final ByteBufferAllocator allocator,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
- final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy) {
Args.notNull(session, "I/O session");
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java Fri Jul 26 20:09:25 2013
@@ -41,7 +41,7 @@ import org.apache.http.nio.pool.Abstract
import org.apache.http.nio.pool.NIOConnFactory;
import org.apache.http.nio.pool.SocketAddressResolver;
import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
@@ -94,7 +94,7 @@ public class BasicNIOConnPool extends Ab
final HttpParams params) {
super(ioreactor, connFactory, 2, 20);
Args.notNull(params, "HTTP parameters");
- this.connectTimeout = HttpConnectionParams.getConnectionTimeout(params);
+ this.connectTimeout = params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
}
/**
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java Fri Jul 26 20:09:25 2013
@@ -42,14 +42,14 @@ import java.util.List;
import java.util.concurrent.ThreadFactory;
import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.params.NIOReactorParams;
+import org.apache.http.nio.params.NIOReactorPNames;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOReactor;
import org.apache.http.nio.reactor.IOReactorException;
import org.apache.http.nio.reactor.IOReactorExceptionHandler;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
import org.apache.http.util.Asserts;
@@ -169,19 +169,21 @@ public abstract class AbstractMultiworke
this(null, null);
}
+ @Deprecated
static IOReactorConfig convert(final int workerCount, final HttpParams params) {
Args.notNull(params, "HTTP parameters");
return IOReactorConfig.custom()
- .setSelectInterval(NIOReactorParams.getSelectInterval(params))
- .setShutdownGracePeriod(NIOReactorParams.getGracePeriod(params))
- .setInterestOpQueued(NIOReactorParams.getInterestOpsQueueing(params))
+ .setSelectInterval(params.getLongParameter(NIOReactorPNames.SELECT_INTERVAL, 1000))
+ .setShutdownGracePeriod(params.getLongParameter(NIOReactorPNames.GRACE_PERIOD, 500))
+ .setInterestOpQueued(params.getBooleanParameter(NIOReactorPNames.SELECT_INTERVAL, false))
.setIoThreadCount(workerCount)
- .setTcpNoDelay(HttpConnectionParams.getTcpNoDelay(params))
- .setSoTimeout(HttpConnectionParams.getSoTimeout(params))
- .setSoLinger(HttpConnectionParams.getLinger(params))
- .setSoKeepAlive(HttpConnectionParams.getSoKeepalive(params))
- .setConnectTimeout(HttpConnectionParams.getConnectionTimeout(params))
- .setSoReuseAddress(HttpConnectionParams.getSoReuseaddr(params))
+ .setSoTimeout(params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0))
+ .setConnectTimeout(params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0))
+ .setSoTimeout(params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0))
+ .setSoReuseAddress(params.getBooleanParameter(CoreConnectionPNames.SO_REUSEADDR, false))
+ .setSoKeepAlive(params.getBooleanParameter(CoreConnectionPNames.SO_KEEPALIVE, false))
+ .setSoLinger(params.getIntParameter(CoreConnectionPNames.SO_LINGER, -1))
+ .setTcpNoDelay(params.getBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true))
.build();
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java Fri Jul 26 20:09:25 2013
@@ -55,8 +55,8 @@ import org.apache.http.nio.NHttpServerEv
import org.apache.http.nio.entity.NStringEntity;
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.util.Args;
import org.apache.http.util.Asserts;
@@ -273,8 +273,8 @@ public class HttpAsyncService implements
final HttpRequest request = conn.getHttpRequest();
final HttpContext context = state.getContext();
- context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
- context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+ context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
+ context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
this.httpProcessor.process(request, context);
state.setRequest(request);
@@ -569,7 +569,7 @@ public class HttpAsyncService implements
final HttpRequest request = state.getRequest();
final HttpResponse response = state.getResponse();
- context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
+ context.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
this.httpProcessor.process(response, context);
HttpEntity entity = response.getEntity();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestNHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestNHttpConnectionBase.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestNHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestNHttpConnectionBase.java Fri Jul 26 20:09:25 2013
@@ -35,7 +35,6 @@ import junit.framework.Assert;
import org.apache.http.HttpEntity;
import org.apache.http.HttpVersion;
-import org.apache.http.config.MessageConstraints;
import org.apache.http.impl.entity.LaxContentLengthStrategy;
import org.apache.http.impl.entity.StrictContentLengthStrategy;
import org.apache.http.impl.nio.codecs.ChunkDecoder;
@@ -69,7 +68,6 @@ public class TestNHttpConnectionBase {
MockitoAnnotations.initMocks(this);
conn = new NHttpConnectionBase(session, 1024, 1024, HeapByteBufferAllocator.INSTANCE,
null, null,
- MessageConstraints.DEFAULT,
LaxContentLengthStrategy.INSTANCE,
StrictContentLengthStrategy.INSTANCE);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java Fri Jul 26 20:09:25 2013
@@ -49,7 +49,6 @@ import org.apache.http.impl.nio.reactor.
import org.apache.http.impl.nio.reactor.ExceptionEvent;
import org.apache.http.nio.NHttpClientConnection;
import org.apache.http.nio.NHttpClientEventHandler;
-import org.apache.http.nio.NHttpClientHandler;
import org.apache.http.nio.pool.NIOConnFactory;
import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
@@ -250,11 +249,6 @@ public class HttpClientNio {
start(null, new HttpAsyncRequestExecutor());
}
- public void start(final NHttpClientHandler handler) {
- this.thread = new IOReactorThread(new NHttpClientEventHandlerAdaptor(handler));
- this.thread.start();
- }
-
public ConnectingIOReactor getIoReactor() {
return this.ioReactor;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java Fri Jul 26 20:09:25 2013
@@ -38,7 +38,6 @@ import org.apache.http.impl.nio.reactor.
import org.apache.http.impl.nio.reactor.ExceptionEvent;
import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.NHttpServerEventHandler;
-import org.apache.http.nio.NHttpServiceHandler;
import org.apache.http.nio.protocol.HttpAsyncExpectationVerifier;
import org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper;
import org.apache.http.nio.protocol.HttpAsyncService;
@@ -55,7 +54,6 @@ import org.apache.http.protocol.Response
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
-@SuppressWarnings("deprecation")
public class HttpServerNio {
public static final HttpProcessor DEFAULT_HTTP_PROC = new ImmutableHttpProcessor(
@@ -137,12 +135,6 @@ public class HttpServerNio {
start(null, handlerMapper, null);
}
- public void start(final NHttpServiceHandler handler) {
- this.endpoint = this.ioReactor.listen(new InetSocketAddress(0));
- this.thread = new IOReactorThread(new NHttpServerEventHandlerAdaptor(handler));
- this.thread.start();
- }
-
public ListeningIOReactor getIoReactor() {
return this.ioReactor;
}
Modified: httpcomponents/httpcore/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/pom.xml?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore/pom.xml Fri Jul 26 20:09:25 2013
@@ -69,6 +69,27 @@
</includes>
</resource>
</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>
+ </plugins>
</build>
<reporting>
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java Fri Jul 26 20:09:25 2013
@@ -42,7 +42,6 @@ import org.apache.http.config.SocketConf
import org.apache.http.impl.DefaultBHttpClientConnection;
import org.apache.http.impl.DefaultBHttpClientConnectionFactory;
import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParamConfig;
import org.apache.http.params.HttpParams;
import org.apache.http.pool.ConnFactory;
@@ -76,7 +75,7 @@ public class BasicConnFactory implements
Args.notNull(params, "HTTP params");
this.plainfactory = null;
this.sslfactory = sslfactory;
- this.connectTimeout = HttpConnectionParams.getConnectionTimeout(params);
+ this.connectTimeout = params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
this.sconfig = HttpParamConfig.getSocketConfig(params);
this.connFactory = new DefaultBHttpClientConnectionFactory(
HttpParamConfig.getConnectionConfig(params));
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java Fri Jul 26 20:09:25 2013
@@ -47,11 +47,11 @@ public final class HttpParamConfig {
public static SocketConfig getSocketConfig(final HttpParams params) {
return SocketConfig.custom()
- .setSoTimeout(HttpConnectionParams.getSoTimeout(params))
- .setSoReuseAddress(HttpConnectionParams.getSoReuseaddr(params))
- .setSoKeepAlive(HttpConnectionParams.getSoKeepalive(params))
- .setSoLinger(HttpConnectionParams.getLinger(params))
- .setTcpNoDelay(HttpConnectionParams.getTcpNoDelay(params))
+ .setSoTimeout(params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0))
+ .setSoReuseAddress(params.getBooleanParameter(CoreConnectionPNames.SO_REUSEADDR, false))
+ .setSoKeepAlive(params.getBooleanParameter(CoreConnectionPNames.SO_KEEPALIVE, false))
+ .setSoLinger(params.getIntParameter(CoreConnectionPNames.SO_LINGER, -1))
+ .setTcpNoDelay(params.getBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true))
.build();
}
@@ -64,7 +64,7 @@ public final class HttpParamConfig {
public static ConnectionConfig getConnectionConfig(final HttpParams params) {
final MessageConstraints messageConstraints = getMessageConstraints(params);
- final String csname = HttpProtocolParams.getHttpElementCharset(params);
+ final String csname = (String) params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET);
return ConnectionConfig.custom()
.setCharset(csname != null ? Charset.forName(csname) : null)
.setMalformedInputAction((CodingErrorAction)
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java Fri Jul 26 20:09:25 2013
@@ -298,7 +298,7 @@ public class HttpService {
final HttpServerConnection conn,
final HttpContext context) throws IOException, HttpException {
- context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
+ context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
HttpResponse response = null;
@@ -332,7 +332,7 @@ public class HttpService {
}
}
- context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
+ context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
if (response == null) {
response = this.responseFactory.newHttpResponse(HttpVersion.HTTP_1_1,
@@ -354,7 +354,7 @@ public class HttpService {
handleException(ex, response);
}
- context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
+ context.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
this.processor.process(response, context);
conn.sendResponseHeader(response);
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java?rev=1507419&r1=1507418&r2=1507419&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java Fri Jul 26 20:09:25 2013
@@ -33,8 +33,8 @@ import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.annotation.Immutable;
+import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
import org.apache.http.util.Args;
/**
@@ -65,7 +65,7 @@ public class RequestUserAgent implements
String s = null;
final HttpParams params = request.getParams();
if (params != null) {
- s = HttpProtocolParams.getUserAgent(params);
+ s = (String) params.getParameter(CoreProtocolPNames.USER_AGENT);
}
if (s == null) {
s = this.userAgent;