hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r280927 - in /jakarta/httpclient/trunk/http-common/src: examples/org/apache/http/examples/ java/org/apache/http/impl/io/ test/org/apache/http/
Date Wed, 14 Sep 2005 19:47:32 GMT
Author: olegk
Date: Wed Sep 14 12:47:21 2005
New Revision: 280927

URL: http://svn.apache.org/viewcvs?rev=280927&view=rev
Log:
OldIOSocketFactory renamed

Added:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/PlainSocketFactory.java
      - copied, changed from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java
Removed:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java
Modified:
    jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java
    jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java
    jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java
    jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java

Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java?rev=280927&r1=280926&r2=280927&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpGet.java
Wed Sep 14 12:47:21 2005
@@ -38,7 +38,7 @@
 import org.apache.http.impl.DefaultHttpClientConnection;
 import org.apache.http.impl.DefaultHttpParams;
 import org.apache.http.impl.HttpGetRequest;
-import org.apache.http.impl.io.OldIOSocketFactory;
+import org.apache.http.impl.io.PlainSocketFactory;
 import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpParams;
 
@@ -53,7 +53,7 @@
 
     public static void main(String[] args) throws Exception {
         
-        SocketFactory socketfactory = OldIOSocketFactory.getSocketFactory();
+        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
         Protocol.registerProtocol("http", new Protocol("http", socketfactory, 80));
         
         HttpParams connparams = new DefaultHttpParams(null);

Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java?rev=280927&r1=280926&r2=280927&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpPost.java
Wed Sep 14 12:47:21 2005
@@ -44,7 +44,7 @@
 import org.apache.http.impl.DefaultHttpClientConnection;
 import org.apache.http.impl.DefaultHttpParams;
 import org.apache.http.impl.HttpPostRequest;
-import org.apache.http.impl.io.OldIOSocketFactory;
+import org.apache.http.impl.io.PlainSocketFactory;
 import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpParams;
 
@@ -59,7 +59,7 @@
 
     public static void main(String[] args) throws Exception {
         
-        SocketFactory socketfactory = OldIOSocketFactory.getSocketFactory();
+        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
         Protocol.registerProtocol("http", new Protocol("http", socketfactory, 80));
 
         HttpParams connparams = new DefaultHttpParams(null);

Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java?rev=280927&r1=280926&r2=280927&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/HttpRequestExecutorDemo.java
Wed Sep 14 12:47:21 2005
@@ -39,7 +39,7 @@
 import org.apache.http.impl.DefaultHttpClientConnection;
 import org.apache.http.impl.DefaultHttpParams;
 import org.apache.http.impl.HttpGetRequest;
-import org.apache.http.impl.io.OldIOSocketFactory;
+import org.apache.http.impl.io.PlainSocketFactory;
 import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
@@ -60,7 +60,7 @@
 
     public static void main(String[] args) throws Exception {
         
-        SocketFactory socketfactory = OldIOSocketFactory.getSocketFactory();
+        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
         Protocol.registerProtocol("http", new Protocol("http", socketfactory, 80));
         
         HttpParams params = new DefaultHttpParams(null);

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/PlainSocketFactory.java
(from r239377, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/PlainSocketFactory.java?p2=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/PlainSocketFactory.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java&r1=239377&r2=280927&rev=280927&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/OldIOSocketFactory.java
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/PlainSocketFactory.java
Wed Sep 14 12:47:21 2005
@@ -46,25 +46,25 @@
  * 
  * @since 2.0
  */
-public class OldIOSocketFactory implements SocketFactory {
+public class PlainSocketFactory implements SocketFactory {
 
     /**
      * The factory singleton.
      */
-    private static final OldIOSocketFactory DEFAULT_FACTORY = new OldIOSocketFactory();
+    private static final PlainSocketFactory DEFAULT_FACTORY = new PlainSocketFactory();
     
     /**
      * Gets an singleton instance of the DefaultProtocolSocketFactory.
      * @return a DefaultProtocolSocketFactory
      */
-    public static OldIOSocketFactory getSocketFactory() {
+    public static PlainSocketFactory getSocketFactory() {
         return DEFAULT_FACTORY;
     }
     
     /**
      * Constructor for DefaultProtocolSocketFactory.
      */
-    private OldIOSocketFactory() {
+    private PlainSocketFactory() {
         super();
     }
 
@@ -113,14 +113,14 @@
      * All instances of DefaultProtocolSocketFactory are the same.
      */
     public boolean equals(Object obj) {
-        return ((obj != null) && obj.getClass().equals(OldIOSocketFactory.class));
+        return ((obj != null) && obj.getClass().equals(PlainSocketFactory.class));
     }
 
     /**
      * All instances of DefaultProtocolSocketFactory have the same hash code.
      */
     public int hashCode() {
-        return OldIOSocketFactory.class.hashCode();
+        return PlainSocketFactory.class.hashCode();
     }
 
 }

Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java?rev=280927&r1=280926&r2=280927&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java Wed Sep
14 12:47:21 2005
@@ -30,7 +30,7 @@
 package org.apache.http;
 
 import org.apache.http.impl.io.NIOSocketFactory;
-import org.apache.http.impl.io.OldIOSocketFactory;
+import org.apache.http.impl.io.PlainSocketFactory;
 import org.apache.http.io.SocketFactory;
 
 import junit.framework.Test;
@@ -59,7 +59,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        SocketFactory socketfactory = OldIOSocketFactory.getSocketFactory();
+        SocketFactory socketfactory = PlainSocketFactory.getSocketFactory();
         final Protocol http = new Protocol("http", socketfactory, 80);
         Protocol.registerProtocol("http", http);
     }



Mime
View raw message