[prev in list] [next in list] [prev in thread] [next in thread] 

List:       httpcomponents-commits
Subject:    svn commit: r451418 - in /jakarta/httpcomponents/httpasync/trunk/src:
From:       olegk () apache ! org
Date:       2006-09-29 20:13:42
Message-ID: 20060929201343.28A551A9846 () eris ! apache ! org
[Download RAW message or body]

Author: olegk
Date: Fri Sep 29 13:13:41 2006
New Revision: 451418

URL: http://svn.apache.org/viewvc?view=rev&rev=451418
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/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java
  jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java
  jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java


Modified: jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/contrib/o \
rg/apache/http/async/contrib/routing/RoutingAsyncGet.java?view=diff&rev=451418&r1=451417&r2=451418
 ==============================================================================
--- jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java \
                (original)
+++ jakarta/httpcomponents/httpasync/trunk/src/contrib/org/apache/http/async/contrib/routing/RoutingAsyncGet.java \
Fri Sep 29 13:13:41 2006 @@ -34,7 +34,6 @@
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
-import org.apache.http.Scheme;
 import org.apache.http.async.AsyncHttpProcessor;
 import org.apache.http.async.HttpAsyncClientConnection;
 import org.apache.http.async.HttpDispatcher;
@@ -44,8 +43,6 @@
 import org.apache.http.async.impl.SimpleHttpDispatcher;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.impl.io.PlainSocketFactory;
-import org.apache.http.io.SocketFactory;
 import org.apache.http.message.HttpGet;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
@@ -102,9 +99,6 @@
      * @throws Exception        in case of a problem
      */
     public static void main(String[] args) throws Exception {
-
-        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
-        Scheme.registerScheme("http", new Scheme("http", socketfactory, 80));
 
         String[] targets = args;
         if ((targets == null) || (targets.length < 1)) {

Modified: jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/examples/ \
org/apache/http/examples/ElementalAsyncGet.java?view=diff&rev=451418&r1=451417&r2=451418
 ==============================================================================
--- jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java \
                (original)
+++ jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/ElementalAsyncGet.java \
Fri Sep 29 13:13:41 2006 @@ -34,7 +34,6 @@
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
-import org.apache.http.Scheme;
 import org.apache.http.async.AsyncHttpProcessor;
 import org.apache.http.async.HttpAsyncClientConnection;
 import org.apache.http.async.HttpDispatcher;
@@ -43,8 +42,6 @@
 import org.apache.http.async.impl.SimpleHttpDispatcher;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.impl.io.PlainSocketFactory;
-import org.apache.http.io.SocketFactory;
 import org.apache.http.message.HttpGet;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
@@ -75,9 +72,6 @@
      */
     public static void main(String[] args) throws Exception {
         
-        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
-        Scheme.registerScheme("http", new Scheme("http", socketfactory, 80));
-
         HttpDispatcher dispatcher = createDispatcher();
         System.out.println("dispatcher " + dispatcher + "\n");
 

Modified: jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpasync/trunk/src/examples/ \
org/apache/http/examples/NotifiedAsyncGet.java?view=diff&rev=451418&r1=451417&r2=451418
 ==============================================================================
--- jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java \
                (original)
+++ jakarta/httpcomponents/httpasync/trunk/src/examples/org/apache/http/examples/NotifiedAsyncGet.java \
Fri Sep 29 13:13:41 2006 @@ -36,7 +36,6 @@
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
-import org.apache.http.Scheme;
 import org.apache.http.async.AsyncHttpProcessor;
 import org.apache.http.async.HttpAsyncClientConnection;
 import org.apache.http.async.HttpDispatcher;
@@ -46,8 +45,6 @@
 import org.apache.http.async.impl.SimpleHttpDispatcher;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.impl.io.PlainSocketFactory;
-import org.apache.http.io.SocketFactory;
 import org.apache.http.message.HttpGet;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
@@ -105,9 +102,6 @@
      * @throws Exception        in case of a problem
      */
     public static void main(String[] args) throws Exception {
-
-        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
-        Scheme.registerScheme("http", new Scheme("http", socketfactory, 80));
 
         String[] targets = args;
         if ((targets == null) || (targets.length < 1)) {


[prev in list] [next in list] [prev in thread] [next in thread]