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 2014/05/14 17:05:25 UTC
svn commit: r1594591 - in /httpcomponents/benchmark/httpclient/trunk:
build.gradle
src/main/java/org/apache/http/client/benchmark/ApacheHttpAsyncClient.java
src/main/java/org/apache/http/client/benchmark/NingHttpClient.java
Author: olegk
Date: Wed May 14 15:05:25 2014
New Revision: 1594591
URL: http://svn.apache.org/r1594591
Log:
HttpCore -> 4.3.2; HttpClient -> 4.3.3; HttpAsyncClient -> 4.0.1; Ning AHC -> 1.8.8; Jetty -> 8.1.15.v20140411
Modified:
httpcomponents/benchmark/httpclient/trunk/build.gradle
httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/ApacheHttpAsyncClient.java
httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/NingHttpClient.java
Modified: httpcomponents/benchmark/httpclient/trunk/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpclient/trunk/build.gradle?rev=1594591&r1=1594590&r2=1594591&view=diff
==============================================================================
--- httpcomponents/benchmark/httpclient/trunk/build.gradle (original)
+++ httpcomponents/benchmark/httpclient/trunk/build.gradle Wed May 14 15:05:25 2014
@@ -10,15 +10,15 @@ sourceCompatibility = '1.6'
dependencies {
compile group: 'commons-cli', name: 'commons-cli', version: '1.2'
- compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.7.v20120910'
- compile group: 'org.eclipse.jetty', name: 'jetty-client', version: '8.1.7.v20120910'
+ compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.15.v20140411'
+ compile group: 'org.eclipse.jetty', name: 'jetty-client', version: '8.1.15.v20140411'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.6.2'
compile group: 'org.slf4j', name: 'slf4j-nop', version: '1.6.2'
- compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.3-beta2'
- compile group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.3-beta2'
- compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3-beta2'
- compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0-beta4'
- compile group: 'com.ning', name: 'async-http-client', version: '1.7.12'
+ compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.3.2'
+ compile group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.3.2'
+ compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.3'
+ compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0.1'
+ compile group: 'com.ning', name: 'async-http-client', version: '1.8.8'
}
task benchmark(dependsOn: 'classes') << {
Modified: httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/ApacheHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/ApacheHttpAsyncClient.java?rev=1594591&r1=1594590&r2=1594591&view=diff
==============================================================================
--- httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/ApacheHttpAsyncClient.java (original)
+++ httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/ApacheHttpAsyncClient.java Wed May 14 15:05:25 2014
@@ -44,6 +44,7 @@ import org.apache.http.impl.nio.client.C
import org.apache.http.impl.nio.client.HttpAsyncClients;
import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.http.impl.nio.reactor.IOReactorConfig;
import org.apache.http.nio.ContentDecoder;
import org.apache.http.nio.ContentEncoder;
import org.apache.http.nio.IOControl;
@@ -65,7 +66,8 @@ public class ApacheHttpAsyncClient imple
public ApacheHttpAsyncClient() throws Exception {
super();
- final SocketConfig socketConfig = SocketConfig.custom()
+ final IOReactorConfig ioReactorConfig = IOReactorConfig.custom()
+ .setConnectTimeout(15000)
.setSoTimeout(15000)
.build();
final ConnectionConfig connectionConfig = ConnectionConfig.custom()
@@ -73,9 +75,8 @@ public class ApacheHttpAsyncClient imple
.setFragmentSizeHint(8 * 1024)
.build();
- this.ioreactor = new DefaultConnectingIOReactor();
+ this.ioreactor = new DefaultConnectingIOReactor(ioReactorConfig);
this.mgr = new PoolingNHttpClientConnectionManager(this.ioreactor);
- this.mgr.setDefaultSocketConfig(socketConfig);
this.mgr.setDefaultConnectionConfig(connectionConfig);
this.httpclient = HttpAsyncClients.createMinimal(this.mgr);
}
Modified: httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/NingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/NingHttpClient.java?rev=1594591&r1=1594590&r2=1594591&view=diff
==============================================================================
--- httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/NingHttpClient.java (original)
+++ httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/NingHttpClient.java Wed May 14 15:05:25 2014
@@ -104,7 +104,7 @@ public class NingHttpClient implements H
@Override
public String getClientName() {
- return "Ning async HTTP client 1.7.12";
+ return "Ning async HTTP client 1.8.8";
}
static class SimpleAsyncHandler implements AsyncHandler<Object> {