Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 4855 invoked from network); 2 Dec 2008 22:08:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2008 22:08:30 -0000 Received: (qmail 93132 invoked by uid 500); 2 Dec 2008 22:08:42 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 93106 invoked by uid 500); 2 Dec 2008 22:08:42 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 93097 invoked by uid 99); 2 Dec 2008 22:08:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 14:08:42 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 22:07:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A77A9238887A; Tue, 2 Dec 2008 14:07:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r722631 - in /continuum/trunk: ./ continuum-core/src/main/java/org/apache/maven/continuum/project/builder/ continuum-docs/src/site/xdoc/ Date: Tue, 02 Dec 2008 22:07:39 -0000 To: commits@continuum.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081202220739.A77A9238887A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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