You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/12/02 23:07:39 UTC
svn commit: r722631 - in /continuum/trunk: ./
continuum-core/src/main/java/org/apache/maven/continuum/project/builder/
continuum-docs/src/site/xdoc/
Author: olamy
Date: Tue Dec 2 14:07:39 2008
New Revision: 722631
URL: http://svn.apache.org/viewvc?rev=722631&view=rev
Log:
merge -r 722623:722624 from 1.2.x branch
fix for [CONTINUUM-1978]
Added:
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java
- copied unchanged from r722624, continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java
- copied unchanged from r722624, continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java
Modified:
continuum/trunk/ (props changed)
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
continuum/trunk/continuum-docs/src/site/xdoc/ (props changed)
Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 2 14:07:39 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?rev=722631&r1=722630&r2=722631&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java Tue Dec 2 14:07:39 2008
@@ -27,11 +27,13 @@
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.conn.params.ConnManagerPNames;
import org.apache.http.conn.params.ConnPerRouteBean;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.scheme.SocketFactory;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -51,7 +53,9 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.net.InetAddress;
import java.net.MalformedURLException;
+import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -79,11 +83,7 @@
// http scheme
schemeRegistry.register( new Scheme( "http", PlainSocketFactory.getSocketFactory(), 80 ) );
// https scheme
- SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
-
- // ignore cert
- sslSocketFactory.setHostnameVerifier( SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER );
- schemeRegistry.register( new Scheme( "https", sslSocketFactory, 443 ) );
+ schemeRegistry.register( new Scheme( "https", new EasySSLSocketFactory(), 443 ) );
HttpParams params = new BasicHttpParams();
// TODO put this values to a configuration way ???
Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 2 14:07:39 2008
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624
/continuum/trunk/continuum-docs/src/site/xdoc:690494-690520