Author: rfeng
Date: Mon Jul 23 23:42:13 2012
New Revision: 1364844
URL: http://svn.apache.org/viewvc?rev=1364844&view=rev
Log:
Upgrade http client version to handle
https://issues.apache.org/jira/browse/HTTPCLIENT-1138
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/host-http/pom.xml
tuscany/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
(original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
Mon Jul 23 23:42:13 2012
@@ -258,8 +258,8 @@ The following components come under Apac
groovy-all-1.7.1.jar
hazelcast-1.9.2.2.jar
hazelcast-client-1.9.2.2.jar
- httpclient-4.1.3.jar
- httpcore-4.1.4.jar
+ httpclient-4.2.1.jar
+ httpcore-4.2.1.jar
jackson-core-asl-1.9.4.jar
jackson-mapper-asl-1.9.4.jar
jackson-xc-1.9.4.jar
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml Mon Jul 23
23:42:13 2012
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml Mon Jul 23
23:42:13 2012
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml Mon Jul
23 23:42:13 2012
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml Mon Jul 23
23:42:13 2012
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/host-http/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/host-http/pom.xml?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/host-http/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/host-http/pom.xml Mon Jul 23 23:42:13
2012
@@ -46,14 +46,14 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>4.2.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.1.3</version>
+ <version>4.2.1</version>
<optional>true</optional>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java?rev=1364844&r1=1364843&r2=1364844&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
Mon Jul 23 23:42:13 2012
@@ -64,9 +64,10 @@ public class HttpClientFactory implement
HttpConnectionParams.setConnectionTimeout(defaultParameters, 60000);
HttpConnectionParams.setSoTimeout(defaultParameters, 60000);
+ // See https://issues.apache.org/jira/browse/HTTPCLIENT-1138
SchemeRegistry supportedSchemes = new SchemeRegistry();
- supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME,
PlainSocketFactory.getSocketFactory(), 80));
- supportedSchemes.register(new Scheme("https",
SSLSocketFactory.getSocketFactory(), 443));
+ supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME, 80,
PlainSocketFactory.getSocketFactory()));
+ supportedSchemes.register(new Scheme("https", 443,
SSLSocketFactory.getSocketFactory()));
ClientConnectionManager connectionManager =
new ThreadSafeClientConnManager(defaultParameters,
supportedSchemes);
