Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 44914 invoked from network); 29 Sep 2006 20:16:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Sep 2006 20:16:46 -0000 Received: (qmail 54516 invoked by uid 500); 29 Sep 2006 20:16:46 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 54505 invoked by uid 99); 29 Sep 2006 20:16:46 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Sep 2006 13:16:46 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:60925] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id F4/CC-13110-E1F7D154 for ; Fri, 29 Sep 2006 13:16:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C3CFE1A984D; Fri, 29 Sep 2006 13:15:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r451422 - in /jakarta/httpcomponents/httpclient/trunk/src: java/org/apache/http/conn/ java/org/apache/http/conn/ssl/ test/org/apache/http/conn/ Date: Fri, 29 Sep 2006 20:15:32 -0000 To: httpclient-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060929201532.C3CFE1A984D@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: olegk Date: Fri Sep 29 13:15:32 2006 New Revision: 451422 URL: http://svn.apache.org/viewvc?view=rev&rev=451422 Log: [HTTPCORE-14] Consider decoupling HttpHost and Scheme and moving Scheme, SocketFactory and SecureSocketFactory to HttpConn Changelog: ---------- * Moved Scheme, SocketFactory, SecureSocketFactory and related classes to HttpConn Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ConnectTimeoutException.java jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ConnectTimeoutException.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ConnectTimeoutException.java?view=diff&rev=451422&r1=451421&r2=451422 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ConnectTimeoutException.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ConnectTimeoutException.java Fri Sep 29 13:15:32 2006 @@ -27,7 +27,7 @@ * */ -package org.apache.http; +package org.apache.http.conn; import java.io.InterruptedIOException; Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java?view=diff&rev=451422&r1=451421&r2=451422 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SocketFactory.java Fri Sep 29 13:15:32 2006 @@ -34,7 +34,6 @@ import java.net.Socket; import java.net.UnknownHostException; -import org.apache.http.ConnectTimeoutException; import org.apache.http.params.HttpParams; /** Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java?view=diff&rev=451422&r1=451421&r2=451422 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java Fri Sep 29 13:15:32 2006 @@ -48,7 +48,7 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.apache.http.ConnectTimeoutException; +import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.conn.SecureSocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java?view=diff&rev=451422&r1=451421&r2=451422 ============================================================================== --- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java (original) +++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java Fri Sep 29 13:15:32 2006 @@ -27,10 +27,9 @@ * */ -package org.apache.http; +package org.apache.http.conn; -import org.apache.http.impl.io.PlainSocketFactory; -import org.apache.http.impl.io.SSLSocketFactory; +import org.apache.http.conn.ssl.SSLSocketFactory; import junit.framework.Test; import junit.framework.TestCase;