hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r937479 [4/12] - in /httpcomponents/httpclient/trunk: httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/ httpclient-contrib/src/main/java/org/apache/http/contrib/auth/ httpclient/src/main/java/org/apache/http/auth/ httpcli...
Date Fri, 23 Apr 2010 19:19:31 GMT
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java Fri Apr 23 19:19:23 2010
@@ -45,14 +45,14 @@ import org.apache.http.params.HttpConnec
 import org.apache.http.params.HttpParams;
 
 /**
- * Socket factory that implements a simple multi-home fail-over on connect failure, 
+ * Socket factory that implements a simple multi-home fail-over on connect failure,
  * provided the same hostname resolves to multiple {@link InetAddress}es. Please note
  * the {@link #connectSocket(Socket, String, int, InetAddress, int, HttpParams)}
  * method cannot be reliably interrupted by closing the socket returned by the
  * {@link #createSocket()} method.
  *
  * @since 4.0
- * 
+ *
  * @deprecated Do not use. For multihome support socket factories must implement
  * {@link SchemeSocketFactory} interface.
  */
@@ -88,21 +88,21 @@ public final class MultihomePlainSocketF
     }
 
     /**
-     * Attempts to connects the socket to any of the {@link InetAddress}es the 
-     * given host name resolves to. If connection to all addresses fail, the  
+     * Attempts to connects the socket to any of the {@link InetAddress}es the
+     * given host name resolves to. If connection to all addresses fail, the
      * last I/O exception is propagated to the caller.
-     * 
+     *
      * @param sock socket to connect to any of the given addresses
      * @param host Host name to connect to
      * @param port the port to connect to
      * @param localAddress local address
      * @param localPort local port
-     * @param params HTTP parameters 
-     * 
+     * @param params HTTP parameters
+     *
      * @throws  IOException if an error occurs during the connection
      * @throws  SocketTimeoutException if timeout expires before connecting
      */
-    public Socket connectSocket(Socket sock, String host, int port, 
+    public Socket connectSocket(Socket sock, String host, int port,
                                 InetAddress localAddress, int localPort,
                                 HttpParams params)
         throws IOException {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/OperatedClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/OperatedClientConnection.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/OperatedClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/OperatedClientConnection.java Fri Apr 23 19:19:23 2010
@@ -36,7 +36,7 @@ import org.apache.http.HttpInetConnectio
 import org.apache.http.params.HttpParams;
 
 /**
- * A client-side connection that relies on outside logic to connect sockets to the 
+ * A client-side connection that relies on outside logic to connect sockets to the
  * appropriate hosts. It can be operated directly by an application, or through an
  * {@link ClientConnectionOperator operator}.
  *
@@ -84,7 +84,7 @@ public interface OperatedClientConnectio
      * Signals that this connection is in the process of being open.
      * <p>
      * By calling this method, the connection can be re-initialized
-     * with a new Socket instance before {@link #openCompleted} is called. 
+     * with a new Socket instance before {@link #openCompleted} is called.
      * This enabled the connection to close that socket if
      * {@link org.apache.http.HttpConnection#shutdown shutdown}
      * is called before it is fully open. Closing an unconnected socket
@@ -93,10 +93,10 @@ public interface OperatedClientConnectio
      * or it returns successfully and then opens this connection
      * which was just shut down.
      * <p>
-     * This method can be called multiple times if the connection 
-     * is layered over another protocol. <b>Note:</b> This method 
-     * will <i>not</i> close the previously used socket. It is 
-     * the caller's responsibility to close that socket if it is 
+     * This method can be called multiple times if the connection
+     * is layered over another protocol. <b>Note:</b> This method
+     * will <i>not</i> close the previously used socket. It is
+     * the caller's responsibility to close that socket if it is
      * no longer required.
      * <p>
      * The caller must invoke {@link #openCompleted} in order to complete

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/package.html?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/package.html (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/package.html Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-The client-side connection management and handling API that provides interfaces 
+The client-side connection management and handling API that provides interfaces
 and implementations for opening and managing client side HTTP connections.
 <p>
 The lowest layer of connection handling is comprised of
@@ -39,18 +39,18 @@ and
 {@link org.apache.http.conn.ClientConnectionOperator ClientConnectionOperator}.
 The connection interface extends the core
 {@link org.apache.http.HttpClientConnection HttpClientConnection}
-by operations to set and update a socket. An operator encapsulates the logic to 
-open and layer sockets, typically using a 
-{@link org.apache.http.conn.scheme.SocketFactory}. The socket factory for 
-a protocol {@link org.apache.http.conn.scheme.Scheme} such as "http" or "https" 
+by operations to set and update a socket. An operator encapsulates the logic to
+open and layer sockets, typically using a
+{@link org.apache.http.conn.scheme.SocketFactory}. The socket factory for
+a protocol {@link org.apache.http.conn.scheme.Scheme} such as "http" or "https"
 can be looked up in a {@link org.apache.http.conn.scheme.SchemeRegistry}.
-Applications without a need for sophisticated connection management can use 
+Applications without a need for sophisticated connection management can use
 this layer directly.
 </p>
 <p>
 On top of that lies the connection management layer. A
-{@link org.apache.http.conn.ClientConnectionManager} internally manages 
-operated connections, but hands out instances of 
+{@link org.apache.http.conn.ClientConnectionManager} internally manages
+operated connections, but hands out instances of
 {@link org.apache.http.conn.ManagedClientConnection}.
 This interface abstracts from the underlying socket operations and
 provides convenient methods for opening and updating sockets in order
@@ -61,12 +61,12 @@ automatically.
 <p>
 Connections obtained from a manager have to be returned after use.
 This can be {@link org.apache.http.conn.ConnectionReleaseTrigger triggered}
-on various levels, either by releasing the 
-{@link org.apache.http.conn.ManagedClientConnection connection} directly, 
-or by calling a method on 
-an {@link org.apache.http.conn.BasicManagedEntity entity} received from 
-the connection, or by closing the 
-{@link org.apache.http.conn.EofSensorInputStream stream} from which 
+on various levels, either by releasing the
+{@link org.apache.http.conn.ManagedClientConnection connection} directly,
+or by calling a method on
+an {@link org.apache.http.conn.BasicManagedEntity entity} received from
+the connection, or by closing the
+{@link org.apache.http.conn.EofSensorInputStream stream} from which
 that entity is being read.
 </p>
 <p>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java Fri Apr 23 19:19:23 2010
@@ -28,7 +28,7 @@ package org.apache.http.conn.params;
 
 /**
  * Parameter names for HTTP client connections.
- * 
+ *
  * @since 4.0
  */
 public interface ConnConnectionPNames {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java Fri Apr 23 19:19:23 2010
@@ -33,15 +33,15 @@ import org.apache.http.params.HttpAbstra
 import org.apache.http.params.HttpParams;
 
 /**
- * This is a Java Bean class that can be used to wrap an instance of 
- * {@link HttpParams} and manipulate HTTP client connection parameters 
+ * This is a Java Bean class that can be used to wrap an instance of
+ * {@link HttpParams} and manipulate HTTP client connection parameters
  * using Java Beans conventions.
  *
  * @since 4.0
  */
 @NotThreadSafe
 public class ConnConnectionParamBean extends HttpAbstractParamBean {
-    
+
     public ConnConnectionParamBean (final HttpParams params) {
         super(params);
     }
@@ -52,5 +52,5 @@ public class ConnConnectionParamBean ext
     public void setMaxStatusLineGarbage (final int maxStatusLineGarbage) {
         params.setIntParameter(ConnConnectionPNames.MAX_STATUS_LINE_GARBAGE, maxStatusLineGarbage);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java Fri Apr 23 19:19:23 2010
@@ -28,22 +28,22 @@ package org.apache.http.conn.params;
 
 /**
  * Parameter names for connection managers in HttpConn.
- * 
+ *
  * @since 4.0
  */
 public interface ConnManagerPNames {
 
     /**
-     * Defines the timeout in milliseconds used when retrieving an instance of 
+     * Defines the timeout in milliseconds used when retrieving an instance of
      * {@link org.apache.http.conn.ManagedClientConnection} from the
      * {@link org.apache.http.conn.ClientConnectionManager}.
      * <p>
      * This parameter expects a value of type {@link Long}.
      * </p>
-     */ 
-    public static final String TIMEOUT = "http.conn-manager.timeout"; 
+     */
+    public static final String TIMEOUT = "http.conn-manager.timeout";
 
-    /** 
+    /**
      * Defines the maximum number of connections per route.
      * This limit is interpreted by client connection managers
      * and applies to individual manager instances.
@@ -54,7 +54,7 @@ public interface ConnManagerPNames {
     @Deprecated
     public static final String MAX_CONNECTIONS_PER_ROUTE = "http.conn-manager.max-per-route";
 
-    /** 
+    /**
      * Defines the maximum number of connections in total.
      * This limit is interpreted by client connection managers
      * and applies to individual manager instances.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java Fri Apr 23 19:19:23 2010
@@ -33,8 +33,8 @@ import org.apache.http.params.HttpAbstra
 import org.apache.http.params.HttpParams;
 
 /**
- * This is a Java Bean class that can be used to wrap an instance of 
- * {@link HttpParams} and manipulate connection manager parameters 
+ * This is a Java Bean class that can be used to wrap an instance of
+ * {@link HttpParams} and manipulate connection manager parameters
  * using Java Beans conventions.
  *
  * @since 4.0
@@ -45,7 +45,7 @@ public class ConnManagerParamBean extend
     public ConnManagerParamBean (final HttpParams params) {
         super(params);
     }
-    
+
     public void setTimeout (final long timeout) {
         params.setLongParameter(ConnManagerPNames.TIMEOUT, timeout);
     }
@@ -55,7 +55,7 @@ public class ConnManagerParamBean extend
     public void setMaxTotalConnections (final int maxConnections) {
         params.setIntParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, maxConnections);
     }
-    
+
     /** @see ConnManagerPNames#MAX_CONNECTIONS_PER_ROUTE */
     @Deprecated
     public void setConnectionsPerRoute(final ConnPerRouteBean connPerRoute) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java Fri Apr 23 19:19:23 2010
@@ -32,9 +32,9 @@ import org.apache.http.conn.routing.Http
 import org.apache.http.params.HttpParams;
 
 /**
- * An adaptor for manipulating HTTP connection management 
+ * An adaptor for manipulating HTTP connection management
  * parameters in {@link HttpParams}.
- * 
+ *
  * @since 4.0
  *
  * @see ConnManagerPNames
@@ -49,9 +49,9 @@ public final class ConnManagerParams imp
      * Returns the timeout in milliseconds used when retrieving a
      * {@link org.apache.http.conn.ManagedClientConnection} from the
      * {@link org.apache.http.conn.ClientConnectionManager}.
-     * 
+     *
      * @return timeout in milliseconds.
-     */ 
+     */
     public static long getTimeout(final HttpParams params) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
@@ -63,9 +63,9 @@ public final class ConnManagerParams imp
      * Sets the timeout in milliseconds used when retrieving a
      * {@link org.apache.http.conn.ManagedClientConnection} from the
      * {@link org.apache.http.conn.ClientConnectionManager}.
-     * 
+     *
      * @param timeout the timeout in milliseconds
-     */ 
+     */
     public static void setTimeout(final HttpParams params, long timeout) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
@@ -76,22 +76,22 @@ public final class ConnManagerParams imp
     /** The default maximum number of connections allowed per host */
     @Deprecated
     private static final ConnPerRoute DEFAULT_CONN_PER_ROUTE = new ConnPerRoute() {
-        
+
         public int getMaxForRoute(HttpRoute route) {
             return ConnPerRouteBean.DEFAULT_MAX_CONNECTIONS_PER_ROUTE;
         }
-        
+
     };
-    
+
     /**
      * Sets lookup interface for maximum number of connections allowed per route.
      *
      * @param params HTTP parameters
-     * @param connPerRoute lookup interface for maximum number of connections allowed 
+     * @param connPerRoute lookup interface for maximum number of connections allowed
      *        per route
-     * 
+     *
      * @deprecated do not use
-     * 
+     *
      * @see ConnManagerPNames#MAX_CONNECTIONS_PER_ROUTE
      */
     @Deprecated
@@ -108,11 +108,11 @@ public final class ConnManagerParams imp
      * Returns lookup interface for maximum number of connections allowed per route.
      *
      * @param params HTTP parameters
-     * 
+     *
      * @return lookup interface for maximum number of connections allowed per route.
-     * 
+     *
      * @deprecated do not use
-     * 
+     *
      * @see ConnManagerPNames#MAX_CONNECTIONS_PER_ROUTE
      */
     @Deprecated
@@ -134,9 +134,9 @@ public final class ConnManagerParams imp
      *
      * @param params HTTP parameters
      * @param maxTotalConnections The maximum number of connections allowed.
-     * 
+     *
      * @deprecated do not use
-     * 
+     *
      * @see ConnManagerPNames#MAX_TOTAL_CONNECTIONS
      */
     @Deprecated
@@ -156,9 +156,9 @@ public final class ConnManagerParams imp
      * @param params HTTP parameters
      *
      * @return The maximum number of connections allowed.
-     * 
+     *
      * @deprecated do not use
-     * 
+     *
      * @see ConnManagerPNames#MAX_TOTAL_CONNECTIONS
      */
     @Deprecated
@@ -171,5 +171,5 @@ public final class ConnManagerParams imp
         return params.getIntParameter(MAX_TOTAL_CONNECTIONS, DEFAULT_MAX_TOTAL_CONNECTIONS);
     }
 
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRoute.java Fri Apr 23 19:19:23 2010
@@ -29,15 +29,15 @@ package org.apache.http.conn.params;
 import org.apache.http.conn.routing.HttpRoute;
 
 /**
- * This interface is intended for looking up maximum number of connections 
- * allowed for a given route. This class can be used by pooling 
- * {@link org.apache.http.conn.ClientConnectionManager connection managers} for 
- * a fine-grained control of connections on a per route basis. 
- * 
+ * This interface is intended for looking up maximum number of connections
+ * allowed for a given route. This class can be used by pooling
+ * {@link org.apache.http.conn.ClientConnectionManager connection managers} for
+ * a fine-grained control of connections on a per route basis.
+ *
  * @since 4.0
  */
 public interface ConnPerRoute {
 
     int getMaxForRoute(HttpRoute route);
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java Fri Apr 23 19:19:23 2010
@@ -34,11 +34,11 @@ import org.apache.http.annotation.Thread
 import org.apache.http.conn.routing.HttpRoute;
 
 /**
- * This class maintains a map of HTTP routes to maximum number of connections allowed 
- * for those routes. This class can be used by pooling 
- * {@link org.apache.http.conn.ClientConnectionManager connection managers} for 
- * a fine-grained control of connections on a per route basis. 
- * 
+ * This class maintains a map of HTTP routes to maximum number of connections allowed
+ * for those routes. This class can be used by pooling
+ * {@link org.apache.http.conn.ClientConnectionManager connection managers} for
+ * a fine-grained control of connections on a per route basis.
+ *
  * @since 4.0
  */
 @ThreadSafe
@@ -46,21 +46,21 @@ public final class ConnPerRouteBean impl
 
     /** The default maximum number of connections allowed per host */
     public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 2;   // Per RFC 2616 sec 8.1.4
-    
+
     private final ConcurrentHashMap<HttpRoute, Integer> maxPerHostMap;
-    
+
     private volatile int defaultMax;
-    
+
     public ConnPerRouteBean(int defaultMax) {
         super();
         this.maxPerHostMap = new ConcurrentHashMap<HttpRoute, Integer>();
         setDefaultMaxPerRoute(defaultMax);
     }
-    
+
     public ConnPerRouteBean() {
         this(DEFAULT_MAX_CONNECTIONS_PER_ROUTE);
     }
-    
+
     @Deprecated
     public int getDefaultMax() {
         return this.defaultMax;
@@ -105,7 +105,7 @@ public final class ConnPerRouteBean impl
             return this.defaultMax;
         }
     }
-    
+
     public void setMaxForRoutes(final Map<HttpRoute, Integer> map) {
         if (map == null) {
             return;
@@ -118,5 +118,5 @@ public final class ConnPerRouteBean impl
     public String toString() {
         return this.maxPerHostMap.toString();
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRoutePNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRoutePNames.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRoutePNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRoutePNames.java Fri Apr 23 19:19:23 2010
@@ -28,7 +28,7 @@ package org.apache.http.conn.params;
 
 /**
  * Parameter names for connection routing.
- * 
+ *
  * @since 4.0
  */
 public interface ConnRoutePNames {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParamBean.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParamBean.java Fri Apr 23 19:19:23 2010
@@ -37,15 +37,15 @@ import org.apache.http.params.HttpAbstra
 import org.apache.http.params.HttpParams;
 
 /**
- * This is a Java Bean class that can be used to wrap an instance of 
- * {@link HttpParams} and manipulate connection routing parameters 
+ * This is a Java Bean class that can be used to wrap an instance of
+ * {@link HttpParams} and manipulate connection routing parameters
  * using Java Beans conventions.
  *
  * @since 4.0
  */
 @NotThreadSafe
 public class ConnRouteParamBean extends HttpAbstractParamBean {
-    
+
     public ConnRouteParamBean (final HttpParams params) {
         super(params);
     }
@@ -64,5 +64,5 @@ public class ConnRouteParamBean extends 
     public void setForcedRoute (final HttpRoute route) {
         params.setParameter(ConnRoutePNames.FORCED_ROUTE, route);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java Fri Apr 23 19:19:23 2010
@@ -35,9 +35,9 @@ import org.apache.http.params.HttpParams
 import org.apache.http.conn.routing.HttpRoute;
 
 /**
- * An adaptor for manipulating HTTP routing parameters 
+ * An adaptor for manipulating HTTP routing parameters
  * in {@link HttpParams}.
- * 
+ *
  * @since 4.0
  */
 @Immutable
@@ -182,6 +182,6 @@ public class ConnRouteParams implements 
         }
         params.setParameter(LOCAL_ADDRESS, local);
     }
-    
+
 }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java Fri Apr 23 19:19:23 2010
@@ -145,7 +145,7 @@ public class BasicRouteDirector implemen
         // now we know that the target matches and proxies so far are the same
         if (phc > fhc)
             return TUNNEL_PROXY; // need to extend the proxy chain
-            
+
         // proxy chain and target are the same, check tunnelling and layering
         if ((fact.isTunnelled() && !plan.isTunnelled()) ||
             (fact.isLayered()   && !plan.isLayered()))

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoutePlanner.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoutePlanner.java Fri Apr 23 19:19:23 2010
@@ -38,13 +38,13 @@ import org.apache.http.protocol.HttpCont
  * standard Java system properties.
  * <p>
  * Implementations of this interface must be thread-safe. Access to shared
- * data must be synchronized as methods of this interface may be executed 
+ * data must be synchronized as methods of this interface may be executed
  * from multiple threads.
  *
  * @since 4.0
  */
 public interface HttpRoutePlanner {
-    
+
     /**
      * Determines the route for a request.
      *
@@ -59,9 +59,9 @@ public interface HttpRoutePlanner {
      * @return  the route that the request should take
      *
      * @throws HttpException    in case of a problem
-     */        
+     */
     public HttpRoute determineRoute(HttpHost target,
                                     HttpRequest request,
                                     HttpContext context) throws HttpException;
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteInfo.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteInfo.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteInfo.java Fri Apr 23 19:19:23 2010
@@ -33,7 +33,7 @@ import org.apache.http.HttpHost;
 
 /**
  * Read-only interface for route information.
- * 
+ *
  * @since 4.0
  */
 public interface RouteInfo {
@@ -65,14 +65,14 @@ public interface RouteInfo {
 
     /**
      * Obtains the target host.
-     * 
+     *
      * @return the target host
      */
     HttpHost getTargetHost();
 
     /**
      * Obtains the local address to connect from.
-     * 
+     *
      * @return  the local address,
      *          or <code>null</code>
      */
@@ -107,7 +107,7 @@ public interface RouteInfo {
 
     /**
      * Obtains the first proxy host.
-     * 
+     *
      * @return the first proxy in the proxy chain, or
      *         <code>null</code> if this route is direct
      */

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java Fri Apr 23 19:19:23 2010
@@ -35,7 +35,7 @@ import org.apache.http.HttpHost;
 
 /**
  * Helps tracking the steps in establishing a route.
- * 
+ *
  * @since 4.0
  */
 @NotThreadSafe

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import java.net.InetAddress;
  * Hostname to IP address resolver.
  *
  * @since 4.0
- * 
+ *
  * @deprecated Do not use
  */
 @Deprecated
@@ -42,7 +42,7 @@ public interface HostNameResolver {
 
     /**
      * Resolves given hostname to its IP address
-     * 
+     *
      * @param hostname the hostname.
      * @return IP address.
      * @throws IOException

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import java.net.UnknownHostException;
 /**
  * A {@link SocketFactory SocketFactory} for layered sockets (SSL/TLS).
  * See there for things to consider when implementing a socket factory.
- * 
+ *
  * @since 4.1
  */
 public interface LayeredSchemeSocketFactory extends SchemeSocketFactory {
@@ -43,24 +43,24 @@ public interface LayeredSchemeSocketFact
      * Returns a socket connected to the given host that is layered over an
      * existing socket.  Used primarily for creating secure sockets through
      * proxies.
-     * 
-     * @param socket the existing socket 
+     *
+     * @param socket the existing socket
      * @param target    the name of the target host.
      * @param port      the port to connect to on the target host
      * @param autoClose a flag for closing the underling socket when the created
      * socket is closed
-     * 
+     *
      * @return Socket a new socket
-     * 
+     *
      * @throws IOException if an I/O error occurs while creating the socket
      * @throws UnknownHostException if the IP address of the host cannot be
      * determined
      */
     Socket createLayeredSocket(
-        Socket socket, 
-        String target, 
-        int port, 
+        Socket socket,
+        String target,
+        int port,
         boolean autoClose
-    ) throws IOException, UnknownHostException;              
+    ) throws IOException, UnknownHostException;
 
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactoryAdaptor.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactoryAdaptor.java Fri Apr 23 19:19:23 2010
@@ -32,21 +32,21 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 
 @Deprecated
-class LayeredSchemeSocketFactoryAdaptor extends SchemeSocketFactoryAdaptor 
+class LayeredSchemeSocketFactoryAdaptor extends SchemeSocketFactoryAdaptor
     implements LayeredSchemeSocketFactory {
 
     private final LayeredSocketFactory factory;
-    
+
     LayeredSchemeSocketFactoryAdaptor(final LayeredSocketFactory factory) {
         super(factory);
         this.factory = factory;
     }
 
     public Socket createLayeredSocket(
-            final Socket socket, 
-            final String target, int port, 
+            final Socket socket,
+            final String target, int port,
             boolean autoClose) throws IOException, UnknownHostException {
         return this.factory.createSocket(socket, target, port, autoClose);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java Fri Apr 23 19:19:23 2010
@@ -34,9 +34,9 @@ import java.net.UnknownHostException;
 /**
  * A {@link SocketFactory SocketFactory} for layered sockets (SSL/TLS).
  * See there for things to consider when implementing a socket factory.
- * 
+ *
  * @since 4.0
- * 
+ *
  * @deprecated use {@link SchemeSocketFactory}
  */
 @Deprecated
@@ -46,24 +46,24 @@ public interface LayeredSocketFactory ex
      * Returns a socket connected to the given host that is layered over an
      * existing socket.  Used primarily for creating secure sockets through
      * proxies.
-     * 
-     * @param socket the existing socket 
+     *
+     * @param socket the existing socket
      * @param host the host name/IP
      * @param port the port on the host
      * @param autoClose a flag for closing the underling socket when the created
      * socket is closed
-     * 
+     *
      * @return Socket a new socket
-     * 
+     *
      * @throws IOException if an I/O error occurs while creating the socket
      * @throws UnknownHostException if the IP address of the host cannot be
      * determined
      */
     Socket createSocket(
-        Socket socket, 
-        String host, 
-        int port, 
+        Socket socket,
+        String host,
+        int port,
         boolean autoClose
-    ) throws IOException, UnknownHostException;              
+    ) throws IOException, UnknownHostException;
 
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java Fri Apr 23 19:19:23 2010
@@ -35,16 +35,16 @@ import java.net.UnknownHostException;
 class LayeredSocketFactoryAdaptor extends SocketFactoryAdaptor implements LayeredSocketFactory {
 
     private final LayeredSchemeSocketFactory factory;
-    
+
     LayeredSocketFactoryAdaptor(final LayeredSchemeSocketFactory factory) {
         super(factory);
         this.factory = factory;
     }
-    
+
     public Socket createSocket(
-            final Socket socket, 
+            final Socket socket,
             final String host, int port, boolean autoClose) throws IOException, UnknownHostException {
         return this.factory.createLayeredSocket(socket, host, port, autoClose);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java Fri Apr 23 19:19:23 2010
@@ -43,8 +43,8 @@ import org.apache.http.params.HttpParams
 /**
  * The default class for creating plain (unencrypted) sockets.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#CONNECTION_TIMEOUT}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SO_REUSEADDR}</li>
@@ -62,11 +62,11 @@ public final class PlainSocketFactory im
     private static final PlainSocketFactory DEFAULT_FACTORY = new PlainSocketFactory();
 
     private final HostNameResolver nameResolver;
-    
+
     /**
-     * Gets the default factory. Usually there should be no reason for creating 
+     * Gets the default factory. Usually there should be no reason for creating
      * multiple instances of this class.
-     * 
+     *
      * @return the default factory
      */
     public static PlainSocketFactory getSocketFactory() {
@@ -99,8 +99,8 @@ public final class PlainSocketFactory im
      * @since 4.1
      */
     public Socket connectSocket(
-            final Socket socket, 
-            final InetSocketAddress remoteAddress, 
+            final Socket socket,
+            final InetSocketAddress remoteAddress,
             final InetSocketAddress localAddress,
             final HttpParams params) throws IOException, ConnectTimeoutException {
         if (remoteAddress == null) {
@@ -121,7 +121,7 @@ public final class PlainSocketFactory im
         try {
             sock.connect(remoteAddress, timeout);
         } catch (SocketTimeoutException ex) {
-            throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/" 
+            throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/"
                     + remoteAddress.getAddress() + " timed out");
         }
         return sock;
@@ -157,9 +157,9 @@ public final class PlainSocketFactory im
      */
     @Deprecated
     public Socket connectSocket(
-            final Socket socket, 
-            final String host, int port, 
-            final InetAddress localAddress, int localPort, 
+            final Socket socket,
+            final String host, int port,
+            final InetAddress localAddress, int localPort,
             final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
         InetSocketAddress local = null;
         if (localAddress != null || localPort > 0) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java Fri Apr 23 19:19:23 2010
@@ -33,8 +33,8 @@ import org.apache.http.annotation.Immuta
 import org.apache.http.util.LangUtils;
 
 /**
- * Encapsulates specifics of a protocol scheme such as "http" or "https". Schemes are identified 
- * by lowercase names. Supported schemes are typically collected in a {@link SchemeRegistry 
+ * Encapsulates specifics of a protocol scheme such as "http" or "https". Schemes are identified
+ * by lowercase names. Supported schemes are typically collected in a {@link SchemeRegistry
  * SchemeRegistry}.
  * <p>
  * For example, to configure support for "https://" URLs, you could write code like the following:
@@ -50,13 +50,13 @@ public final class Scheme {
 
     /** The name of this scheme, in lowercase. (e.g. http, https) */
     private final String name;
-    
+
     /** The socket factory for this scheme */
     private final SchemeSocketFactory socketFactory;
-    
+
     /** The default port for this scheme */
     private final int defaultPort;
-    
+
     /** Indicates whether this scheme allows for layered connections */
     private final boolean layered;
 
@@ -78,7 +78,7 @@ public final class Scheme {
      * @param port      the default port for this scheme
      * @param factory   the factory for creating sockets for communication
      *                  with this scheme
-     * 
+     *
      * @since 4.1
      */
     public Scheme(final String name, final int port, final SchemeSocketFactory factory) {
@@ -107,7 +107,7 @@ public final class Scheme {
      * @param factory   the factory for creating sockets for communication
      *                  with this scheme
      * @param port      the default port for this scheme
-     * 
+     *
      * @deprecated Use {@link #Scheme(String, int, SchemeSocketFactory)}
      */
     @Deprecated
@@ -156,7 +156,7 @@ public final class Scheme {
      * {@link LayeredSocketFactory LayeredSocketFactory}.
      *
      * @return  the socket factory for this scheme
-     * 
+     *
      * @deprecated Use {@link #getSchemeSocketFactory()}
      */
     @Deprecated
@@ -179,7 +179,7 @@ public final class Scheme {
      * {@link LayeredSocketFactory LayeredSchemeSocketFactory}.
      *
      * @return  the socket factory for this scheme
-     * 
+     *
      * @since 4.1
      */
     public final SchemeSocketFactory getSchemeSocketFactory() {
@@ -208,10 +208,10 @@ public final class Scheme {
     /**
      * Resolves the correct port for this scheme.
      * Returns the given port if it is valid, the default port otherwise.
-     * 
+     *
      * @param port      the port to be resolved,
      *                  a negative number to obtain the default port
-     * 
+     *
      * @return the given port or the defaultPort
      */
     public final int resolvePort(int port) {
@@ -241,7 +241,7 @@ public final class Scheme {
         if (this == obj) return true;
         if (obj instanceof Scheme) {
             Scheme that = (Scheme) obj;
-            return this.name.equals(that.name) 
+            return this.name.equals(that.name)
                 && this.defaultPort == that.defaultPort
                 && this.layered == that.layered
                 && this.socketFactory.equals(that.socketFactory);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java Fri Apr 23 19:19:23 2010
@@ -156,9 +156,9 @@ public final class SchemeRegistry {
     }
 
     /**
-     * Populates the internal collection of registered {@link Scheme protocol schemes} 
+     * Populates the internal collection of registered {@link Scheme protocol schemes}
      * with the content of the map passed as a parameter.
-     * 
+     *
      * @param map protocol schemes
      */
     public void setItems(final Map<String, Scheme> map) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactory.java Fri Apr 23 19:19:23 2010
@@ -36,7 +36,7 @@ import org.apache.http.conn.ConnectTimeo
 import org.apache.http.params.HttpParams;
 
 /**
- * A factory for creating, initializing and connecting sockets. The factory encapsulates the logic 
+ * A factory for creating, initializing and connecting sockets. The factory encapsulates the logic
  * for establishing a socket connection.
  *
  * @since 4.1
@@ -49,14 +49,14 @@ public interface SchemeSocketFactory {
      *
      * @param params    additional {@link HttpParams parameters}
      * @return  a new socket
-     * 
+     *
      * @throws IOException if an I/O error occurs while creating the socket
      */
     Socket createSocket(HttpParams params) throws IOException;
 
     /**
      * Connects a socket to the target host with the given remote address.
-     * 
+     *
      * @param sock      the socket to connect, as obtained from
      *                  {@link #createSocket() createSocket}.
      *                  <code>null</code> indicates that a new socket
@@ -65,11 +65,11 @@ public interface SchemeSocketFactory {
      * @param localAddress the local address to bind the socket to, or
      *                  <code>null</code> for any
      * @param params    additional {@link HttpParams parameters} for connecting
-     * 
+     *
      * @return  the connected socket. The returned object may be different
      *          from the <code>sock</code> argument if this factory supports
      *          a layered protocol.
-     * 
+     *
      * @throws IOException if an I/O error occurs
      * @throws UnknownHostException if the IP address of the target host
      *          can not be determined
@@ -78,18 +78,18 @@ public interface SchemeSocketFactory {
      */
     Socket connectSocket(
         Socket sock,
-        InetSocketAddress remoteAddress, 
-        InetSocketAddress localAddress, 
+        InetSocketAddress remoteAddress,
+        InetSocketAddress localAddress,
         HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException;
 
     /**
-     * Checks whether a socket provides a secure connection. The socket must be 
+     * Checks whether a socket provides a secure connection. The socket must be
      * {@link #connectSocket(Socket, InetSocketAddress, InetSocketAddress, HttpParams) connected}
      * by this factory. The factory will <i>not</i> perform I/O operations in this method.
      * <p>
-     * As a rule of thumb, plain sockets are not secure and TLS/SSL sockets are secure. However, 
-     * there may be application specific deviations. For example, a plain socket to a host in the 
-     * same intranet ("trusted zone") could be considered secure. On the other hand, a TLS/SSL 
+     * As a rule of thumb, plain sockets are not secure and TLS/SSL sockets are secure. However,
+     * there may be application specific deviations. For example, a plain socket to a host in the
+     * same intranet ("trusted zone") could be considered secure. On the other hand, a TLS/SSL
      * socket could be considered insecure based on the cipher suite chosen for the connection.
      *
      * @param sock      the connected socket to check

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java Fri Apr 23 19:19:23 2010
@@ -40,16 +40,16 @@ import org.apache.http.params.HttpParams
 class SchemeSocketFactoryAdaptor implements SchemeSocketFactory {
 
     private final SocketFactory factory;
-    
+
     SchemeSocketFactoryAdaptor(final SocketFactory factory) {
         super();
         this.factory = factory;
     }
-    
+
     public Socket connectSocket(
-            final Socket sock, 
+            final Socket sock,
             final InetSocketAddress remoteAddress,
-            final InetSocketAddress localAddress, 
+            final InetSocketAddress localAddress,
             final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
         String host = remoteAddress.getHostName();
         int port = remoteAddress.getPort();
@@ -73,7 +73,7 @@ class SchemeSocketFactoryAdaptor impleme
     public SocketFactory getFactory() {
         return this.factory;
     }
-    
+
     @Override
     public boolean equals(final Object obj) {
         if (obj == null) return false;
@@ -89,5 +89,5 @@ class SchemeSocketFactoryAdaptor impleme
     public int hashCode() {
         return this.factory.hashCode();
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java Fri Apr 23 19:19:23 2010
@@ -40,7 +40,7 @@ import org.apache.http.params.HttpParams
  * The factory encapsulates the logic for establishing a socket connection.
  *
  * @since 4.0
- * 
+ *
  * @deprecated use {@link SchemeSocketFactory}
  */
 @Deprecated
@@ -52,7 +52,7 @@ public interface SocketFactory {
      * {@link #connectSocket connectSocket}.
      *
      * @return  a new socket
-     * 
+     *
      * @throws IOException if an I/O error occurs while creating the socket
      */
     Socket createSocket()
@@ -60,7 +60,7 @@ public interface SocketFactory {
 
     /**
      * Connects a socket to the given host.
-     * 
+     *
      * @param sock      the socket to connect, as obtained from
      *                  {@link #createSocket createSocket}.
      *                  <code>null</code> indicates that a new socket
@@ -72,11 +72,11 @@ public interface SocketFactory {
      * @param localPort the port on the local machine,
      *                  0 or a negative number for any
      * @param params    additional {@link HttpParams parameters} for connecting
-     * 
+     *
      * @return  the connected socket. The returned object may be different
      *          from the <code>sock</code> argument if this factory supports
      *          a layered protocol.
-     * 
+     *
      * @throws IOException if an I/O error occurs
      * @throws UnknownHostException if the IP address of the target host
      *          can not be determined
@@ -85,9 +85,9 @@ public interface SocketFactory {
      */
     Socket connectSocket(
         Socket sock,
-        String host, 
-        int port, 
-        InetAddress localAddress, 
+        String host,
+        int port,
+        InetAddress localAddress,
         int localPort,
         HttpParams params
     ) throws IOException, UnknownHostException, ConnectTimeoutException;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java Fri Apr 23 19:19:23 2010
@@ -41,21 +41,21 @@ import org.apache.http.params.HttpParams
 class SocketFactoryAdaptor implements SocketFactory {
 
     private final SchemeSocketFactory factory;
-    
+
     SocketFactoryAdaptor(final SchemeSocketFactory factory) {
         super();
         this.factory = factory;
     }
-    
+
     public Socket createSocket() throws IOException {
         HttpParams params = new BasicHttpParams();
         return this.factory.createSocket(params);
     }
 
     public Socket connectSocket(
-            final Socket socket, 
-            final String host, int port, 
-            final InetAddress localAddress, int localPort, 
+            final Socket socket,
+            final String host, int port,
+            final InetAddress localAddress, int localPort,
             final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
         InetSocketAddress local = null;
         if (localAddress != null || localPort > 0) {
@@ -93,5 +93,5 @@ class SocketFactoryAdaptor implements So
     public int hashCode() {
         return this.factory.hashCode();
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/package.html?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/package.html (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/package.html Fri Apr 23 19:19:23 2010
@@ -30,9 +30,9 @@
 -->
 </head>
 <body>
-{@link org.apache.http.conn.scheme.Scheme} class represents a protocol 
+{@link org.apache.http.conn.scheme.Scheme} class represents a protocol
 scheme such as "http" or "https" and contains a number of protocol properties
-such as the default port and the socket factory to be used to creating 
+such as the default port and the socket factory to be used to creating
 {@link java.net.Socket}s for the given protocol
 </body>
 </html>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java Fri Apr 23 19:19:23 2010
@@ -51,7 +51,7 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;
 
 /**
- * Abstract base class for all standard {@link X509HostnameVerifier} 
+ * Abstract base class for all standard {@link X509HostnameVerifier}
  * implementations.
  *
  * @since 4.0
@@ -294,7 +294,7 @@ public abstract class AbstractVerifier i
         } else {
             subjectType = 2;
         }
-        
+
         LinkedList<String> subjectAltList = new LinkedList<String>();
         Collection<List<?>> c = null;
         try {
@@ -355,11 +355,11 @@ public abstract class AbstractVerifier i
         }
         return count;
     }
-    
+
     private static boolean isIPAddress(final String hostname) {
-        return hostname != null && 
-            (InetAddressUtils.isIPv4Address(hostname) || 
+        return hostname != null &&
+            (InetAddressUtils.isIPv4Address(hostname) ||
                     InetAddressUtils.isIPv6Address(hostname));
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java Fri Apr 23 19:19:23 2010
@@ -32,7 +32,7 @@ import org.apache.http.annotation.Immuta
 /**
  * The ALLOW_ALL HostnameVerifier essentially turns hostname verification
  * off. This implementation is a no-op, and never throws the SSLException.
- * 
+ *
  *
  * @since 4.0
  */
@@ -40,15 +40,15 @@ import org.apache.http.annotation.Immuta
 public class AllowAllHostnameVerifier extends AbstractVerifier {
 
     public final void verify(
-            final String host, 
+            final String host,
             final String[] cns,
             final String[] subjectAlts) {
         // Allow everything - so never blowup.
     }
 
     @Override
-    public final String toString() { 
-        return "ALLOW_ALL"; 
+    public final String toString() {
+        return "ALLOW_ALL";
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java Fri Apr 23 19:19:23 2010
@@ -37,10 +37,10 @@ import org.apache.http.annotation.Immuta
  * The hostname must match either the first CN, or any of the subject-alts.
  * A wildcard can occur in the CN, and in any of the subject-alts.
  * <p/>
- * The only difference between BROWSER_COMPATIBLE and STRICT is that a wildcard 
- * (such as "*.foo.com") with BROWSER_COMPATIBLE matches all subdomains, 
+ * The only difference between BROWSER_COMPATIBLE and STRICT is that a wildcard
+ * (such as "*.foo.com") with BROWSER_COMPATIBLE matches all subdomains,
  * including "a.b.foo.com".
- * 
+ *
  *
  * @since 4.0
  */
@@ -48,15 +48,15 @@ import org.apache.http.annotation.Immuta
 public class BrowserCompatHostnameVerifier extends AbstractVerifier {
 
     public final void verify(
-            final String host, 
+            final String host,
             final String[] cns,
             final String[] subjectAlts) throws SSLException {
         verify(host, cns, subjectAlts, false);
     }
 
     @Override
-    public final String toString() { 
-        return "BROWSER_COMPATIBLE"; 
+    public final String toString() {
+        return "BROWSER_COMPATIBLE";
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Fri Apr 23 19:19:23 2010
@@ -61,25 +61,25 @@ import java.security.UnrecoverableKeyExc
 /**
  * Layered socket factory for TLS/SSL connections.
  * <p>
- * SSLSocketFactory can be used to validate the identity of the HTTPS server against a list of 
- * trusted certificates and to authenticate to the HTTPS server using a private key. 
+ * SSLSocketFactory can be used to validate the identity of the HTTPS server against a list of
+ * trusted certificates and to authenticate to the HTTPS server using a private key.
  * <p>
- * SSLSocketFactory will enable server authentication when supplied with 
- * a {@link KeyStore trust-store} file containing one or several trusted certificates. The client 
- * secure socket will reject the connection during the SSL session handshake if the target HTTPS 
+ * SSLSocketFactory will enable server authentication when supplied with
+ * a {@link KeyStore trust-store} file containing one or several trusted certificates. The client
+ * secure socket will reject the connection during the SSL session handshake if the target HTTPS
  * server attempts to authenticate itself with a non-trusted certificate.
  * <p>
- * Use JDK keytool utility to import a trusted certificate and generate a trust-store file:    
+ * Use JDK keytool utility to import a trusted certificate and generate a trust-store file:
  *    <pre>
  *     keytool -import -alias "my server cert" -file server.crt -keystore my.truststore
  *    </pre>
  * <p>
- * In special cases the standard trust verification process can be bypassed by using a custom 
- * {@link TrustStrategy}. This interface is primarily intended for allowing self-signed 
+ * In special cases the standard trust verification process can be bypassed by using a custom
+ * {@link TrustStrategy}. This interface is primarily intended for allowing self-signed
  * certificates to be accepted as trusted without having to add them to the trust-store file.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#CONNECTION_TIMEOUT}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SO_TIMEOUT}</li>
@@ -112,27 +112,27 @@ import java.security.UnrecoverableKeyExc
  *     </li>
  *     <li>
  *      <p>
- *      Send the certificate request to the trusted Certificate Authority for signature. 
- *      One may choose to act as her own CA and sign the certificate request using a PKI 
+ *      Send the certificate request to the trusted Certificate Authority for signature.
+ *      One may choose to act as her own CA and sign the certificate request using a PKI
  *      tool, such as OpenSSL.
  *      </p>
  *     </li>
  *     <li>
  *      <p>
  *       Import the trusted CA root certificate
- *       <pre>keytool -import -alias "my trusted ca" -file caroot.crt -keystore my.keystore</pre> 
+ *       <pre>keytool -import -alias "my trusted ca" -file caroot.crt -keystore my.keystore</pre>
  *      </p>
  *     </li>
  *     <li>
  *      <p>
  *       Import the PKCS#7 file containg the complete certificate chain
- *       <pre>keytool -import -alias "my client key" -file mycert.p7 -keystore my.keystore</pre> 
+ *       <pre>keytool -import -alias "my client key" -file mycert.p7 -keystore my.keystore</pre>
  *      </p>
  *     </li>
  *     <li>
  *      <p>
  *       Verify the content the resultant keystore file
- *       <pre>keytool -list -v -keystore my.keystore</pre> 
+ *       <pre>keytool -list -v -keystore my.keystore</pre>
  *      </p>
  *     </li>
  *   </ul>
@@ -146,43 +146,43 @@ public class SSLSocketFactory implements
     public static final String TLS   = "TLS";
     public static final String SSL   = "SSL";
     public static final String SSLV2 = "SSLv2";
-    
-    public static final X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER 
+
+    public static final X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER
         = new AllowAllHostnameVerifier();
-    
-    public static final X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER 
+
+    public static final X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER
         = new BrowserCompatHostnameVerifier();
-    
-    public static final X509HostnameVerifier STRICT_HOSTNAME_VERIFIER 
+
+    public static final X509HostnameVerifier STRICT_HOSTNAME_VERIFIER
         = new StrictHostnameVerifier();
 
     /**
      * The default factory using the default JVM settings for secure connections.
      */
     private static final SSLSocketFactory DEFAULT_FACTORY = new SSLSocketFactory();
-    
+
     /**
-     * Gets the default factory, which uses the default JVM settings for secure 
+     * Gets the default factory, which uses the default JVM settings for secure
      * connections.
-     * 
+     *
      * @return the default factory
      */
     public static SSLSocketFactory getSocketFactory() {
         return DEFAULT_FACTORY;
     }
-    
+
     private final javax.net.ssl.SSLSocketFactory socketfactory;
     private final HostNameResolver nameResolver;
     // TODO: make final
     private volatile X509HostnameVerifier hostnameVerifier;
 
     private static SSLContext createSSLContext(
-            String algorithm, 
-            final KeyStore keystore, 
-            final String keystorePassword, 
+            String algorithm,
+            final KeyStore keystore,
+            final String keystorePassword,
             final KeyStore truststore,
             final SecureRandom random,
-            final TrustStrategy trustStrategy) 
+            final TrustStrategy trustStrategy)
                 throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException, KeyManagementException {
         if (algorithm == null) {
             algorithm = TLS;
@@ -190,7 +190,7 @@ public class SSLSocketFactory implements
         KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
                 KeyManagerFactory.getDefaultAlgorithm());
         kmfactory.init(keystore, keystorePassword != null ? keystorePassword.toCharArray(): null);
-        KeyManager[] keymanagers =  kmfactory.getKeyManagers(); 
+        KeyManager[] keymanagers =  kmfactory.getKeyManagers();
         TrustManagerFactory tmfactory = TrustManagerFactory.getInstance(
                 TrustManagerFactory.getDefaultAlgorithm());
         tmfactory.init(keystore);
@@ -204,26 +204,26 @@ public class SSLSocketFactory implements
                 }
             }
         }
-        
+
         SSLContext sslcontext = SSLContext.getInstance(algorithm);
         sslcontext.init(keymanagers, trustmanagers, random);
         return sslcontext;
     }
-    
+
     /**
      * @deprecated Use {@link #SSLSocketFactory(String, KeyStore, String, KeyStore, SecureRandom, X509HostnameVerifier)}
      */
     @Deprecated
     public SSLSocketFactory(
-            final String algorithm, 
-            final KeyStore keystore, 
-            final String keystorePassword, 
+            final String algorithm,
+            final KeyStore keystore,
+            final String keystorePassword,
             final KeyStore truststore,
             final SecureRandom random,
-            final HostNameResolver nameResolver) 
+            final HostNameResolver nameResolver)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(createSSLContext(
-                algorithm, keystore, keystorePassword, truststore, random, null), 
+                algorithm, keystore, keystorePassword, truststore, random, null),
                 nameResolver);
     }
 
@@ -231,12 +231,12 @@ public class SSLSocketFactory implements
      * @since 4.1
      */
     public SSLSocketFactory(
-            String algorithm, 
-            final KeyStore keystore, 
-            final String keystorePassword, 
+            String algorithm,
+            final KeyStore keystore,
+            final String keystorePassword,
             final KeyStore truststore,
             final SecureRandom random,
-            final X509HostnameVerifier hostnameVerifier) 
+            final X509HostnameVerifier hostnameVerifier)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(createSSLContext(
                 algorithm, keystore, keystorePassword, truststore, random, null),
@@ -247,13 +247,13 @@ public class SSLSocketFactory implements
      * @since 4.1
      */
     public SSLSocketFactory(
-            String algorithm, 
-            final KeyStore keystore, 
-            final String keystorePassword, 
+            String algorithm,
+            final KeyStore keystore,
+            final String keystorePassword,
             final KeyStore truststore,
             final SecureRandom random,
             final TrustStrategy trustStrategy,
-            final X509HostnameVerifier hostnameVerifier) 
+            final X509HostnameVerifier hostnameVerifier)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(createSSLContext(
                 algorithm, keystore, keystorePassword, truststore, random, trustStrategy),
@@ -261,22 +261,22 @@ public class SSLSocketFactory implements
     }
 
     public SSLSocketFactory(
-            final KeyStore keystore, 
-            final String keystorePassword, 
-            final KeyStore truststore) 
+            final KeyStore keystore,
+            final String keystorePassword,
+            final KeyStore truststore)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(TLS, keystore, keystorePassword, truststore, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
     }
 
     public SSLSocketFactory(
-            final KeyStore keystore, 
-            final String keystorePassword) 
+            final KeyStore keystore,
+            final String keystorePassword)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException{
         this(TLS, keystore, keystorePassword, null, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
     }
 
     public SSLSocketFactory(
-            final KeyStore truststore) 
+            final KeyStore truststore)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(TLS, null, null, truststore, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
     }
@@ -286,7 +286,7 @@ public class SSLSocketFactory implements
      */
     public SSLSocketFactory(
             final TrustStrategy trustStrategy,
-            final X509HostnameVerifier hostnameVerifier) 
+            final X509HostnameVerifier hostnameVerifier)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(TLS, null, null, null, null, trustStrategy, hostnameVerifier);
     }
@@ -295,7 +295,7 @@ public class SSLSocketFactory implements
      * @since 4.1
      */
     public SSLSocketFactory(
-            final TrustStrategy trustStrategy) 
+            final TrustStrategy trustStrategy)
                 throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
         this(TLS, null, null, null, null, trustStrategy, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
     }
@@ -333,7 +333,7 @@ public class SSLSocketFactory implements
         this.hostnameVerifier = null;
         this.nameResolver = null;
     }
-    
+
     /**
      * @since 4.1
      */
@@ -353,8 +353,8 @@ public class SSLSocketFactory implements
      */
     public Socket connectSocket(
             final Socket sock,
-            final InetSocketAddress remoteAddress, 
-            final InetSocketAddress localAddress, 
+            final InetSocketAddress remoteAddress,
+            final InetSocketAddress localAddress,
             final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
         if (remoteAddress == null) {
             throw new IllegalArgumentException("Remote address may not be null");
@@ -374,7 +374,7 @@ public class SSLSocketFactory implements
         try {
             sslsock.connect(remoteAddress, connTimeout);
         } catch (SocketTimeoutException ex) {
-            throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/" 
+            throw new ConnectTimeoutException("Connect to " + remoteAddress.getHostName() + "/"
                     + remoteAddress.getAddress() + " timed out");
         }
         sslsock.setSoTimeout(soTimeout);
@@ -459,9 +459,9 @@ public class SSLSocketFactory implements
      */
     @Deprecated
     public Socket connectSocket(
-            final Socket socket, 
-            final String host, int port, 
-            final InetAddress localAddress, int localPort, 
+            final Socket socket,
+            final String host, int port,
+            final InetAddress localAddress, int localPort,
             final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
         InetSocketAddress local = null;
         if (localAddress != null || localPort > 0) {
@@ -480,14 +480,14 @@ public class SSLSocketFactory implements
         InetSocketAddress remote = new InetSocketAddress(remoteAddress, port);
         return connectSocket(socket, remote, local, params);
     }
-    
+
     /**
      * @deprecated Use {@link #createLayeredSocket(Socket, String, int, boolean)}
      */
     @Deprecated
     public Socket createSocket(
-            final Socket socket, 
-            final String host, int port, 
+            final Socket socket,
+            final String host, int port,
             boolean autoClose) throws IOException, UnknownHostException {
         return createLayeredSocket(socket, host, port, autoClose);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java Fri Apr 23 19:19:23 2010
@@ -47,7 +47,7 @@ import org.apache.http.annotation.Immuta
  * A wildcard such as "*.foo.com" matches only subdomains in the same
  * level, for example "a.foo.com".  It does not match deeper subdomains
  * such as "a.b.foo.com".
- * 
+ *
  *
  * @since 4.0
  */
@@ -55,15 +55,15 @@ import org.apache.http.annotation.Immuta
 public class StrictHostnameVerifier extends AbstractVerifier {
 
     public final void verify(
-            final String host, 
+            final String host,
             final String[] cns,
             final String[] subjectAlts) throws SSLException {
         verify(host, cns, subjectAlts, true);
     }
 
     @Override
-    public final String toString() { 
-        return "STRICT"; 
+    public final String toString() {
+        return "STRICT";
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustManagerDecorator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustManagerDecorator.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustManagerDecorator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustManagerDecorator.java Fri Apr 23 19:19:23 2010
@@ -35,10 +35,10 @@ import javax.net.ssl.X509TrustManager;
  * @since 4.1
  */
 class TrustManagerDecorator implements X509TrustManager {
-    
+
     private final X509TrustManager trustManager;
     private final TrustStrategy trustStrategy;
-    
+
     TrustManagerDecorator(final X509TrustManager trustManager, final TrustStrategy trustStrategy) {
         super();
         this.trustManager = trustManager;
@@ -60,5 +60,5 @@ class TrustManagerDecorator implements X
     public X509Certificate[] getAcceptedIssuers() {
         return this.trustManager.getAcceptedIssuers();
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java Fri Apr 23 19:19:23 2010
@@ -30,13 +30,13 @@ import java.security.cert.CertificateExc
 import java.security.cert.X509Certificate;
 
 /**
- * A trust strategy that accepts self-signed certificates as trusted. Verification of all other 
+ * A trust strategy that accepts self-signed certificates as trusted. Verification of all other
  * certificates is done by the trust manager configured in the SSL context.
- * 
+ *
  * @since 4.1
  */
 public class TrustSelfSignedStrategy implements TrustStrategy {
-    
+
     public boolean isTrusted(
             final X509Certificate[] chain, final String authType) throws CertificateException {
         return chain.length == 1;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java Fri Apr 23 19:19:23 2010
@@ -30,24 +30,24 @@ import java.security.cert.CertificateExc
 import java.security.cert.X509Certificate;
 
 /**
- * A strategy to establish trustworthiness of certificates without consulting the trust manager 
- * configured in the actual SSL context. This interface can be used to override the standard 
+ * A strategy to establish trustworthiness of certificates without consulting the trust manager
+ * configured in the actual SSL context. This interface can be used to override the standard
  * JSSE certificate verification process.
- * 
+ *
  * @since 4.1
  */
 public interface TrustStrategy {
-    
+
     /**
-     * Determines whether the certificate chain can be trusted without consulting the trust manager 
-     * configured in the actual SSL context. This method can be used to override the standard JSSE 
+     * Determines whether the certificate chain can be trusted without consulting the trust manager
+     * configured in the actual SSL context. This method can be used to override the standard JSSE
      * certificate verification process.
      * <p>
-     * Please note that, if this method returns <code>false</code>, the trust manager configured 
+     * Please note that, if this method returns <code>false</code>, the trust manager configured
      * in the actual SSL context can still clear the certificate as trusted.
-     * 
+     *
      * @param chain the peer certificate chain
-     * @param authType the authentication type based on the client certificate 
+     * @param authType the authentication type based on the client certificate
      * @return <code>true</code> if the certificate can be trusted without verification by
      *   the trust manager, <code>false</code> otherwise.
      * @throws CertificateException thrown if the certificate is not trusted or invalid.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java Fri Apr 23 19:19:23 2010
@@ -35,8 +35,8 @@ import java.security.cert.X509Certificat
 
 /**
  * Interface for checking if a hostname matches the names stored inside the
- * server's X.509 certificate.  This interface extends 
- * {@link javax.net.ssl.HostnameVerifier}, but it is recommended to use 
+ * server's X.509 certificate.  This interface extends
+ * {@link javax.net.ssl.HostnameVerifier}, but it is recommended to use
  * methods added by X509HostnameVerifier.
  *
  * @since 4.0
@@ -44,23 +44,23 @@ import java.security.cert.X509Certificat
 public interface X509HostnameVerifier extends HostnameVerifier {
 
     /**
-     * Verifies that the host name is an acceptable match with the server's 
+     * Verifies that the host name is an acceptable match with the server's
      * authentication scheme based on the given {@link SSLSocket}.
      *
      * @param host the host.
      * @param ssl the SSL socket.
      * @throws IOException if an I/O error occurs or the verification process
-     *   fails. 
+     *   fails.
      */
     void verify(String host, SSLSocket ssl) throws IOException;
 
     /**
-     * Verifies that the host name is an acceptable match with the server's 
+     * Verifies that the host name is an acceptable match with the server's
      * authentication scheme based on the given {@link X509Certificate}.
      *
      * @param host the host.
      * @param cert the certificate.
-     * @throws SSLException if the verification process fails. 
+     * @throws SSLException if the verification process fails.
      */
     void verify(String host, X509Certificate cert) throws SSLException;
 
@@ -76,7 +76,7 @@ public interface X509HostnameVerifier ex
      * @param subjectAlts Subject-Alt fields of type 2 ("DNS"), as extracted
      *                    from the X.509 certificate.
      * @param host        The hostname to verify.
-     * @throws SSLException if the verification process fails. 
+     * @throws SSLException if the verification process fails.
      */
     void verify(String host, String[] cns, String[] subjectAlts)
           throws SSLException;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java Fri Apr 23 19:19:23 2010
@@ -41,16 +41,16 @@ public class InetAddressUtils {
 
     private InetAddressUtils() {
     }
-    
-    private static final Pattern IPV4_PATTERN = 
+
+    private static final Pattern IPV4_PATTERN =
         Pattern.compile(
                 "^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
 
-    private static final Pattern IPV6_STD_PATTERN = 
+    private static final Pattern IPV6_STD_PATTERN =
         Pattern.compile(
                 "^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
 
-    private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = 
+    private static final Pattern IPV6_HEX_COMPRESSED_PATTERN =
         Pattern.compile(
                 "^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
 
@@ -61,13 +61,13 @@ public class InetAddressUtils {
     public static boolean isIPv6StdAddress(final String input) {
         return IPV6_STD_PATTERN.matcher(input).matches();
     }
-    
+
     public static boolean isIPv6HexCompressedAddress(final String input) {
         return IPV6_HEX_COMPRESSED_PATTERN.matcher(input).matches();
     }
-    
+
     public static boolean isIPv6Address(final String input) {
-        return isIPv6StdAddress(input) || isIPv6HexCompressedAddress(input); 
+        return isIPv6StdAddress(input) || isIPv6HexCompressedAddress(input);
     }
 
 }



Mime
View raw message