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 2012/08/09 20:24:20 UTC
svn commit: r1371358 - in /httpcomponents/httpcore/trunk:
httpcore-ab/src/main/java/org/apache/http/benchmark/
httpcore-nio/src/examples/org/apache/http/examples/nio/
Author: olegk
Date: Thu Aug 9 18:24:19 2012
New Revision: 1371358
URL: http://svn.apache.org/viewvc?rev=1371358&view=rev
Log:
Removed references to deprecated API in AB module and NIO examples
Modified:
httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java
httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java
httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java?rev=1371358&r1=1371357&r2=1371358&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java Thu Aug 9 18:24:19 2012
@@ -45,7 +45,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.entity.ContentType;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.ExecutionContext;
@@ -145,8 +145,8 @@ class BenchmarkWorker implements Runnabl
}
HttpParams params = request.getParams();
- int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
- int soTimeout = HttpConnectionParams.getSoTimeout(params);
+ int connTimeout = params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
+ int soTimeout = params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0);
socket.setSoTimeout(soTimeout);
socket.connect(new InetSocketAddress(hostname, port), connTimeout);
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java?rev=1371358&r1=1371357&r2=1371358&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java Thu Aug 9 18:24:19 2012
@@ -42,10 +42,8 @@ import org.apache.http.entity.ContentTyp
import org.apache.http.entity.FileEntity;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpCoreConfigBuilder;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
import java.security.KeyStore;
@@ -104,13 +102,12 @@ public class HttpBenchmark {
}
private HttpRequest createRequest() {
- HttpParams params = new BasicHttpParams();
- params.setParameter(HttpProtocolParams.PROTOCOL_VERSION,
- config.isUseHttp1_0() ? HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1)
- .setParameter(HttpProtocolParams.USER_AGENT, "HttpCore-AB/1.1")
- .setBooleanParameter(HttpProtocolParams.USE_EXPECT_CONTINUE, config.isUseExpectContinue())
- .setBooleanParameter(HttpConnectionParams.STALE_CONNECTION_CHECK, false)
- .setIntParameter(HttpConnectionParams.SO_TIMEOUT, config.getSocketTimeout());
+ HttpParams params = new HttpCoreConfigBuilder()
+ .setProtocolVersion(config.isUseHttp1_0() ? HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1)
+ .setUserAgent("HttpCore-AB/1.1")
+ .setUseExpectContinue(config.isUseExpectContinue())
+ .setSocketTimeout(config.getSocketTimeout())
+ .setSocketBufferSize(8 * 1024).build();
URL url = config.getUrl();
HttpEntity entity = null;
@@ -147,6 +144,7 @@ public class HttpBenchmark {
}
request = new BasicHttpRequest(config.getMethod(), path);
}
+ request.setParams(params);
if (!config.isKeepAlive()) {
request.addHeader(new DefaultHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE));
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java?rev=1371358&r1=1371357&r2=1371358&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java Thu Aug 9 18:24:19 2012
@@ -45,9 +45,7 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.protocol.HttpAsyncRequester;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpCoreConfigBuilder;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HttpProcessor;
@@ -65,12 +63,11 @@ public class NHttpClient {
public static void main(String[] args) throws Exception {
// HTTP parameters for the client
- HttpParams params = new BasicHttpParams();
- params
- .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 3000)
- .setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 3000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
- .setParameter(CoreProtocolPNames.USER_AGENT, "Test/1.1");
+ HttpParams params = new HttpCoreConfigBuilder()
+ .setSocketTimeout(3000)
+ .setConnectTimeout(3000)
+ .setSocketBufferSize(8 * 1024)
+ .setUserAgent("Test/1.1").build();
// Create HTTP protocol processing chain
HttpProcessor httpproc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
// Use standard client-side protocol interceptors
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java?rev=1371358&r1=1371357&r2=1371358&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java Thu Aug 9 18:24:19 2012
@@ -66,23 +66,21 @@ import org.apache.http.nio.NHttpServerCo
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.pool.NIOConnFactory;
import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
+import org.apache.http.nio.protocol.HttpAsyncExchange;
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.http.nio.protocol.HttpAsyncRequester;
+import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncRequestHandlerResolver;
import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
+import org.apache.http.nio.protocol.HttpAsyncRequester;
import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
import org.apache.http.nio.protocol.HttpAsyncResponseProducer;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
import org.apache.http.nio.protocol.HttpAsyncService;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.ListeningIOReactor;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpCoreConfigBuilder;
import org.apache.http.params.HttpParams;
import org.apache.http.pool.PoolStats;
import org.apache.http.protocol.ExecutionContext;
@@ -123,12 +121,12 @@ public class NHttpReverseProxy {
System.out.println("Reverse proxy to " + targetHost);
- HttpParams params = new BasicHttpParams();
- params
- .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 30000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
- .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "Test/1.1")
- .setParameter(CoreProtocolPNames.USER_AGENT, "Test/1.1");
+ HttpParams params = new HttpCoreConfigBuilder()
+ .setSocketTimeout(3000)
+ .setConnectTimeout(3000)
+ .setSocketBufferSize(8 * 1024)
+ .setUserAgent("Test/1.1")
+ .setOriginServer("Test/1.1").build();
IOReactorConfig config = new IOReactorConfig();
config.setIoThreadCount(1);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java?rev=1371358&r1=1371357&r2=1371358&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java Thu Aug 9 18:24:19 2012
@@ -66,9 +66,7 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.protocol.HttpAsyncService;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.ListeningIOReactor;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpCoreConfigBuilder;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpContext;
@@ -97,11 +95,11 @@ public class NHttpServer {
port = Integer.parseInt(args[1]);
}
// HTTP parameters for the server
- HttpParams params = new BasicHttpParams();
- params
- .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
- .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpTest/1.1");
+ HttpParams params = new HttpCoreConfigBuilder()
+ .setSocketTimeout(3000)
+ .setConnectTimeout(3000)
+ .setSocketBufferSize(8 * 1024)
+ .setOriginServer("Test/1.1").build();
// Create HTTP protocol processing chain
HttpProcessor httpproc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
// Use standard server-side protocol interceptors